fix: remove legacy apps/websocket and apps/tasks, exclude build artifacts from tsconfig

- Remove apps/websocket/ (merged into custom server in server.ts) - Remove apps/tasks/ (merged into custom server in server.ts) - Exclude customServer.cjs and customServer.css from tsconfig to prevent tsc errors when build artifacts are present - Update pnpm-lock.yaml (removed 138 unnecessary packages) Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com> Agent-Logs-Url: https://github.com/homarr-labs/homarr/sessions/bd83b347-563b-494e-b8c6-91fcc199dd79
fix: resolve TypeScript compilation errors in server.ts and integration.ts
2026-03-25 18:44:23 +00:00 · 2026-03-25 17:37:14 +00:00 · 2026-03-25 17:34:09 +00:00 · 2026-03-15 15:32:15 +00:00 · 2026-03-15 15:30:21 +00:00 · 2026-03-15 15:26:04 +00:00
513 changed files with 19869 additions and 47705 deletions
@@ -1,191 +0,0 @@
---
-description: Comprehensive Homarr codebase architecture and conventions reference
-alwaysApply: true
---
-
-# Homarr Codebase Context
-
-Homarr is an open-source, self-hosted dashboard for managing homelab services. It integrates with 50+ self-hosted apps (media servers, download clients, DNS, NAS, etc.) and provides a drag-and-drop widget-based UI.
-
-## Tech Stack
-
- **Monorepo**: pnpm workspaces + Turborepo
- **Framework**: Next.js (App Router, `output: "standalone"`) — T3 Stack
- **Language**: TypeScript throughout
- **ORM**: Drizzle (supports SQLite via better-sqlite3, MySQL, PostgreSQL)
- **API**: tRPC (HTTP + WebSocket subscriptions) with superjson + OpenAPI bridge via `trpc-to-openapi`
- **Auth**: NextAuth v5 (database sessions, Credentials/LDAP/OIDC providers)
- **UI**: Mantine v7 (not Tailwind) + Tabler icons
- **State**: Jotai (atoms), TanStack Query (server state via tRPC)
- **Realtime**: WebSocket server (`ws`) for tRPC subscriptions, backed by Redis pub/sub
- **Cron**: `node-cron` in a standalone Fastify service (`apps/tasks`)
- **i18n**: next-intl with `[locale]` dynamic segment (prefix mode: `"never"`, locale from cookie)
- **Testing**: Vitest + jsdom, Playwright for E2E
- **Package manager**: pnpm 10.33.2, Node >= 24.15.0
-
-## Repository Structure
-
-```
-homarr/
-├── apps/
-│   ├── nextjs/          # Main Next.js application (port 3000)
-│   ├── tasks/           # Cron job runner + Fastify tRPC API (port 3002)
-│   └── websocket/       # Standalone tRPC WebSocket server (port 3001)
-├── packages/
-│   ├── api/             # tRPC appRouter, procedures, OpenAPI
-│   ├── auth/            # NextAuth config, providers, session, API keys
-│   ├── db/              # Drizzle schema (3 DB drivers), migrations, queries
-│   ├── core/            # Env validation, DB/Redis driver factories, logging
-│   ├── definitions/     # Domain enums: WidgetKind, IntegrationKind, permissions
-│   ├── widgets/         # All 39 dashboard widgets (definitions + components)
-│   ├── integrations/    # Integration classes (HTTP clients to external apps)
-│   ├── redis/           # Redis pub/sub channels, caching abstractions
-│   ├── translation/     # next-intl setup, locale configs, lang JSON files
-│   ├── ui/              # Shared Mantine components, theme, hooks
-│   ├── validation/      # Shared zod schemas for API/forms
-│   ├── common/          # Shared utilities, IDs, errors
-│   ├── cron-jobs/       # Cron job implementations (25+ jobs)
-│   ├── cron-jobs-core/  # Cron scheduling primitives
-│   ├── cron-job-api/    # tRPC router for job management (start/stop/trigger)
-│   ├── cron-job-status/ # Cron status via Redis
-│   ├── boards/          # Board context, edit mode, cache updater
-│   ├── modals/          # Modal primitives on Mantine
-│   ├── modals-collection/ # Feature modals (apps, boards, docker, etc.)
-│   ├── form/            # useZodForm (Mantine + zod resolver)
-│   ├── forms-collection/# Reusable form UIs (new app, icon picker, upload)
-│   ├── spotlight/       # Command palette / search with multiple modes
-│   ├── request-handler/ # Server request handlers (feeds, integrations)
-│   ├── notifications/   # Mantine notifications wrapper
-│   ├── docker/          # Dockerode-based Docker access
-│   ├── icons/           # Icon DB/repo integration
-│   ├── image-proxy/     # Image proxy + caching
-│   ├── ping/            # Reachability / ping utilities
-│   ├── analytics/       # Server-side analytics (Umami)
-│   ├── server-settings/ # Server setting keys/types
-│   ├── settings/        # User-facing settings UI context
-│   ├── old-import/      # Legacy Homarr import
-│   ├── old-schema/      # Legacy Homarr zod schemas
-│   └── cli/             # Node CLI for ops (brocli)
-├── tooling/
-│   ├── eslint/          # Shared ESLint configs
-│   ├── prettier/        # Shared Prettier config
-│   ├── typescript/      # Base tsconfig
-│   └── github/          # CI setup action
-├── development/         # Dev docker-compose (Redis, MySQL, PostgreSQL)
-├── e2e/                 # E2E test specs
-└── Dockerfile           # Multi-stage production build
-```
-
-## Three Runtime Services
-
-| Service | Port | Role |
-|---------|------|------|
-| Next.js | 3000 | Main web app (SSR + API routes) |
-| WebSocket | 3001 | tRPC subscriptions via `ws` |
-| Tasks | 3002 | Cron job runner + management API via Fastify |
-
-In Docker, nginx listens on **7575** and proxies to all three. The tasks service authenticates via `CRON_JOB_API_KEY` header.
-
-## Package Dependency Layers
-
-1. **Foundation**: `core` (env, DB drivers, Redis client, logging) → no `@homarr` deps
-2. **Domain**: `definitions` → `common` → `core`
-3. **Data**: `db` → `core`, `definitions`, `common`
-4. **Auth**: `auth` → `db`, `definitions`, `core`, `validation`
-5. **Cross-cutting**: `translation`, `validation`, `redis`, `server-settings`
-6. **Feature backends**: `integrations`, `request-handler`, `cron-jobs`, `docker`, `ping`
-7. **API surface**: `api` → pulls in auth, db, redis, integrations, etc.
-8. **UI stack**: `ui`, `modals`, `form`, `notifications`, `boards`, `spotlight`
-9. **Composed features**: `widgets`, `modals-collection`, `forms-collection`
-
-## Key Patterns
-
-### tRPC
-
- **Server caller** (RSC): `import { api } from "@homarr/api/server"` → cached caller with auth context
- **Client hooks**: `import { clientApi } from "@homarr/api/client"` → React Query hooks
- **Router structure**: `packages/api/src/root.ts` defines top-level namespaces (`user`, `board`, `widget`, `integration`, `docker`, `kubernetes`, etc.)
- **Procedures**: `publicProcedure`, `protectedProcedure`, `permissionRequiredProcedure`, `onboardingProcedure`
- **WebSocket subscriptions**: Client uses `wsLink` when `type === "subscription"`, connects to port 3001
-
-### Multi-Database Support
-
-Drizzle schemas exist in three parallel implementations:
- `packages/db/schema/sqlite.ts`
- `packages/db/schema/mysql.ts`
- `packages/db/schema/postgresql.ts`
-
-Selected at runtime via `DB_DRIVER` env (`better-sqlite3` | `mysql2` | `node-postgres`). Migrations are per-engine in `packages/db/migrations/{sqlite,mysql,postgresql}/`.
-
-### Widget System
-
-Widgets are registered in `packages/widgets/src/index.tsx` as `widgetImports` (must satisfy `Record<WidgetKind, ...>`). Each widget:
- Has a `definition` created via `createWidgetDefinition(kind, { icon, createOptions, supportedIntegrations? })`
- Uses `optionsBuilder.from(factory => ({ ... }))` for typed options
- Loads dynamically via `next/dynamic`
- Fetches data via tRPC client hooks (backed by cron job caches)
-
-### Integration System
-
-Integrations are defined in `packages/definitions/src/integration.ts` (`integrationDefs`) and instantiated via `createIntegrationAsync` in `packages/integrations/src/base/creator.ts`. Each extends abstract `Integration` class with `testConnectionAsync` and typed methods.
-
-### Cron Job System
-
-Jobs defined in `packages/cron-jobs/src/jobs/`. Each job:
- Uses `createCronJob` with a cron expression
- Publishes results to Redis channels
- Widget subscriptions consume those channels via tRPC subscriptions
- Job management (start/stop/trigger) via `cronJobApi` HTTP client to port 3002
-
-### Modals
-
-Created with `createModal(component).withOptions({ defaultTitle })` from `@homarr/modals`. Opened via `useModalAction(SomeModal)`. Feature modals live in `packages/modals-collection/`.
-
-### Forms
-
-`useZodForm` from `@homarr/form` wraps Mantine `useForm` with zod validation. Shared form UIs in `packages/forms-collection/`.
-
-### Routing (App Router)
-
- `apps/nextjs/src/app/[locale]/` — all UI routes under locale segment
- Route groups: `(home)`, `(content)`, `(board)` — don't affect URLs
- Key routes: `boards/[name]`, `manage/...` (admin), `auth/login`, `init` (onboarding), `widgets/[kind]`
- Locale driven by cookie (no URL prefix)
-
-### Auth Providers
-
-Configured via `AUTH_PROVIDERS` env. Supports: `credentials` (local), `ldap`, `oidc`. Database sessions with httpOnly cookies. API key auth for programmatic access.
-
-## Environment Variables
-
-Key env vars (from `.env.example`):
- `DB_DRIVER`: `better-sqlite3` | `mysql2` | `node-postgres`
- `DB_URL`: Database connection string
- `AUTH_SECRET`: NextAuth secret
- `SECRET_ENCRYPTION_KEY`: AES-256-CBC for integration secrets
- `AUTH_PROVIDERS`: Comma-separated (`credentials`, `ldap`, `oidc`)
- `CRON_JOB_API_KEY`: Shared key between Next.js and tasks service
- `REDIS_*`: Redis connection (host, port, password)
- `ENABLE_KUBERNETES`: Optional Kubernetes integration
-
-## Development Commands
-
- `pnpm dev` — runs all three services in parallel via Turborepo
- `pnpm docker:dev` — starts Redis + MySQL + PostgreSQL containers
- `pnpm db:push` — push schema to SQLite (dev)
- `pnpm db:studio` — Drizzle Studio
- `pnpm test` — Vitest unit tests
- `pnpm test:e2e` — Playwright E2E
- `pnpm lint` / `pnpm format` — ESLint + Prettier
- `pnpm typecheck` — tsc --noEmit across all packages
-
-## Conventions
-
- Workspace packages use `@homarr/` scope
- All versions managed via pnpm `catalog:` in workspace
- Path alias `~/*` → `./src/*` in Next.js app
- Mantine for all UI (no Tailwind) — primary color is red, `autoContrast: true`
- Icons from `@tabler/icons-react`
- Drag-and-drop via `@dnd-kit/*`
- `typescript.ignoreBuildErrors: true` in next.config (types checked separately via `typecheck`)
- `serverExternalPackages`: `dockerode`, `isomorphic-dompurify`, `jsdom`
@@ -3,6 +3,9 @@ version = 1
 [[analyzers]]
 name = "javascript"

-[analyzers.meta]
-plugins = ["react"]
-environment = ["nodejs"]
+  [analyzers.meta]
+  plugins = ["react"]
+  environment = ["nodejs"]
+
+[[transformers]]
+name = "prettier"
@@ -9,8 +9,4 @@ README.md
 .git
 dev
 .build
-e2e
-apps/nextjs/.next
-.env
-.env.*
-!.env.example
+e2e
@@ -12,6 +12,10 @@ AUTH_SECRET="supersecret"
 # or starting the project without any (which will show a randomly generated one).
 SECRET_ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000

+# Cron job API key is generated every time the container starts as it is required for communication between nextjs-api and tasks-api
+# export CRON_JOB_API_KEY=$(openssl rand -base64 32)
+# CRON_JOB_API_KEY="your-generated-api-key"
+
 LOG_LEVEL='info'

 # This is how you can use the sqlite driver:
@@ -41,20 +45,6 @@ DB_URL='FULL_PATH_TO_YOUR_SQLITE_DB_FILE'

 TURBO_TELEMETRY_DISABLED=1

-# Turborepo remote cache (optional, for faster CI/local builds)
-# Uncomment and fill in to enable remote caching locally.
-# CI uses GitHub secrets for these values automatically.
-# TURBO_API=https://your-cache-worker.workers.dev
-# TURBO_TEAM=team_your_team
-# TURBO_TOKEN=your-turbo-token
-# TURBO_REMOTE_CACHE_SIGNATURE_KEY=your-signature-key
-
-# Comma-separated paths to Docker-compatible Unix sockets.
-# Useful for connecting to multiple runtimes (Docker + Podman) simultaneously.
-# When unset and no TCP hosts configured, defaults to /var/run/docker.sock.
-# Example: DOCKER_SOCKET_PATHS=/var/run/docker.sock,/run/user/1000/podman/podman.sock
-# DOCKER_SOCKET_PATHS=
-
 # Enable kubernetes tool
 # ENABLE_KUBERNETES=true

@@ -33,19 +33,6 @@ body:
      options:
        # The below comment is used to insert a new version with on-release.yml
        #NEXT_VERSION#
-        - 1.62.0
-        - 1.61.0
-        - 1.60.1-beta.1
-        - 1.60.0
-        - 1.59.3
-        - 1.59.2
-        - 1.59.1
-        - 1.59.0
-        - 1.58.1
-        - 1.58.0
-        - 1.57.1
-        - 1.57.0
-        - 1.56.1
        - 1.56.0
        - 1.55.0
        - 1.54.0
@@ -25,16 +25,16 @@ body:
      label: Public API available?
      description: Is there a public API available, that we can consume in Homarr?
      options:
-        - "Yes, available on a website"
-        - "Yes, available in the application itself"
-        - "No"
+        - Yes, available on a website
+        - Yes, available in the application itself
+        - No
    validations:
      required: true
  - type: dropdown
    attributes:
      label: Are you willing to contribute this yourself?
      options:
-        - "Yes"
-        - "No"
+      - Yes
+      - No
    validations:
      required: true
@@ -24,7 +24,7 @@ body:
    attributes:
      label: Are you willing to contribute this yourself?
      options:
-        - "Yes"
-        - "No"
+        - Yes
+        - No
    validations:
      required: true
@@ -15,11 +15,11 @@ runs:
      with:
        persist-credentials: false
    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v4
+      uses: docker/setup-buildx-action@v3

    - name: Build docker image for ${{ inputs.architecture }}
      id: build
-      uses: docker/build-push-action@v7
+      uses: docker/build-push-action@v6
      with:
        push: false
        load: true
@@ -11,12 +11,6 @@
      matchPackageNames: ["tsx"],
      enabled: false,
    },
-    // Reenable once bug with undici v8 is fixed (https://github.com/homarr-labs/homarr/issues/5467)
-    {
-      matchPackageNames: ["undici"],
-      matchNewValue: "8.*",
-      enabled: false,
-    },
    {
      matchUpdateTypes: ["minor", "patch", "pin", "digest"],
      automerge: true,
@@ -37,12 +31,6 @@
      automerge: false,
    },
  ],
-  // Updates lockfile for prebuilt-debian after if package.json is updated, otherwise only root lockfile is updated
-  postUpgradeTasks: {
-    commands: ["cd deployments/prebuilt-debian && pnpm install --ignore-workspace --lockfile-only"],
-    fileFilters: ["deployments/prebuilt-debian/pnpm-lock.yaml"],
-    executionMode: "update",
-  },
  updateInternalDeps: true,
  rangeStrategy: "bump",
  automerge: false,
@@ -9,21 +9,16 @@ jobs:
  approve-automatic-prs:
    runs-on: ubuntu-latest
    timeout-minutes: 2
-    # 158783068: homarr-renovate[bot]
-    # 190541745: homarr-crowdin[bot]
-    # 210161987: homarr-update-contributors[bot]
-    # 175486441: homarr-releases[bot]
-    # Extracted from https://api.github.com/users/<username>
-    if: github.actor_id == 158783068 || github.actor_id == 190541745 || github.actor_id == 210161987 || github.actor_id == 175486441
+    if: github.actor_id == 158783068 || github.actor_id == 190541745 || github.actor_id == 210161987 # Id of renovate bot and crowdin bot see https://api.github.com/users/homarr-renovate%5Bbot%5D and https://api.github.com/users/homarr-crowdin%5Bbot%5D and https://api.github.com/users/homarr-update-contributors%5Bbot%5D
    steps:
      - name: Checkout code
        uses: actions/checkout@v6
      - name: Obtain token
        id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
        with:
          private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
          permission-pull-requests: write # required to approve pull request

      - name: Install GitHub CLI
@@ -11,58 +11,21 @@ on:

 concurrency:
  group: "${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}

+# You can leverage Vercel Remote Caching with Turbo to speed up your builds
+# @link https://turborepo.org/docs/core-concepts/remote-caching#remote-caching-on-vercel-builds
 env:
  FORCE_COLOR: 3
-  SKIP_ENV_VALIDATION: true
-  TURBO_API: ${{ secrets.TURBO_API }}
-  TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-  TURBO_REMOTE_CACHE_SIGNATURE_KEY: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
-  TURBO_SCM_BASE: ${{ github.event.pull_request.base.sha || github.event.before || 'HEAD~1' }}
-  TURBO_SCM_HEAD: ${{ github.sha }}
+  TURBO_TEAM: ${{ vars.TURBO_TEAM }}

 jobs:
-  lint-format-autofix:
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          ref: ${{ github.head_ref }}
-
-      - name: Setup
-        uses: ./tooling/github/setup
-
-      - name: Get changed files
-        id: changed
-        run: |
-          git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}...HEAD -- '*.ts' '*.tsx' '*.js' '*.jsx' > /tmp/changed-files
-          echo "count=$(wc -l < /tmp/changed-files | tr -d '[:space:]')" >> $GITHUB_OUTPUT
-
-      - name: Auto-fix lint + format
-        if: steps.changed.outputs.count != '0'
-        run: |
-          xargs -r -a /tmp/changed-files pnpm exec oxlint --fix || true
-          xargs -r -a /tmp/changed-files pnpm exec oxfmt --write
-
-      - name: Commit fixes
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: "style: auto-fix lint and format"
-
  lint:
    runs-on: ubuntu-latest
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0

      - name: Setup
        uses: ./tooling/github/setup
@@ -72,35 +35,31 @@ jobs:
        run: cp .env.example .env

      - name: Lint
-        run: pnpm turbo lint --affected && pnpm lint:ws
+        run: pnpm lint && pnpm lint:ws

  format:
    runs-on: ubuntu-latest
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0

      - name: Setup
        uses: ./tooling/github/setup

      - name: Format
-        run: pnpm turbo format --affected --continue
+        run: pnpm format

  typecheck:
    runs-on: ubuntu-latest
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0

      - name: Setup
        uses: ./tooling/github/setup

      - name: Typecheck
-        run: pnpm turbo typecheck --affected
+        run: turbo typecheck

  test:
    runs-on: ubuntu-latest
@@ -123,24 +82,20 @@ jobs:
  e2e:
    runs-on: ubuntu-latest
    timeout-minutes: 15
+
    steps:
      - uses: actions/checkout@v6
      - name: Setup
        uses: ./tooling/github/setup
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
      - name: Build docker image
        id: build-docker-image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
        with:
          platforms: linux/amd64
          context: .
          push: false
-          load: true
          tags: homarr-e2e
          network: host
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
        env:
          SKIP_ENV_VALIDATION: true
      - name: Install playwright browsers
@@ -154,12 +109,10 @@ jobs:
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
      - name: Setup
        uses: ./tooling/github/setup
      - name: Copy env
        shell: bash
        run: cp .env.example .env
      - name: Build
-        run: pnpm turbo build --affected
+        run: pnpm build
@@ -19,10 +19,10 @@ jobs:

      - name: Obtain token
        id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
        with:
          private-key: ${{ secrets.CROWDIN_APP_PRIVATE_KEY }}
-          client-id: ${{ secrets.CROWDIN_APP_ID }}
+          app-id: ${{ secrets.CROWDIN_APP_ID }}
          permission-contents: write # required to commit to crowdin branch
          permission-pull-requests: write # required to create pull request

@@ -1,104 +0,0 @@
-name: "[Deployment] Beta Release"
-
-on:
-  workflow_dispatch:
-    inputs:
-      send-notifications:
-        type: boolean
-        required: false
-        default: true
-        description: Send notifications
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  create-and-merge-pr:
-    runs-on: ubuntu-latest
-    timeout-minutes: 2
-    steps:
-      - name: Discord notification
-        if: ${{ github.event.inputs.send-notifications }}
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: "Beta release has been triggered: [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-      - name: Get Next Version
-        id: semver
-        uses: ietf-tools/semver-action@v1
-        with:
-          token: ${{ github.token }}
-          branch: next
-      - name: Create pull request
-        id: create-pull-request
-        run: 'gh pr create --title "chore(release): release ${{ steps.semver.outputs.next }}-beta" --body "Detected change to be ``${{ steps.semver.outputs.bump }}``<br/>Bump version from ``${{ steps.semver.outputs.current }}`` to ``${{ steps.semver.outputs.next }}-beta``" --base beta --head next --label automerge'
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Discord notification
-        if: ${{ github.event.inputs.send-notifications }}
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: "Created a release PR ${{ steps.create-pull-request.outputs.url }} for version ${{ steps.semver.outputs.next }}-beta (new behaviour: ${{ steps.semver.outputs.bump }})"
-      - name: Obtain token
-        id: obtainApprovalToken
-        uses: actions/create-github-app-token@v3
-        with:
-          private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
-          permission-pull-requests: write
-      - name: Approve PR
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainApprovalToken.outputs.token }}
-        run: |
-          gh pr review --approve --body "Automatically approved by GitHub Action"
-      - name: Obtain token
-        id: obtainMergeToken
-        uses: actions/create-github-app-token@v3
-        with:
-          private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
-          permission-contents: write # write to beta branch (due to merge)
-          permission-pull-requests: write # merge pull request
-      - id: automerge
-        if: ${{ steps.semver.outputs.bump != 'major' }}
-        name: automerge
-        uses: "pascalgn/automerge-action@v0.16.4"
-        env:
-          GITHUB_TOKEN: ${{ steps.obtainMergeToken.outputs.token }}
-          MERGE_METHOD: merge # we prefer merge commits for merging to beta
-          MERGE_COMMIT_MESSAGE: "chore(release): release ${{ steps.semver.outputs.next }}-beta"
-          MERGE_DELETE_BRANCH: false # never set to true!
-          PULL_REQUEST: "${{ steps.create-pull-request.outputs.pr_number }}"
-          MERGE_RETRIES: 20 # 20 retries * MERGE_RETRY_SLEEP until step fails
-          MERGE_RETRY_SLEEP: 10000 # 10 seconds * MERGE_RETRIES until step fails
-          MERGE_REQUIRED_APPROVALS: 0 # do not require approvals
-
-      - name: Merged Discord notification
-        if: ${{ steps.automerge.outputs.mergeResult == 'merged' && github.event.inputs.send-notifications }}
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: "Merged PR ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}-beta"
-      - name: Major Bump Discord notification
-        if: ${{ steps.semver.outputs.bump == 'major' && github.event.inputs.send-notifications }}
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: "The release PR must be manually merged because the next version is a major version: ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}-beta"
-      - name: Discord Fail Notification
-        if: failure() && github.event.inputs.send-notifications
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
-        with:
-          args: "The beta release workflow [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) has failed"
@@ -5,7 +5,6 @@ on:
    branches:
      - main
      - beta
-      - next
      - dev
  workflow_dispatch:
    inputs:
@@ -35,7 +34,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 5
    env:
-      SKIP_RELEASE: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'dev' || github.ref_name == 'next' }}
+      SKIP_RELEASE: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'dev' }}
    outputs:
      version: ${{ steps.read-semver.outputs.version || steps.version-fallback.outputs.version }}
      git_ref: ${{ steps.read-git-ref.outputs.ref || github.ref }}
@@ -51,23 +50,23 @@ jobs:
      - name: Obtain token
        if: env.SKIP_RELEASE == 'false'
        id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
        with:
          private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
-          permission-contents: write # required to commit package.json & changelog changes, merge them to dev / next and publish the release
+          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          permission-contents: write # required to commit package.json & changelog changes, merge them to dev and publish the release

      - uses: actions/checkout@v6
        if: env.SKIP_RELEASE == 'false'
        with:
          persist-credentials: false
-      - uses: pnpm/action-setup@v6
+      - uses: pnpm/action-setup@v4
        if: env.SKIP_RELEASE == 'false'
      - uses: actions/setup-node@v6
        if: env.SKIP_RELEASE == 'false'
        with:
-          node-version: 24.16.0
-          package-manager-cache: false
+          node-version: 24.14.0
+          cache: "pnpm"
      - run: npm i -g pnpm
        if: env.SKIP_RELEASE == 'false'
      - name: Install dependencies
@@ -96,21 +95,20 @@ jobs:
        id: read-git-ref
        run: |
          echo "ref=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-      - name: Update dev / next branch
+      - name: Update dev branch
        if: env.SKIP_RELEASE == 'false'
        continue-on-error: true # Prevent pipeline from failing when merge fails
        env:
          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
-          UPSTREAM_BRANCH: ${{ github.ref_name == 'main' && 'dev' || 'next' }}
        run: |
          git config user.name "Releases Homarr"
          git config user.email "175486441+homarr-releases[bot]@users.noreply.github.com"
          git remote set-url origin https://x-access-token:${{ steps.obtainToken.outputs.token }}@github.com/${{ github.repository }}.git
-          git fetch origin ${{ env.UPSTREAM_BRANCH }}
-          git checkout ${{ env.UPSTREAM_BRANCH }}
-          git pull origin ${{ env.UPSTREAM_BRANCH }}
+          git fetch origin dev
+          git checkout dev
+          git pull origin dev
          git rebase ${{ github.ref_name }}
-          git push origin ${{ env.UPSTREAM_BRANCH }}
+          git push origin dev
  build-amd64:
    name: Build docker image for amd64
    needs: release
@@ -125,7 +123,7 @@ jobs:

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
        with:
          images: "${{ env.GHCR_REPO }}"

@@ -137,11 +135,11 @@ jobs:
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3

      - name: Build and push by digest
        id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
        with:
          context: .
          network: host
@@ -164,7 +162,7 @@ jobs:

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
        with:
          images: "${{ env.GHCR_REPO }}"

@@ -176,11 +174,11 @@ jobs:
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3

      - name: Build and push by digest
        id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
        with:
          context: .
          network: host
@@ -193,7 +191,7 @@ jobs:
    name: Extract amd64 asset from docker image
    needs: [release, build-amd64]
    runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 2
    steps:
      - name: Extract amd64
        if: needs.release.outputs.skipped == 'false'
@@ -209,7 +207,7 @@ jobs:
    name: Extract arm64 asset from docker image
    needs: [release, build-arm64]
    runs-on: ubuntu-24.04-arm
-    timeout-minutes: 5
+    timeout-minutes: 2
    steps:
      - name: Extract arm64
        if: needs.release.outputs.skipped == 'false'
@@ -233,10 +231,10 @@ jobs:
      - name: Obtain token
        if: needs.release.outputs.skipped == 'false'
        id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
        with:
          private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
          permission-contents: write # required to publish the release

      - name: Log in to the Container registry
@@ -276,6 +274,6 @@ jobs:
      - name: Discord notification
        env:
          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
        with:
          args: "Successfully deployed images for branch **${{ github.ref_name }}**. Tagged as **${{env.NEXT_VERSION}}**."
@@ -21,10 +21,10 @@ jobs:
    timeout-minutes: 2
    steps:
      - name: Discord notification
-        if: ${{ github.event.inputs.send-notifications }}
+        if: ${{ github.events.inputs.send-notifications }}
        env:
          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
        with:
          args: "Automatic release has been triggered: [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
      - name: Checkout repository
@@ -38,23 +38,22 @@ jobs:
          token: ${{ github.token }}
          branch: dev
      - name: Create pull request
-        id: create-pull-request
        run: 'gh pr create --title "chore(release): automatic release ${{ steps.semver.outputs.next }}" --body "**This is an automatic release**.<br/>Manual action may be required for major bumps.<br/>Detected change to be ``${{ steps.semver.outputs.bump }}``<br/>Bump version from ``${{ steps.semver.outputs.current }}`` to ``${{ steps.semver.outputs.next }}``" --base main --head dev --label automerge'
        env:
          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
      - name: Discord notification
-        if: ${{ github.event.inputs.send-notifications }}
+        if: ${{ github.events.inputs.send-notifications }}
        env:
          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
        with:
          args: "Created a release PR ${{ steps.create-pull-request.outputs.url }} for version ${{ steps.semver.outputs.next }} (new behaviour: ${{ steps.semver.outputs.bump }})"
      - name: Obtain token
        id: obtainApprovalToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
        with:
          private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
          permission-pull-requests: write
      - name: Approve PR
        env:
@@ -63,10 +62,10 @@ jobs:
          gh pr review --approve --body "Automatically approved by GitHub Action"
      - name: Obtain token
        id: obtainMergeToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
        with:
          private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
          permission-contents: write # write to main branch (due to merge)
          permission-pull-requests: write # merge pull request
      - id: automerge
@@ -75,7 +74,7 @@ jobs:
        uses: "pascalgn/automerge-action@v0.16.4"
        env:
          GITHUB_TOKEN: ${{ steps.obtainMergeToken.outputs.token }}
-          MERGE_METHOD: merge # we prefer merge commits for merging to main
+          MERGE_METHOD: merge # we prefer merge commits for merging to master
          MERGE_COMMIT_MESSAGE: "chore(release): automatic release ${{ steps.semver.outputs.next }}"
          MERGE_DELETE_BRANCH: false # never set to true!
          PULL_REQUEST: "${{ steps.create-pull-request.outputs.pr_number }}"
@@ -84,23 +83,23 @@ jobs:
          MERGE_REQUIRED_APPROVALS: 0 # do not require approvals

      - name: Merged Discord notification
-        if: ${{ steps.automerge.outputs.mergeResult == 'merged' && github.event.inputs.send-notifications }}
+        if: ${{ steps.automerge.outputs.mergeResult == 'merged' && github.events.inputs.send-notifications }}
        env:
          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
        with:
          args: "Merged PR ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}"
      - name: Major Bump Discord notification
-        if: ${{ steps.semver.outputs.bump == 'major' && github.event.inputs.send-notifications }}
+        if: ${{ steps.semver.outputs.bump == 'major' && github.events.inputs.send-notifications }}
        env:
          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
        with:
          args: "The release PR must be manually merged because the next version is a major version: ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}"
      - name: Discord Fail Notification
-        if: failure() && github.event.inputs.send-notifications
+        if: failure() && github.events.inputs.send-notifications
        env:
          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
        with:
          args: "The automatic release workflow [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) has failed"
@@ -12,10 +12,10 @@ jobs:
    steps:
      - name: Obtain token
        id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
        with:
          private-key: ${{ secrets.HOMARR_DOCS_RELEASE_APP_PRIVATE_KEY }}
-          client-id: ${{ vars.HOMARR_DOCS_RELEASE_APP_ID }}
+          app-id: ${{ vars.HOMARR_DOCS_RELEASE_APP_ID }}
          owner: homarr-labs
          repositories: |
            documentation
@@ -45,10 +45,10 @@ jobs:
    steps:
      - name: Obtain token
        id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
        with:
          private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
          permission-contents: write # required to commit to branch
          permission-pull-requests: write # required to create pr & enable automerge
      - name: Checkout code
@@ -7,7 +7,7 @@ on:

 jobs:
  skip-stability-days:
-    if: ${{ !startsWith(github.head_ref, 'renovate/') && github.event.pull_request.head.repo.full_name == github.repository }}
+    if: ${{ !startsWith(github.head_ref, 'renovate/') }}
    name: Skip Stability Days
    runs-on: ubuntu-latest
    timeout-minutes: 1
@@ -21,10 +21,10 @@ jobs:
    steps:
      - name: Obtain token
        id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
        with:
          private-key: ${{ secrets.HOMARR_UPDATE_CONTRIBUTORS_PRIVATE_KEY }}
-          client-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
+          app-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
          permission-contents: write # required to commit to branch
          permission-pull-requests: write # required to create pr & enable automerge

@@ -33,7 +33,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}

-      - uses: pnpm/action-setup@v6
+      - uses: pnpm/action-setup@v4
      - name: Use Node.js ${{ matrix.node-version }}
        uses: actions/setup-node@v6
        with:
@@ -21,10 +21,10 @@ jobs:
    steps:
      - name: Obtain token
        id: obtainToken
-        uses: actions/create-github-app-token@v3
+        uses: actions/create-github-app-token@v2
        with:
          private-key: ${{ secrets.HOMARR_UPDATE_CONTRIBUTORS_PRIVATE_KEY }}
-          client-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
+          app-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
          permission-contents: write # required to commit to branch
          permission-pull-requests: write # required to create pr & enable automerge
      - name: Checkout code
@@ -57,6 +57,7 @@ apps/tasks/tasks.cjs
 apps/tasks/tasks.css
 apps/websocket/wssServer.cjs
 apps/websocket/wssServer.css
+apps/nextjs/customServer.cjs
 apps/nextjs/.million/
 packages/cli/cli.cjs

@@ -69,6 +70,5 @@ apps/nextjs/public/images/background.png
 # next-intl
 en.d.json.ts

-# personal agent config
-AGENTS.md
-.opencode
+# Custom server build artifacts
+apps/nextjs/customServer.css
@@ -1 +1 @@
-24.16.0
+24.14.0
@@ -1,7 +0,0 @@
-{
-  "$schema": "./node_modules/oxfmt/configuration_schema.json",
-  "printWidth": 120,
-  "endOfLine": "lf",
-  "sortPackageJson": true,
-  "ignorePatterns": ["**/*.cjs", "**/lang/**", "static-data/**", "CHANGELOG.md"]
-}
@@ -1,37 +0,0 @@
-{
-  "$schema": "./node_modules/oxlint/configuration_schema.json",
-  "plugins": ["eslint", "typescript", "unicorn", "oxc", "react", "import", "jsx-a11y"],
-  "categories": {
-    "correctness": "error",
-    "suspicious": "warn",
-    "pedantic": "off",
-    "perf": "off",
-    "style": "off",
-    "restriction": "off",
-    "nursery": "off"
-  },
-  "rules": {
-    "eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }],
-    "typescript/consistent-type-imports": ["warn", { "prefer": "type-imports", "fixStyle": "separate-type-imports" }],
-    "typescript/no-non-null-assertion": "error",
-    "import/consistent-type-specifier-style": ["error", "prefer-top-level"],
-    "unicorn/no-new-array": "warn",
-    "unicorn/no-useless-spread": "warn",
-    "unicorn/no-useless-length-check": "warn",
-    "unicorn/no-useless-fallback-in-spread": "warn",
-    "jsx-a11y/prefer-tag-over-role": "warn",
-    "oxc/const-comparisons": "warn",
-    "react-hooks/exhaustive-deps": "warn",
-    "react/no-children-prop": "warn",
-    "jsx-a11y/no-autofocus": "warn",
-    "jsx-a11y/img-redundant-alt": "warn",
-    "react/react-in-jsx-scope": "off"
-  },
-  "options": {
-    "reportUnusedDisableDirectives": "off"
-  },
-  "ignorePatterns": ["**/*.config.js", "**/*.config.mjs", "**/*.cjs", "**/lang/*.d.json.ts", ".next/**"],
-  "settings": {
-    "react": { "version": "19" }
-  }
-}
@@ -31,5 +31,6 @@ scopeRangeRegex: "(?:const|let|var)\\s+t\\s*=\\s*(?:await\\s+)?(?:getScopedI18n|
 # refactorTemplates:
 #  - i18n.get("$1")

+
 # If set to true, only enables this custom framework (will disable all built-in frameworks)
-monopoly: true
+monopoly: true
@@ -15,7 +15,9 @@
      "request": "launch",
      "command": "pnpm docker:dev",
      "cwd": "${workspaceFolder}",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
    },
    {
      "name": "lint fix",
@@ -23,7 +25,9 @@
      "request": "launch",
      "command": "pnpm lint:fix",
      "cwd": "${workspaceFolder}",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
    },
    {
      "name": "format fix",
@@ -31,7 +35,9 @@
      "request": "launch",
      "command": "pnpm format:fix",
      "cwd": "${workspaceFolder}",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
    },
    {
      "name": "db push",
@@ -63,7 +69,9 @@
      "request": "launch",
      "command": "pnpm test",
      "cwd": "${workspaceFolder}",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
    },
    {
      "name": "test ui",
@@ -71,7 +79,9 @@
      "request": "launch",
      "command": "pnpm test:ui",
      "cwd": "${workspaceFolder}",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
    }
  ]
 }
@@ -1,6 +1,13 @@
 {
+  "eslint.workingDirectories": [
+    {
+      "mode": "auto"
+    }
+  ],
+  "eslint.experimental.useFlatConfig": true,
  "typescript.tsdk": "node_modules\\typescript\\lib",
  "js/ts.implicitProjectConfig.experimentalDecorators": true,
+  "prettier.configPath": "./tooling/prettier/index.mjs",
  "cSpell.words": [
    "ajnart",
    "cqmin",
@@ -27,7 +34,11 @@
  ],
  "i18n-ally.dirStructure": "auto",
  "i18n-ally.displayLanguage": "en",
-  "i18n-ally.enabledFrameworks": ["custom"],
-  "i18n-ally.localesPaths": ["packages/translation/src/lang"],
-  "i18n-ally.keystyle": "nested"
+  "i18n-ally.enabledFrameworks": [
+    "custom"
+  ],
+  "i18n-ally.localesPaths": [
+    "packages/translation/src/lang",
+  ],
+  "i18n-ally.keystyle": "nested",
 }
@@ -0,0 +1,369 @@
+# Memory Optimization Approaches
+
+This document describes the approaches tried and considered for reducing the RAM footprint of Homarr's server processes.
+
+## Baseline Architecture (Before)
+
+Homarr runs **three separate Node.js processes**:
+
+| Process | Port | Purpose |
+|---|---|---|
+| `apps/nextjs` (Next.js) | 3000 | Web UI + API routes |
+| `apps/websocket` (WS server) | 3001 | tRPC WebSocket subscriptions |
+| `apps/tasks` (Tasks/Cron server) | 3002 | Cron job scheduling + management API |
+
+Each process loads its own V8 heap, duplicates shared dependencies (`@homarr/db`, `@homarr/auth`, etc.), and runs its own event loop.
+
+**Measured baseline (dev mode, idle):** ~2,954 MB total RSS
+
+---
+
+## Approach 1: Integrate WebSocket Server into Next.js Custom Server
+
+**Status:** ✅ Implemented
+
+Eliminates `apps/websocket` by handling WebSocket upgrades inside a [Next.js custom server](https://nextjs.org/docs/pages/guides/custom-server):
+
+```ts
+const app = next({ dev, hostname, port, dir });
+const upgradeHandler = app.getUpgradeHandler();
+
+server.on("upgrade", (req, socket, head) => {
+  if (req.url?.startsWith("/websockets")) {
+    wss.handleUpgrade(req, socket, head, (ws) => wss.emit("connection", ws, req));
+  } else {
+    upgradeHandler(req, socket, head); // HMR, etc.
+  }
+});
+```
+
+### PROs
+- Eliminates one V8 heap (~208 MB)
+- WebSocket runs on same port as HTTP (simpler networking/proxying)
+- Shared `@homarr/db` connection pool and module cache
+- `getUpgradeHandler()` properly delegates HMR to Next.js in dev mode
+
+### CONs
+- Custom server disables some Next.js optimizations (automatic static optimization still works with `output: "standalone"`)
+- WebSocket errors could affect the main server process
+- Slightly more complex startup code
+
+---
+
+## Approach 2: Integrate Tasks/Cron Server into Next.js Custom Server
+
+**Status:** ✅ Implemented (combined with Approach 1)
+
+Eliminates `apps/tasks` by running the Fastify tRPC cron API and job scheduler inside the same process:
+
+```ts
+async function startTasksServer() {
+  const tasksServer = fastify({ maxParamLength: 5000 });
+  tasksServer.register(fastifyTRPCPlugin, { ... });
+  await cleanupSessionsAsync();
+  await invalidateUpdateCheckerCacheAsync();
+  await jobGroup.initializeAsync();
+  await jobGroup.startAllAsync();
+  await tasksServer.listen({ port: CRON_JOB_API_PORT });
+  return tasksServer;
+}
+```
+
+### PROs
+- Eliminates another V8 heap (~328 MB)
+- Shared database connection pool across Next.js API routes and cron jobs
+- Single process to manage (simpler Docker, `run.sh`, monitoring)
+- Cron jobs can directly share in-memory state with the web server
+
+### CONs
+- A misbehaving cron job could affect web request latency
+- Fastify still binds to port 3002 for internal tRPC communication (minor overhead)
+- More dependencies in the custom server bundle
+
+---
+
+## Combined Result (Approaches 1 + 2)
+
+| Component | Separate (before) | Integrated (after) |
+|---|---|---|
+| WebSocket server | ~208 MB | — |
+| Tasks/Cron server | ~328 MB | — |
+| Next.js (incl. workers) | ~2,418 MB | — |
+| Custom Server (all-in-one) | — | ~2,007 MB |
+| **Total RSS** | **~2,954 MB** | **~2,007 MB** |
+| **Savings** | — | **~947 MB (~32%)** |
+
+---
+
+## Approach 3: Eliminate Fastify — Direct Function Calls for Cron API
+
+**Status:** 📋 Considered, not implemented
+
+Since the cron job API client (`cronJobApi`) is only used from Next.js API routes (same process now), we could replace the HTTP+tRPC client with direct function calls to `JobManager`:
+
+```ts
+// Before: HTTP call to localhost:3002/trpc
+await cronJobApi.trigger.mutate({ name: "myJob" });
+
+// After: direct call in same process
+await jobManager.triggerAsync("myJob");
+```
+
+### PROs
+- Eliminates Fastify dependency and port 3002 listener entirely
+- Zero network overhead for cron API calls
+- Simpler architecture (no internal HTTP, no API key needed)
+
+### CONs
+- Requires refactoring `packages/api/src/router/cron-jobs.ts` and `packages/cron-job-api`
+- Breaks the clean separation between Next.js API and tasks concerns
+- If the architecture ever splits back to separate processes, this would need to be reverted
+- API key authentication for cron operations would need a different mechanism
+
+---
+
+## Approach 4: Node.js `--max-old-space-size` Flag
+
+**Status:** 📋 Considered, available as user override
+
+Setting `NODE_OPTIONS=--max-old-space-size=N` limits V8 heap growth and forces more aggressive garbage collection.
+
+```dockerfile
+# Example: limit heap to 512 MB
+ENV NODE_OPTIONS="--max-old-space-size=512"
+```
+
+### PROs
+- Can reduce peak memory usage in constrained environments
+- Easy to configure via environment variable
+- No code changes required
+
+### CONs
+- Too low a value causes OOM crashes under load
+- Doesn't reduce actual memory *needed*, just forces earlier GC
+- Default Node.js behavior (~1.7 GB limit on 64-bit) is reasonable for most deployments
+- Different deployments have different memory constraints — no single good default
+
+**Recommendation:** Don't set a default in the Dockerfile. Document as a tuning option for users running on low-memory hosts (e.g., `docker run -e NODE_OPTIONS="--max-old-space-size=512"`).
+
+---
+
+## Approach 5: Next.js `output: "standalone"` (Already in Use)
+
+**Status:** ✅ Already configured
+
+The `next.config.ts` already uses `output: "standalone"`, which:
+- Traces only the files needed for production
+- Creates a minimal `.next/standalone` directory
+- Avoids shipping full `node_modules`
+
+This is already optimized and no further action needed.
+
+---
+
+## Approach 6: Shared Redis Connection Pooling
+
+**Status:** 📋 Considered, not implemented
+
+With all services in one process, Redis connection pools could be shared. Currently, each module may create its own Redis client instance.
+
+### PROs
+- Fewer open connections to Redis
+- Slightly less memory for connection buffers
+
+### CONs
+- Marginal memory savings (Redis connections are lightweight)
+- Requires auditing all Redis usage across packages
+- Risk of connection contention under high load
+
+---
+
+## Summary of Recommendations
+
+| Approach | Impact | Effort | Status |
+|---|---|---|---|
+| 1. Integrate WS server | ~208 MB saved | Low | ✅ Done |
+| 2. Integrate Tasks server | ~328 MB saved | Medium | ✅ Done |
+| 3. Eliminate Fastify | ~10-30 MB saved | High | 📋 Future |
+| 4. `--max-old-space-size` | Configurable | None | 📋 User option |
+| 5. Standalone output | Already optimal | None | ✅ Already done |
+| 6. Shared Redis pools | ~5-10 MB saved | Medium | 📋 Future |
+| 7. Redis-backed initial query data | Faster page loads | Medium | 📋 POC documented |
+| 8. Client-side rendering with ISR shell | Faster TTFB | High | 📋 POC documented |
+
+---
+
+## Approach 7: Redis-Backed TanStack Query Initial Data
+
+**Status:** 📋 POC documented
+
+### Problem
+
+Currently, the dashboard page (`/`) is fully server-rendered on every request:
+
+1. Server calls `api.board.getHomeBoard()` (database query)
+2. Server prefetches all widget data via `prefetchForKindAsync()` (multiple database/integration queries)
+3. Server renders the full React tree with hydration boundary
+4. Client hydrates and takes over
+
+Each page load triggers a cascade: **Client → Next.js Server → tRPC → Database → Back**. For data that doesn't change often (board layout, widget configurations), this is wasteful.
+
+### Approach
+
+Use Redis as a shared cache layer between cron jobs and page loads. Cron jobs already populate Redis with integration data. The idea is to:
+
+1. **Cron jobs write to Redis** (already happening via `createItemAndIntegrationChannel`)
+2. **Server reads from Redis first** instead of hitting the database for widget data
+3. **Pass Redis data as `initialData`** to TanStack Query on the client
+4. **Client-side queries take over** with stale-while-revalidate behavior
+
+```tsx
+// POC: In _creator.tsx, read from Redis cache first for widget prefetching
+import { createItemAndIntegrationChannel } from "@homarr/redis";
+
+// Instead of always calling the database:
+const cachedData = await redisChannel.getAsync();
+if (cachedData) {
+  // Use cached data as initial query data - skip the database call
+  queryClient.setQueryData(queryKey, cachedData.data);
+} else {
+  // Fall back to normal prefetch
+  await prefetchForKindAsync(kind, queryClient, items);
+}
+```
+
+On the client side, TanStack Query's `initialData` option lets us hydrate from cache:
+
+```tsx
+// Client component using cached initial data
+const { data } = useQuery({
+  queryKey: ["widget", widgetId],
+  queryFn: () => fetchWidgetData(widgetId),
+  initialData: cachedWidgetData, // From Redis via server props
+  staleTime: 30_000, // Consider fresh for 30s
+});
+```
+
+### How TanStack Query Initial Data Works
+
+From the [TanStack Query docs](https://tanstack.com/query/v5/docs/framework/react/guides/initial-query-data):
+
+- `initialData` pre-populates the query cache before the component mounts
+- The query still revalidates in the background (stale-while-revalidate)
+- Combined with `staleTime`, the query won't refetch until the data is considered stale
+- This means the page renders instantly with cached data, then silently updates
+
+### PROs
+- **Faster page loads**: Redis reads are ~1ms vs ~50-200ms for database queries with joins
+- **Reduced database load**: Most page views hit Redis instead of SQLite/MySQL/PostgreSQL
+- **Leverages existing infrastructure**: Cron jobs already write widget data to Redis channels
+- **Graceful degradation**: Falls back to normal database queries on cache miss
+- **Non-breaking**: Can be adopted incrementally per widget type
+- **Shared across users**: Non-personal data (board layout, widget data) is the same for all users viewing the same board
+
+### CONs
+- **Cache staleness**: Data may be up to one cron interval old (typically 1-5 minutes)
+- **Cache invalidation complexity**: Need to invalidate Redis when boards are edited
+- **Memory usage**: More data stored in Redis (marginal since it's already stored for pub/sub)
+- **Serialization overhead**: superjson parse/stringify on every cache read
+- **Testing complexity**: Need to test cache hit/miss/stale scenarios
+
+### Estimated Impact
+
+| Metric | Before | After (cache hit) | Improvement |
+|---|---|---|---|
+| Dashboard TTFB | ~200-500ms | ~50-100ms | 2-5x faster |
+| Database queries per page load | 5-20 (depending on widgets) | 0-2 (board + auth only) | ~90% reduction |
+| Redis reads per page load | 0 | 5-20 | Acceptable (~1ms each) |
+
+### Implementation Path
+
+1. Create a `createBoardCacheChannel(boardId)` in `@homarr/redis`
+2. Populate it when boards are saved and when cron jobs update widget data
+3. In `_creator.tsx`, check cache before `prefetchForKindAsync()`
+4. Set `staleTime` to match cron interval for each widget type
+5. Add cache invalidation when boards are edited (`board.saveBoard` mutation)
+
+---
+
+## Approach 8: Client-Side Rendering with ISR Static Shell
+
+**Status:** 📋 POC documented (not recommended for Homarr's use case)
+
+### Concept
+
+Instead of server-rendering the entire dashboard on each request, serve a **static HTML shell** via Next.js ISR (Incremental Static Regeneration) and let the client fetch all dynamic content via TanStack Query.
+
+```tsx
+// Hypothetical ISR dashboard page
+export const revalidate = 60; // Regenerate every 60 seconds
+
+export default function DashboardPage() {
+  // Return a static shell - no server-side data fetching
+  return (
+    <DashboardShell>
+      <Suspense fallback={<BoardSkeleton />}>
+        <ClientBoard /> {/* Fetches via useQuery on mount */}
+      </Suspense>
+    </DashboardShell>
+  );
+}
+```
+
+The client component would then fetch everything:
+
+```tsx
+"use client";
+
+function ClientBoard() {
+  const { data: board, isLoading } = clientApi.board.getHomeBoard.useQuery(undefined, {
+    initialData: undefined, // Could be populated from Redis via API route
+  });
+
+  if (isLoading) return <BoardSkeleton />;
+  return <BoardContent board={board} />;
+}
+```
+
+### How Next.js ISR Works
+
+- On first request, Next.js generates the page and caches it
+- Subsequent requests serve the cached HTML instantly (TTFB ~0ms for CDN)
+- After `revalidate` seconds, the next request triggers background regeneration
+- The stale page is served until the new one is ready (stale-while-revalidate)
+
+### PROs
+- **Near-instant TTFB**: Static HTML served from disk/CDN cache
+- **Reduced server CPU**: No React SSR on every request
+- **Scalable**: Static pages can be served by any CDN or reverse proxy
+- **Good for public boards**: Shared boards viewed by many users benefit most
+
+### CONs
+- **Layout shift (CLS)**: Dashboard appears empty then fills in — bad UX for dashboards
+- **No SSR for SEO**: Not relevant for Homarr (it's a private dashboard app)
+- **Slower perceived load**: Users see a skeleton for 200-500ms while queries run
+- **Authentication complexity**: ISR pages must be the same for all users. Homarr's dashboard is user-specific (permissions, board access), making ISR caching ineffective for the page itself
+- **Breaks existing hydration pattern**: The current `HydrationBoundary` + `dehydrate()` pattern works well and ensures no layout shift
+- **WebSocket subscriptions delayed**: Real-time updates don't start until client JS loads and connects
+
+### Benchmark Comparison (Theoretical)
+
+| Metric | Current (SSR) | Approach 7 (Redis initial data) | Approach 8 (ISR + CSR) |
+|---|---|---|---|
+| TTFB | 200-500ms | 50-100ms | ~10ms (static) |
+| Time to Interactive | 200-500ms | 50-100ms | 200-500ms (same) |
+| Largest Contentful Paint | 200-500ms | 50-100ms | 400-800ms (worse) |
+| Cumulative Layout Shift | ~0 | ~0 | 0.1-0.3 (worse) |
+| Server CPU per request | High | Low | Near zero |
+
+### Recommendation
+
+**Approach 7 (Redis-backed initial data) is recommended over Approach 8 (ISR)** for Homarr because:
+
+1. **Dashboards are personalized**: Board access depends on user permissions, making ISR page-level caching ineffective
+2. **No layout shift**: Users expect the dashboard to appear fully rendered
+3. **Existing infrastructure**: Redis + cron jobs already provide the cache layer needed
+4. **Incremental adoption**: Can be applied per-widget without changing the overall rendering strategy
+5. **ISR is designed for content sites**: Blog posts, documentation pages, product pages — not interactive dashboards with real-time WebSocket subscriptions
+
+ISR could still be useful for specific Homarr pages like `/manage/about` or documentation pages that don't depend on user state, but the main dashboard is not a good candidate.
@@ -3,11 +3,7 @@

 # Exempt Renovate‑managed files (no owners)
 package.json
-**/package.json
 package-lock.json
-**/package-lock.json
 pnpm-lock.yaml
-**/pnpm-lock.yaml
-pnpm-workspace.yaml
 Dockerfile
 docker-compose.yml
@@ -1,4 +1,4 @@
-FROM node:24.16.0-alpine AS base
+FROM node:24.14.0-alpine AS base

 FROM base AS builder
 RUN apk add --no-cache libc6-compat
@@ -43,6 +43,7 @@ RUN mkdir -p /var/cache/nginx && \
 COPY --from=builder /app/apps/nextjs/next.config.ts .
 COPY --from=builder /app/apps/nextjs/package.json .

+COPY --from=builder /app/apps/nextjs/customServer.cjs ./apps/nextjs/customServer.cjs
 COPY --from=builder /app/node_modules/better-sqlite3/build/Release/better_sqlite3.node /app/build/better_sqlite3.node

 COPY --from=builder /app/packages/db/migrations ./db/migrations
@@ -0,0 +1,13 @@
+import baseConfig from "@homarr/eslint-config/base";
+import nextjsConfig from "@homarr/eslint-config/nextjs";
+import reactConfig from "@homarr/eslint-config/react";
+
+/** @type {import('typescript-eslint').Config} */
+export default [
+  {
+    ignores: [".next/**"],
+  },
+  ...baseConfig,
+  ...reactConfig,
+  ...nextjsConfig,
+];
@@ -6,6 +6,7 @@ import "@homarr/core/infrastructure/logs/env";
 import "@homarr/docker/env";

 import type { NextConfig } from "next";
+import MillionLint from "@million/lint";
 import createNextIntlPlugin from "next-intl/plugin";

 // Package path does not work... so we need to use relative path
@@ -30,8 +31,7 @@ const nextConfig: NextConfig = {
  serverExternalPackages: ["dockerode", "isomorphic-dompurify", "jsdom"],
  experimental: {
    optimizePackageImports: ["@mantine/core", "@mantine/hooks", "@tabler/icons-react"],
-    turbopackFileSystemCacheForDev: false,
-    webpackMemoryOptimizations: false,
+    turbopackFileSystemCacheForDev: true,
  },
  transpilePackages: ["@homarr/ui", "@homarr/notifications", "@homarr/modals", "@homarr/spotlight", "@homarr/widgets"],
  images: {
@@ -42,18 +42,9 @@ const nextConfig: NextConfig = {
      },
    ],
  },
-  // skipcq: JS-0116
  // eslint-disable-next-line @typescript-eslint/require-await,no-restricted-syntax
  async headers() {
    return [
-      {
-        source: "/sw.js",
-        headers: [
-          { key: "Content-Type", value: "application/javascript; charset=utf-8" },
-          { key: "Cache-Control", value: "no-cache, no-store, must-revalidate" },
-          { key: "Content-Security-Policy", value: "default-src 'self'; script-src 'self'" },
-        ],
-      },
      {
        source: "/(.*)", // Apply CSP to all routes
        headers: [
@@ -83,4 +74,8 @@ const nextConfig: NextConfig = {
  },
 };

+// Skip transform is used because of webpack loader, without it for example 'Tooltip.Floating' will not work and show an error
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const withMillionLint = MillionLint.next({ rsc: true, skipTransform: true, telemetry: false });
+
 export default withNextIntl(nextConfig);
@@ -4,33 +4,38 @@
  "private": true,
  "type": "module",
  "scripts": {
-    "build": "pnpm with-env next build",
+    "build": "pnpm with-env next build && pnpm build:custom-server",
+    "build:custom-server": "esbuild server.ts --bundle --platform=node --outfile=customServer.cjs --external:next --external:fastify --external:bcrypt --external:@opentelemetry/api --external:deasync --external:cpu-features --loader:.html=text --loader:.scss=text --loader:.node=text",
    "clean": "git clean -xdf .next .turbo node_modules",
-    "dev": "pnpm with-env next dev",
-    "format": "oxfmt .",
-    "lint": "oxlint",
-    "start": "pnpm with-env next start",
+    "dev": "pnpm with-env tsx ./server.ts",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "lint": "eslint",
+    "start": "pnpm with-env node customServer.cjs",
    "typecheck": "tsc --noEmit",
    "with-env": "dotenv -e ../../.env --"
  },
+  "prettier": "@homarr/prettier-config",
  "dependencies": {
-    "@dnd-kit/core": "catalog:",
-    "@dnd-kit/modifiers": "catalog:",
-    "@dnd-kit/sortable": "catalog:",
-    "@dnd-kit/utilities": "catalog:",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/modifiers": "^9.0.0",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
    "@homarr/analytics": "workspace:^0.1.0",
    "@homarr/api": "workspace:^0.1.0",
    "@homarr/auth": "workspace:^0.1.0",
    "@homarr/boards": "workspace:^0.1.0",
    "@homarr/common": "workspace:^0.1.0",
    "@homarr/core": "workspace:^0.1.0",
+    "@homarr/cron-job-api": "workspace:^0.1.0",
    "@homarr/cron-job-status": "workspace:^0.1.0",
+    "@homarr/cron-jobs": "workspace:^0.1.0",
+    "@homarr/cron-jobs-core": "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/gridstack": "^1.12.0",
    "@homarr/icons": "workspace:^0.1.0",
    "@homarr/image-proxy": "workspace:^0.1.0",
    "@homarr/integrations": "workspace:^0.1.0",
@@ -39,67 +44,76 @@
    "@homarr/notifications": "workspace:^0.1.0",
    "@homarr/old-import": "workspace:^0.1.0",
    "@homarr/old-schema": "workspace:^0.1.0",
+    "@homarr/ping": "workspace:^0.1.0",
    "@homarr/redis": "workspace:^0.1.0",
+    "@homarr/request-handler": "workspace:^0.1.0",
    "@homarr/server-settings": "workspace:^0.1.0",
    "@homarr/settings": "workspace:^0.1.0",
    "@homarr/spotlight": "workspace:^0.1.0",
-    "@homarr/tasks": "workspace:^0.1.0",
    "@homarr/translation": "workspace:^0.1.0",
    "@homarr/ui": "workspace:^0.1.0",
    "@homarr/validation": "workspace:^0.1.0",
-    "@homarr/websocket": "workspace:^0.1.0",
    "@homarr/widgets": "workspace:^0.1.0",
-    "@mantine/colors-generator": "catalog:",
-    "@mantine/core": "catalog:",
-    "@mantine/dropzone": "catalog:",
-    "@mantine/hooks": "catalog:",
-    "@mantine/modals": "catalog:",
-    "@mantine/tiptap": "catalog:",
-    "@tabler/icons-react": "catalog:",
-    "@tanstack/react-query": "catalog:",
-    "@tanstack/react-query-devtools": "catalog:",
-    "@tanstack/react-query-next-experimental": "catalog:",
-    "@trpc/client": "catalog:",
-    "@trpc/next": "catalog:",
-    "@trpc/react-query": "catalog:",
-    "@trpc/server": "catalog:",
-    "@xterm/addon-canvas": "catalog:",
-    "@xterm/addon-fit": "catalog:",
-    "@xterm/xterm": "catalog:",
-    "babel-plugin-react-compiler": "catalog:",
-    "chroma-js": "catalog:",
-    "clsx": "catalog:",
-    "dayjs": "catalog:",
-    "dotenv": "catalog:",
-    "flag-icons": "catalog:",
-    "glob": "catalog:",
-    "isomorphic-dompurify": "catalog:",
-    "jotai": "catalog:",
-    "mantine-react-table": "catalog:",
-    "next": "catalog:",
-    "postcss-preset-mantine": "catalog:",
-    "prismjs": "catalog:",
-    "react": "catalog:",
-    "react-dom": "catalog:",
-    "react-error-boundary": "catalog:",
-    "react-simple-code-editor": "catalog:",
-    "sass": "catalog:",
-    "superjson": "catalog:",
-    "swagger-ui-react": "catalog:",
-    "use-deep-compare-effect": "catalog:",
-    "yaml": "catalog:",
-    "zod": "catalog:"
+    "@mantine/colors-generator": "^8.3.16",
+    "@mantine/core": "^8.3.16",
+    "@mantine/dropzone": "^8.3.16",
+    "@mantine/hooks": "^8.3.16",
+    "@mantine/modals": "^8.3.16",
+    "@mantine/tiptap": "^8.3.16",
+    "@million/lint": "1.0.14",
+    "@tabler/icons-react": "^3.40.0",
+    "@tanstack/react-query": "^5.90.21",
+    "@tanstack/react-query-devtools": "^5.91.3",
+    "@tanstack/react-query-next-experimental": "^5.91.0",
+    "@trpc/client": "^11.12.0",
+    "@trpc/next": "^11.12.0",
+    "@trpc/react-query": "^11.12.0",
+    "@trpc/server": "^11.12.0",
+    "@xterm/addon-canvas": "^0.7.0",
+    "@xterm/addon-fit": "0.11.0",
+    "@xterm/xterm": "^6.0.0",
+    "babel-plugin-react-compiler": "^1.0.0",
+    "chroma-js": "^3.2.0",
+    "clsx": "^2.1.1",
+    "dayjs": "^1.11.19",
+    "dotenv": "^17.3.1",
+    "fastify": "^5.7.4",
+    "flag-icons": "^7.5.0",
+    "glob": "^13.0.6",
+    "isomorphic-dompurify": "^3.1.0",
+    "jotai": "^2.18.1",
+    "mantine-react-table": "2.0.0-beta.9",
+    "next": "16.1.6",
+    "postcss-preset-mantine": "^1.18.0",
+    "prismjs": "^1.30.0",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
+    "react-error-boundary": "^6.1.1",
+    "react-simple-code-editor": "^0.14.1",
+    "sass": "^1.97.3",
+    "superjson": "2.2.6",
+    "swagger-ui-react": "^5.32.0",
+    "use-deep-compare-effect": "^1.8.1",
+    "ws": "^8.19.0",
+    "zod": "^4.2.1"
  },
  "devDependencies": {
+    "@homarr/eslint-config": "workspace:^0.2.0",
+    "@homarr/prettier-config": "workspace:^0.1.0",
    "@homarr/tsconfig": "workspace:^0.1.0",
-    "@types/chroma-js": "catalog:",
-    "@types/node": "catalog:",
-    "@types/prismjs": "catalog:",
-    "@types/react": "catalog:",
-    "@types/react-dom": "catalog:",
-    "@types/swagger-ui-react": "catalog:",
-    "concurrently": "catalog:",
-    "node-loader": "catalog:",
-    "typescript": "catalog:"
+    "@types/chroma-js": "3.1.2",
+    "@types/node": "^24.12.0",
+    "@types/prismjs": "^1.26.6",
+    "@types/react": "19.2.14",
+    "@types/react-dom": "19.2.3",
+    "@types/swagger-ui-react": "^5.18.0",
+    "@types/ws": "^8.18.1",
+    "concurrently": "^9.2.1",
+    "esbuild": "^0.27.3",
+    "eslint": "^9.39.4",
+    "node-loader": "^2.1.0",
+    "prettier": "^3.8.1",
+    "tsx": "4.20.4",
+    "typescript": "^5.9.3"
  }
 }
@@ -1,7 +0,0 @@
-self.addEventListener("install", () => {
-  self.skipWaiting();
-});
-
-self.addEventListener("activate", (event) => {
-  event.waitUntil(self.clients.claim());
-});
@@ -0,0 +1,318 @@
+// Must be imported first to set up globalThis.AsyncLocalStorage for Next.js
+import "next/dist/server/node-environment-baseline";
+
+// Set up undici HTTP agent override (from tasks app)
+import { setGlobalDispatcher } from "undici";
+import { UndiciHttpAgent } from "@homarr/core/infrastructure/http";
+setGlobalDispatcher(new UndiciHttpAgent());
+
+import { createServer } from "http";
+import path from "path";
+import next from "next";
+import { parse } from "url";
+import { applyWSSHandler } from "@trpc/server/adapters/ws";
+import { WebSocketServer } from "ws";
+import type { FastifyTRPCPluginOptions } from "@trpc/server/adapters/fastify";
+import { fastifyTRPCPlugin } from "@trpc/server/adapters/fastify";
+import fastify from "fastify";
+
+import { appRouter, createTRPCContext } from "@homarr/api/websocket";
+import { getSessionFromToken, sessionTokenCookieName } from "@homarr/auth";
+import { env as authEnv } from "@homarr/auth/env";
+import { parseCookies } from "@homarr/common";
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
+import type { JobRouter } from "@homarr/cron-job-api";
+import { jobRouter } from "@homarr/cron-job-api";
+import { CRON_JOB_API_KEY_HEADER, CRON_JOB_API_PATH, CRON_JOB_API_PORT } from "@homarr/cron-job-api/constants";
+import { jobGroup } from "@homarr/cron-jobs";
+import { db, eq, inArray } from "@homarr/db";
+import { cronJobConfigurations, sessions, users } from "@homarr/db/schema";
+import { supportedAuthProviders } from "@homarr/definitions";
+import { updateCheckerRequestHandler } from "@homarr/request-handler/update-checker";
+import { schedule, validate as validateCron } from "node-cron";
+
+const logger = createLogger({ module: "customServer" });
+
+// --- JobManager (from apps/tasks/src/job-manager.ts) ---
+import type { IJobManager } from "@homarr/cron-job-api";
+import type { jobGroup as CronJobGroup, JobGroupKeys } from "@homarr/cron-jobs";
+import type { Database, InferInsertModel } from "@homarr/db";
+
+class JobManager implements IJobManager {
+  constructor(
+    private db: Database,
+    private jobGroup: typeof CronJobGroup,
+  ) {}
+
+  public async startAsync(name: JobGroupKeys): Promise<void> {
+    await this.jobGroup.startAsync(name);
+  }
+  public async triggerAsync(name: JobGroupKeys): Promise<void> {
+    await this.jobGroup.runManuallyAsync(name);
+  }
+  public async stopAsync(name: JobGroupKeys): Promise<void> {
+    await this.jobGroup.stopAsync(name);
+  }
+  public async updateIntervalAsync(name: JobGroupKeys, cron: string): Promise<void> {
+    logger.info("Updating cron job interval", { name, expression: cron });
+    const job = this.jobGroup.getJobRegistry().get(name);
+    if (!job) throw new Error(`Job ${name} not found`);
+    if (!validateCron(cron)) {
+      throw new Error(`Invalid cron expression: ${cron}`);
+    }
+    if (job.preventCustomInterval && cron !== job.cronExpression) {
+      throw new Error(`Custom cron expressions are not allowed for job ${name}`);
+    }
+
+    await this.updateConfigurationAsync(name, { cronExpression: cron });
+    await this.jobGroup.getTask(name)?.destroy();
+
+    this.jobGroup.setTask(
+      name,
+      schedule(cron, () => void job.executeAsync(), {
+        name,
+      }),
+    );
+    logger.info("Cron job interval updated", { name, expression: cron });
+  }
+  public async disableAsync(name: JobGroupKeys): Promise<void> {
+    logger.info("Disabling cron job", { name });
+    const job = this.jobGroup.getJobRegistry().get(name);
+    if (!job) throw new Error(`Job ${name} not found`);
+
+    await this.updateConfigurationAsync(name, { isEnabled: false });
+    await this.jobGroup.stopAsync(name);
+    logger.info("Cron job disabled", { name });
+  }
+  public async enableAsync(name: JobGroupKeys): Promise<void> {
+    logger.info("Enabling cron job", { name });
+    await this.updateConfigurationAsync(name, { isEnabled: true });
+    await this.jobGroup.startAsync(name);
+    logger.info("Cron job enabled", { name });
+  }
+
+  private async updateConfigurationAsync(
+    name: JobGroupKeys,
+    configuration: Omit<Partial<InferInsertModel<typeof cronJobConfigurations>>, "name">,
+  ) {
+    const existingConfig = await this.db.query.cronJobConfigurations.findFirst({
+      where: (table, { eq }) => eq(table.name, name),
+    });
+
+    if (existingConfig) {
+      await this.db
+        .update(cronJobConfigurations)
+        .set({ ...configuration, name: undefined })
+        .where(eq(cronJobConfigurations.name, name));
+      return;
+    }
+
+    const job = this.jobGroup.getJobRegistry().get(name);
+    if (!job) throw new Error(`Job ${name} not found`);
+
+    await this.db.insert(cronJobConfigurations).values({
+      name,
+      cronExpression: configuration.cronExpression ?? job.cronExpression,
+      isEnabled: configuration.isEnabled ?? true,
+    });
+  }
+
+  public async getAllAsync(): Promise<
+    {
+      name: JobGroupKeys;
+      cron: string;
+      preventManualExecution: boolean;
+      preventCustomInterval: boolean;
+      isEnabled: boolean;
+    }[]
+  > {
+    const configurations = await this.db.query.cronJobConfigurations.findMany();
+
+    return [...this.jobGroup.getJobRegistry().entries()].map(([name, job]) => {
+      const config = configurations.find((config) => config.name === name);
+      return {
+        name,
+        cron: config?.cronExpression ?? job.cronExpression,
+        preventManualExecution: job.preventManualExecution,
+        preventCustomInterval: job.preventCustomInterval,
+        isEnabled: config?.isEnabled ?? true,
+      };
+    });
+  }
+}
+
+// --- On-start functions (from apps/tasks/src/on-start/) ---
+async function cleanupSessionsAsync() {
+  try {
+    const currentAuthProviders = authEnv.AUTH_PROVIDERS;
+    const inactiveAuthProviders = supportedAuthProviders.filter((provider) => !currentAuthProviders.includes(provider));
+    const subQuery = db
+      .select({ id: users.id })
+      .from(users)
+      .where(inArray(users.provider, inactiveAuthProviders))
+      .as("sq");
+    const sessionsWithInactiveProviders = await db
+      .select({ userId: sessions.userId })
+      .from(sessions)
+      .rightJoin(subQuery, eq(sessions.userId, subQuery.id));
+
+    const userIds = sessionsWithInactiveProviders.map(({ userId }) => userId).filter((value) => value !== null);
+    await db.delete(sessions).where(inArray(sessions.userId, userIds));
+
+    if (sessionsWithInactiveProviders.length > 0) {
+      logger.info("Deleted sessions for inactive providers", { count: userIds.length });
+    }
+  } catch (error) {
+    logger.error(new Error("Failed to clean up sessions", { cause: error }));
+  }
+}
+
+async function invalidateUpdateCheckerCacheAsync() {
+  try {
+    const handler = updateCheckerRequestHandler.handler({});
+    await handler.invalidateAsync();
+    logger.debug("Update checker cache invalidated");
+  } catch (error) {
+    logger.error(new Error("Failed to invalidate update checker cache", { cause: error }));
+  }
+}
+
+// --- Tasks/Cron Fastify server setup ---
+async function startTasksServer() {
+  const tasksLogger = createLogger({ module: "tasksMain" });
+
+  const tasksServer = fastify({ maxParamLength: 5000 });
+  tasksServer.register(fastifyTRPCPlugin, {
+    prefix: CRON_JOB_API_PATH,
+    trpcOptions: {
+      router: jobRouter,
+      createContext: ({ req }) => ({
+        manager: new JobManager(db, jobGroup),
+        apiKey: req.headers[CRON_JOB_API_KEY_HEADER] as string | undefined,
+      }),
+      onError({ path, error }) {
+        tasksLogger.error(new ErrorWithMetadata("Error in tasks tRPC handler", { path }, { cause: error }));
+      },
+    } satisfies FastifyTRPCPluginOptions<JobRouter>["trpcOptions"],
+  });
+
+  // Run on-start tasks
+  await cleanupSessionsAsync();
+  await invalidateUpdateCheckerCacheAsync();
+
+  // Initialize and start cron jobs
+  await jobGroup.initializeAsync();
+  await jobGroup.startAllAsync();
+
+  try {
+    await tasksServer.listen({ port: CRON_JOB_API_PORT });
+    tasksLogger.info("Tasks web server started successfully", { port: CRON_JOB_API_PORT });
+  } catch (err) {
+    tasksLogger.error(
+      new ErrorWithMetadata("Failed to start tasks web server", { port: CRON_JOB_API_PORT }, { cause: err }),
+    );
+  }
+
+  return tasksServer;
+}
+
+// --- Main server setup ---
+const dev = process.env.NODE_ENV !== "production";
+const hostname = process.env.HOSTNAME || "localhost";
+const port = parseInt(process.env.PORT || "3000", 10);
+// Resolve the directory of this file so Next.js can find the app/pages dirs
+const dir = path.resolve(__dirname);
+
+const app = next({ dev, hostname, port, dir });
+const handle = app.getRequestHandler();
+const upgradeHandler = app.getUpgradeHandler();
+
+app.prepare().then(async () => {
+  const server = createServer((req, res) => {
+    const parsedUrl = parse(req.url!, true);
+    handle(req, res, parsedUrl);
+  });
+
+  // Create WebSocket server in noServer mode so we handle upgrade manually
+  const wss = new WebSocketServer({ noServer: true });
+
+  const wssHandler = applyWSSHandler({
+    wss,
+    router: appRouter,
+    // eslint-disable-next-line no-restricted-syntax
+    createContext: async ({ req }) => {
+      try {
+        const headers = Object.entries(req.headers).map(
+          ([key, value]) => [key, typeof value === "string" ? value : value?.[0]] as [string, string],
+        );
+        const nextHeaders = new Headers(headers);
+
+        const store = parseCookies(nextHeaders.get("cookie") ?? "");
+        const sessionToken = store[sessionTokenCookieName];
+
+        const session = await getSessionFromToken(db, sessionToken);
+
+        return createTRPCContext({
+          headers: nextHeaders,
+          session,
+        });
+      } catch (error) {
+        logger.error(error);
+        return createTRPCContext({
+          headers: new Headers(),
+          session: null,
+        });
+      }
+    },
+    keepAlive: {
+      enabled: true,
+      pingMs: 30000,
+      pongWaitMs: 5000,
+    },
+  });
+
+  // Handle upgrade requests: route /websockets to our WS server,
+  // delegate everything else (e.g. HMR _next/webpack-hmr) to Next.js
+  server.on("upgrade", (req, socket, head) => {
+    if (req.url?.startsWith("/websockets")) {
+      wss.handleUpgrade(req, socket, head, (ws) => {
+        wss.emit("connection", ws, req);
+      });
+    } else {
+      upgradeHandler(req, socket, head);
+    }
+  });
+
+  wss.on("connection", (websocket, incomingMessage) => {
+    logger.info(`➕ Connection (${wss.clients.size}) ${incomingMessage.method} ${incomingMessage.url}`);
+    websocket.once("close", (code, reason) => {
+      logger.info(`➖ Connection (${wss.clients.size}) ${code} ${reason.toString()}`);
+    });
+  });
+
+  // Start the integrated tasks/cron server
+  const tasksServer = await startTasksServer();
+
+  server.once("error", (err) => {
+    logger.error(new ErrorWithMetadata("Server error", {}, { cause: err }));
+    wssHandler.broadcastReconnectNotification();
+    wss.close();
+    tasksServer.close().catch((closeError) => logger.error("Failed to close tasks server", closeError));
+    server.close(() => process.exit(1));
+  });
+
+  server.listen(port, () => {
+    logger.info(`✅ Custom server ready on http://${hostname}:${port}`);
+    logger.info(`✅ WebSocket Server integrated on ws://${hostname}:${port}/websockets`);
+    logger.info(`✅ Tasks/Cron server integrated on port ${CRON_JOB_API_PORT}`);
+  });
+
+  process.on("SIGTERM", () => {
+    logger.info("SIGTERM");
+    wssHandler.broadcastReconnectNotification();
+    wss.close();
+    tasksServer.close().catch((closeError) => logger.error("Failed to close tasks server", closeError));
+    server.close();
+  });
+});
@@ -2,23 +2,30 @@

 import type { PropsWithChildren } from "react";
 import type { MantineColorScheme, MantineColorSchemeManager } from "@mantine/core";
-import { DirectionProvider, MantineProvider } from "@mantine/core";
+import { createTheme, DirectionProvider, MantineProvider } from "@mantine/core";
 import dayjs from "dayjs";

 import { clientApi } from "@homarr/api/client";
 import { useSession } from "@homarr/auth/client";
 import { parseCookies, setClientCookie } from "@homarr/common";
+import type { ColorScheme } from "@homarr/definitions";
 import { colorSchemeCookieKey } from "@homarr/definitions";
-import { theme } from "@homarr/ui";

 export const CustomMantineProvider = ({
  children,
  defaultColorScheme,
-}: PropsWithChildren<{ defaultColorScheme: MantineColorScheme }>) => {
+}: PropsWithChildren<{ defaultColorScheme: ColorScheme }>) => {
  const manager = useColorSchemeManager();
  return (
    <DirectionProvider>
-      <MantineProvider defaultColorScheme={defaultColorScheme} colorSchemeManager={manager} theme={theme}>
+      <MantineProvider
+        defaultColorScheme={defaultColorScheme}
+        colorSchemeManager={manager}
+        theme={createTheme({
+          primaryColor: "red",
+          autoContrast: true,
+        })}
+      >
        {children}
      </MantineProvider>
    </DirectionProvider>
@@ -28,7 +35,7 @@ export const CustomMantineProvider = ({
 export function useColorSchemeManager(): MantineColorSchemeManager {
  const { data: session } = useSession();

-  const updateCookieValue = (value: MantineColorScheme) => {
+  const updateCookieValue = (value: Exclude<MantineColorScheme, "auto">) => {
    setClientCookie(colorSchemeCookieKey, value, { expires: dayjs().add(1, "year").toDate(), path: "/" });
  };

@@ -53,6 +60,7 @@ export function useColorSchemeManager(): MantineColorSchemeManager {
    },

    set: (value) => {
+      if (value === "auto") return;
      try {
        if (session) {
          mutateColorScheme({ colorScheme: value });
@@ -32,13 +32,12 @@ const getWebSocketProtocol = () => {
 };

 const constructWebsocketUrl = () => {
-  const fallback = `${getWebSocketProtocol()}://localhost:3001/websockets`;
  if (typeof window === "undefined") {
-    return fallback;
+    return `${getWebSocketProtocol()}://localhost:3000/websockets`;
  }

  if (env.NODE_ENV === "development") {
-    return fallback;
+    return `${getWebSocketProtocol()}://localhost:3000/websockets`;
  }

  return `${getWebSocketProtocol()}://${window.location.hostname}:${window.location.port}/websockets`;
@@ -59,7 +59,7 @@ export default async function InviteUsagePage(props: InviteUsagePageProps) {
            {t("subtitle")}
          </Text>
        </Stack>
-        <Card w={64 * 6} maw="90vw">
+        <Card withBorder w={64 * 6} maw="90vw">
          <RegistrationForm invite={invite} />
        </Card>
        <Text size="xs" c="gray.5" ta="center">
@@ -9,11 +9,10 @@ import { z } from "zod/v4";

 import { signIn } from "@homarr/auth/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
-import type { UseFormReturnType } from "@homarr/form";
+import type { useForm } from "@homarr/form";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
-import { sanitizeRedirectionUrl } from "@homarr/validation/redirection-url";
 import { userSignInSchema } from "@homarr/validation/user";

 type Provider = "credentials" | "ldap" | "oidc";
@@ -71,7 +70,7 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c

      // Redirect to the callback URL if the response is defined and comes from a credentials provider (ldap or credentials). oidc is redirected automatically.
      await revalidatePathActionAsync("/");
-      router.push(sanitizeRedirectionUrl(callbackUrl));
+      router.push(callbackUrl);
    },
    [t, router, callbackUrl],
  );
@@ -162,7 +161,7 @@ export const LoginForm = ({ providers, oidcClientName, isOidcAutoLoginEnabled, c

 interface SubmitButtonProps {
  isPending: boolean;
-  form: UseFormReturnType<FormType>;
+  form: ReturnType<typeof useForm<FormType, (values: FormType) => FormType>>;
  provider: "credentials" | "ldap";
 }

@@ -198,7 +197,7 @@ const PasswordForgottenCollapse = ({ username }: PasswordForgottenCollapseProps)
        {tForgotPassword("label")}
      </Anchor>

-      <Collapse expanded={visible}>
+      <Collapse in={visible}>
        <Card>
          <Stack gap="xs">
            <Text size="sm">{tForgotPassword("description")}</Text>
@@ -4,7 +4,6 @@ import { Card, Center, Stack, Text, Title } from "@mantine/core";
 import { env } from "@homarr/auth/env";
 import { auth } from "@homarr/auth/next";
 import { getScopedI18n } from "@homarr/translation/server";
-import { sanitizeRedirectionUrl } from "@homarr/validation/redirection-url";

 import { HomarrLogoWithTitle } from "~/components/layout/logo/homarr-logo";
 import { LoginForm } from "./_login-form";
@@ -20,7 +19,7 @@ export default async function Login(props: LoginProps) {
  const session = await auth();

  if (session) {
-    redirect(sanitizeRedirectionUrl(searchParams.callbackUrl));
+    redirect(searchParams.callbackUrl ?? "/");
  }

  const t = await getScopedI18n("user.page.login");
@@ -37,7 +36,7 @@ export default async function Login(props: LoginProps) {
            {t("subtitle")}
          </Text>
        </Stack>
-        <Card w={64 * 6} maw="90vw">
+        <Card withBorder w={64 * 6} maw="90vw">
          <LoginForm
            providers={env.AUTH_PROVIDERS}
            oidcClientName={env.AUTH_OIDC_CLIENT_NAME}
@@ -1,27 +1,70 @@
 "use client";

-import { Box, Stack } from "@mantine/core";
+import { useCallback, useRef } from "react";
+import { Box, LoadingOverlay, Stack } from "@mantine/core";

+import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
 import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";

 import { BoardCategorySection } from "~/components/board/sections/category-section";
 import { BoardEmptySection } from "~/components/board/sections/empty-section";
 import { BoardBackgroundVideo } from "~/components/layout/background";
+import { fullHeightWithoutHeaderAndFooter } from "~/constants";
+import { useIsBoardReady } from "./_ready-context";
+
+let boardName: string | null = null;
+
+export const updateBoardName = (name: string | null) => {
+  boardName = name;
+};
+
+type UpdateCallback = (prev: RouterOutputs["board"]["getHomeBoard"]) => RouterOutputs["board"]["getHomeBoard"];
+
+export const useUpdateBoard = () => {
+  const utils = clientApi.useUtils();
+
+  const updateBoard = useCallback(
+    (updaterWithoutUndefined: UpdateCallback) => {
+      if (!boardName) {
+        throw new Error("Board name is not set");
+      }
+      utils.board.getBoardByName.setData({ name: boardName }, (previous) =>
+        previous ? updaterWithoutUndefined(previous) : previous,
+      );
+    },
+    [utils],
+  );
+
+  return {
+    updateBoard,
+  };
+};

 export const ClientBoard = () => {
  const board = useRequiredBoard();
  const currentLayoutId = useCurrentLayout();
+  const isReady = useIsBoardReady();

  const fullWidthSortedSections = board.sections
    .filter((section) => section.kind === "empty" || section.kind === "category")
    .sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset);

+  const ref = useRef<HTMLDivElement>(null);
+
  return (
    <Box h="100%" pos="relative">
      <BoardBackgroundVideo />
-      <Stack h="100%">
+      <LoadingOverlay
+        visible={!isReady}
+        transitionProps={{ duration: 500 }}
+        loaderProps={{ size: "lg" }}
+        h={fullHeightWithoutHeaderAndFooter}
+      />
+      <Stack ref={ref} h="100%" style={{ visibility: isReady ? "visible" : "hidden" }}>
        {fullWidthSortedSections.map((section) =>
          section.kind === "empty" ? (
+            // Unique keys per layout to always reinitialize the gridstack
            <BoardEmptySection key={`${currentLayoutId}-${section.id}`} section={section} />
          ) : (
            <BoardCategorySection key={`${currentLayoutId}-${section.id}`} section={section} />
@@ -41,11 +41,13 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
    }),
    // eslint-disable-next-line no-restricted-syntax
    page: async ({ params }: { params: Promise<TParams> }) => {
-      const resolvedParams = await params;
+      const session = await auth();
+      const integrations = await getIntegrationsWithPermissionsAsync(session);
+
+      const board = await getInitialBoard(await params);
      const queryClient = getQueryClient();

-      const [board, session] = await Promise.all([getInitialBoard(resolvedParams), auth()]);
-
+      // Prefetch item data
      const itemsMap = board.items.reduce((acc, item) => {
        const existing = acc.get(item.kind);
        if (existing) {
@@ -56,20 +58,17 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
        return acc;
      }, new Map<WidgetKind, Item[]>());

-      const [integrations] = await Promise.all([
-        getIntegrationsWithPermissionsAsync(session),
-        ...Array.from(itemsMap).map(([kind, items]) =>
-          prefetchForKindAsync(kind, queryClient, items).catch((error) => {
-            logger.error(
-              new ErrorWithMetadata(
-                "Failed to prefetch widget",
-                { widgetKind: kind, itemCount: items.length },
-                { cause: error },
-              ),
-            );
-          }),
-        ),
-      ]);
+      for (const [kind, items] of itemsMap) {
+        await prefetchForKindAsync(kind, queryClient, items).catch((error) => {
+          logger.error(
+            new ErrorWithMetadata(
+              "Failed to prefetch widget",
+              { widgetKind: kind, itemCount: items.length },
+              { cause: error },
+            ),
+          );
+        });
+      }

      return (
        <HydrationBoundary state={dehydrate(queryClient)}>
@@ -109,7 +109,7 @@ const AddMenu = () => {
  }, [openAppSelectModal, createItem]);

  return (
-    <Menu position="bottom-end">
+    <Menu position="bottom-end" withArrow>
      <Menu.Target>
        <HeaderButton w="auto" px={4}>
          <Group gap={4} wrap="nowrap">
@@ -183,7 +183,7 @@ const SelectBoardsMenu = () => {
  const { data: boards = [] } = clientApi.board.getAllBoards.useQuery();

  return (
-    <Menu position="bottom-end">
+    <Menu position="bottom-end" withArrow>
      <Menu.Target>
        <HeaderButton w="auto" px={4}>
          <IconReplace stroke={1.5} />
@@ -264,5 +264,6 @@ const usePreventLeaveWithDirty = (isDirty: boolean) => {
      window.removeEventListener("popstate", handlePopState);
      window.removeEventListener("beforeunload", handleBeforeUnload);
    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [isDirty]);
 };
@@ -1,19 +1,43 @@
 "use client";

 import type { PropsWithChildren } from "react";
-import { createContext, useCallback, useContext } from "react";
+import { createContext, useCallback, useContext, useEffect, useState } from "react";
+import { usePathname } from "next/navigation";
+
+import { clientApi } from "@homarr/api/client";
+import { useRequiredBoard } from "@homarr/boards/context";

 const BoardReadyContext = createContext<{
+  isReady: boolean;
  markAsReady: (id: string) => void;
 } | null>(null);

 export const BoardReadyProvider = ({ children }: PropsWithChildren) => {
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  const markAsReady = useCallback((_id: string) => {}, []);
+  const pathname = usePathname();
+  const utils = clientApi.useUtils();
+  const board = useRequiredBoard();
+  const [readySections, setReadySections] = useState<string[]>([]);
+
+  // Reset sections required for ready state
+  useEffect(() => {
+    return () => {
+      setReadySections([]);
+    };
+  }, [pathname, utils]);
+
+  useEffect(() => {
+    setReadySections((previous) => previous.filter((id) => board.sections.some((section) => section.id === id)));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [board.sections.length, setReadySections]);
+
+  const markAsReady = useCallback((id: string) => {
+    setReadySections((previous) => (previous.includes(id) ? previous : [...previous, id]));
+  }, []);

  return (
    <BoardReadyContext.Provider
      value={{
+        isReady: board.sections.length === readySections.length,
        markAsReady,
      }}
    >
@@ -31,3 +55,13 @@ export const useMarkSectionAsReady = () => {

  return context.markAsReady;
 };
+
+export const useIsBoardReady = () => {
+  const context = useContext(BoardReadyContext);
+
+  if (!context) {
+    throw new Error("BoardReadyProvider is required");
+  }
+
+  return context.isReady;
+};
@@ -24,7 +24,6 @@ export const BoardMantineProvider = ({
    },
    primaryColor: "primaryColor",
    autoContrast: true,
-    defaultRadius: "sm",
    fontSizes: {
      "2xl": rem(24),
      "3xl": rem(28),
@@ -83,7 +83,7 @@ export const ColorSettingsContent = ({ board }: Props) => {
            <Anchor onClick={toggle}>{showPreview ? t("common.preview.hide") : t("common.preview.show")}</Anchor>
          </Grid.Col>
          <Grid.Col span={12}>
-            <Collapse expanded={showPreview}>
+            <Collapse in={showPreview}>
              <Stack>
                <ColorsPreview previewColor={form.values.primaryColor} />
                <ColorsPreview previewColor={form.values.secondaryColor} />
@@ -2,7 +2,7 @@

 import { useEffect, useRef } from "react";
 import { Button, Grid, Group, Loader, Stack, TextInput } from "@mantine/core";
-import { useDebouncedValue, useDocumentTitle } from "@mantine/hooks";
+import { useDebouncedValue, useDocumentTitle, useFavicon } from "@mantine/hooks";

 import { useUpdateBoard } from "@homarr/boards/updater";
 import { useZodForm } from "@homarr/form";
@@ -10,7 +10,6 @@ import { IconPicker } from "@homarr/forms-collection";
 import { useI18n } from "@homarr/translation/client";
 import { boardSavePartialSettingsSchema } from "@homarr/validation/board";

-import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
 import { createMetaTitle } from "~/metadata";
 import type { Board } from "../../_types";
 import { useSavePartialSettingsMutation } from "./_shared";
@@ -54,6 +53,7 @@ export const GeneralSettingsContent = ({ board }: Props) => {
  );

  useLogoPreview(form.values.logoImageUrl);
+  useFaviconPreview(form.values.faviconImageUrl);
  const metaTitleStatus = useMetaTitlePreview(form.values.metaTitle);

  // Cleanup for not applied changes of the page title and logo image URL
@@ -75,7 +75,6 @@ export const GeneralSettingsContent = ({ board }: Props) => {
          pageTitle: values.pageTitle,
          logoImageUrl: values.logoImageUrl,
        };
-        updateFavicon(values.faviconImageUrl ?? homarrLogoPath);
        savePartialSettings({
          id: board.id,
          ...values,
@@ -147,13 +146,7 @@ const useMetaTitlePreview = (title: string | null) => {
  };
 };

-// Previously we used the useFavicon hook from Mantine
-// However if the user tried to click on a link to a different page
-// it caused an error "Cannot read properties of null (reading 'removeChild')"
-// Probably because the head element was null (https://github.com/mantinedev/mantine/blob/b90d9b81031f45f5d15e75f25138ed6477f65bce/packages/%40mantine/hooks/src/use-favicon/use-favicon.ts#L21)
-// See https://github.com/homarr-labs/homarr/issues/4905
-const updateFavicon = (url: string) => {
-  const link: HTMLLinkElement | null = document.querySelector('link[rel="icon"]');
-  if (!link) return;
-  link.href = url;
+const useFaviconPreview = (url: string | null) => {
+  const [faviconDebounced] = useDebouncedValue(url ?? "", 500);
+  useFavicon(faviconDebounced);
 };
@@ -15,7 +15,7 @@ export const InitFinish = async () => {
  const tFinish = await getScopedI18n("init.step.finish");

  return (
-    <Card w={64 * 6} maw="90vw">
+    <Card w={64 * 6} maw="90vw" withBorder>
      <Stack>
        <Text>{tFinish("description")}</Text>

@@ -34,7 +34,7 @@ export const InitGroup = () => {
  };

  return (
-    <Card w={64 * 6} maw="90vw">
+    <Card w={64 * 6} maw="90vw" withBorder>
      <form onSubmit={form.onSubmit(handleSubmitAsync)}>
        <Stack>
          <TextInput
@@ -13,7 +13,7 @@ interface FileInfoCardProps {
 export const FileInfoCard = ({ file, onRemove }: FileInfoCardProps) => {
  const tFileInfo = useScopedI18n("init.step.import.fileInfo");
  return (
-    <Card w={64 * 12 + 8} maw="90vw" withBorder={false}>
+    <Card w={64 * 12 + 8} maw="90vw">
      <Group justify="space-between" align="center" wrap="nowrap">
        <Group>
          <Text fw={500} lineClamp={1} style={{ wordBreak: "break-all" }}>
@@ -20,7 +20,7 @@ export const InitImport = () => {

  if (!file) {
    return (
-      <Card w={64 * 12 + 8} maw="90vw">
+      <Card w={64 * 12 + 8} maw="90vw" withBorder>
        <ImportDropZone
          loading={isPending}
          updateFile={(file) => {
@@ -30,7 +30,7 @@ export const InitSettings = () => {
  return (
    <form onSubmit={form.onSubmit(handleSubmitAsync)}>
      <Stack>
-        <Card w={64 * 12 + 8} maw="90vw">
+        <Card w={64 * 12 + 8} maw="90vw" withBorder>
          <Stack gap="sm">
            <Text fw={500}>{tSection("analytics.title")}</Text>

@@ -39,7 +39,7 @@ export const InitSettings = () => {
            </Stack>
          </Stack>
        </Card>
-        <Card w={64 * 12 + 8} maw="90vw">
+        <Card w={64 * 12 + 8} maw="90vw" withBorder>
          <Stack gap="sm">
            <Text fw={500}>{tSection("crawlingAndIndexing.title")}</Text>

@@ -10,7 +10,7 @@ export const InitStart = async () => {
  const tStart = await getScopedI18n("init.step.start");

  return (
-    <Card w={64 * 6} maw="90vw">
+    <Card w={64 * 6} maw="90vw" withBorder>
      <Stack>
        <Text>{tStart("description")}</Text>

@@ -4,7 +4,7 @@ import { InitUserForm } from "./init-user-form";

 export const InitUser = () => {
  return (
-    <Card w={64 * 6} maw="90vw">
+    <Card w={64 * 6} maw="90vw" withBorder>
      <InitUserForm />
    </Card>
  );
@@ -4,7 +4,6 @@ import { Inter } from "next/font/google";
 import "@homarr/notifications/styles.css";
 import "@homarr/spotlight/styles.css";
 import "@homarr/ui/styles.css";
-import "~/styles/color-scheme.scss";
 import "~/styles/scroll-area.scss";

 import { notFound } from "next/navigation";
@@ -26,7 +25,6 @@ import { isLocaleRTL, isLocaleSupported } from "@homarr/translation";
 import { Analytics } from "~/components/layout/analytics";
 import { CrowdinLiveTranslation } from "~/components/layout/crowdin-live-translation";
 import { SearchEngineOptimization } from "~/components/layout/search-engine-optimization";
-import { ServiceWorkerRegistration } from "~/components/layout/service-worker-registration";
 import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
 import { DayJsLoader } from "./_client-providers/dayjs-loader";
 import { JotaiProvider } from "./_client-providers/jotai";
@@ -44,13 +42,13 @@ const fontSans = Inter({
 export const generateMetadata = async (): Promise<Metadata> => ({
  title: "Homarr",
  description:
-    "A self-hosted dashboard for the *arr stack and your entire homelab. Integrates with 50+ services, real-time widgets, no config files.",
+    "Simplify the management of your server with Homarr - a sleek, modern dashboard that puts all of your apps and services at your fingertips.",
  openGraph: {
    title: "Homarr Dashboard",
    description:
-      "A self-hosted dashboard for the *arr stack and your entire homelab. Integrates with 50+ services, real-time widgets, no config files.",
+      "Simplify the management of your server with Homarr - a sleek, modern dashboard that puts all of your apps and services at your fingertips.",
    url: "https://homarr.dev",
-    siteName: "Homarr",
+    siteName: "Homarr Documentation",
  },
  icons: {
    icon: "/logo/logo.png",
@@ -131,7 +129,7 @@ export default async function Layout(props: {
      dir={direction}
      data-mantine-color-scheme={colorScheme}
      style={{
-        backgroundColor: colorScheme === "dark" ? "#242424" : colorScheme === "auto" ? undefined : "#fff",
+        backgroundColor: colorScheme === "dark" ? "#242424" : "#fff",
      }}
      suppressHydrationWarning
    >
@@ -142,8 +140,7 @@ export default async function Layout(props: {
      </head>
      <body className={["font-sans", fontSans.variable].join(" ")}>
        <StackedProvider>
-          <Notifications pauseResetOnHover="notification" />
-          <ServiceWorkerRegistration />
+          <Notifications />
          {props.children}
        </StackedProvider>
      </body>
@@ -45,6 +45,7 @@ export const HeroBanner = async () => {
                    <Image
                      key={`grid-column-${columnIndex}-scroll-1-${index}`}
                      src={icon}
+                      radius="md"
                      fit={"contain"}
                      w={50}
                      h={50}
@@ -56,6 +57,7 @@ export const HeroBanner = async () => {
                    <Image
                      key={`grid-column-${columnIndex}-scroll-2-${index}`}
                      src={icon}
+                      radius="md"
                      fit={"contain"}
                      w={50}
                      h={50}
@@ -1,7 +1,3 @@
 .contributorCard {
  background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
 }
-
-.dependencyCard:hover {
-  background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-5));
-}
@@ -12,7 +12,8 @@ import {
  Flex,
  Group,
  Kbd,
-  SimpleGrid,
+  List,
+  ListItem,
  Stack,
  Table,
  TableTbody,
@@ -21,18 +22,9 @@ import {
  TableThead,
  TableTr,
  Text,
-  ThemeIcon,
  Title,
-  UnstyledButton,
 } from "@mantine/core";
-import {
-  IconKeyboard,
-  IconLanguage,
-  IconLibrary,
-  IconMoneybagHeart,
-  IconPackage,
-  IconUsers,
-} from "@tabler/icons-react";
+import { IconKeyboard, IconLanguage, IconLibrary, IconUsers } from "@tabler/icons-react";

 import { capitalize, objectEntries } from "@homarr/common";
 import { hotkeys } from "@homarr/definitions";
@@ -41,10 +33,8 @@ import { getScopedI18n } from "@homarr/translation/server";
 import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { createMetaTitle } from "~/metadata";
-import type { PackageJsonDependencies } from "~/versions/package-reader";
-import { getPackageVersion } from "~/versions/package-reader";
+import { getPackageAttributesAsync } from "~/versions/package-reader";
 import type githubContributorsJson from "../../../../../../../static-data/contributors.json";
-import type openCollectiveContributorsJson from "../../../../../../../static-data/opencollective-contributors.json";
 import type crowdinContributorsJson from "../../../../../../../static-data/translators.json";
 import classes from "./about.module.css";

@@ -67,10 +57,7 @@ const getHostAsync = async () => {
 export default async function AboutPage() {
  const baseServerUrl = `http://${await getHostAsync()}`;
  const t = await getScopedI18n("management.page.about");
-  const version = getPackageVersion();
-  const dependencies = (await fetch(`${baseServerUrl}/api/about/dependencies`).then((res) =>
-    res.json(),
-  )) as PackageJsonDependencies;
+  const attributes = await getPackageAttributesAsync();
  const githubContributors = (await fetch(`${baseServerUrl}/api/about/contributors/github`).then((res) =>
    res.json(),
  )) as typeof githubContributorsJson;
@@ -79,10 +66,6 @@ export default async function AboutPage() {
    res.json(),
  )) as typeof crowdinContributorsJson;

-  const openCollectiveContributors = (await fetch(`${baseServerUrl}/api/about/contributors/opencollective`).then(
-    (res) => res.json(),
-  )) as typeof openCollectiveContributorsJson;
-
  return (
    <div>
      <DynamicBreadcrumb />
@@ -90,8 +73,10 @@ export default async function AboutPage() {
        <Group py="lg">
          <Image src={homarrLogoPath} width={100} height={100} alt="" />
          <Stack gap={0}>
-            <Title order={1}>Homarr</Title>
-            <Title order={2}>{t("version", { version })}</Title>
+            <Title order={1} tt="uppercase">
+              Homarr
+            </Title>
+            <Title order={2}>{t("version", { version: attributes.version })}</Title>
          </Stack>
        </Group>
      </Center>
@@ -146,72 +131,31 @@ export default async function AboutPage() {
            </Flex>
          </AccordionPanel>
        </AccordionItem>
-        <AccordionItem value="sponsors">
-          <AccordionControl icon={<IconMoneybagHeart size="1rem" />}>
-            <Stack gap={0}>
-              <Text>{t("accordion.sponsors.title")}</Text>
-              <Text size="sm" c="dimmed">
-                {t("accordion.sponsors.subtitle", {
-                  count: String(openCollectiveContributors.length),
-                })}
-              </Text>
-            </Stack>
-          </AccordionControl>
-          <AccordionPanel>
-            <Flex wrap="wrap" gap="xs">
-              {openCollectiveContributors.map((sponsor) => (
-                <GenericContributorLinkCard
-                  key={sponsor.slug}
-                  link={`https://opencollective.com/${sponsor.slug}`}
-                  image={sponsor.imageUrl}
-                  name={sponsor.name}
-                />
-              ))}
-            </Flex>
-          </AccordionPanel>
-        </AccordionItem>
        <AccordionItem value="libraries">
          <AccordionControl icon={<IconLibrary size="1rem" />}>
            <Stack gap={0}>
              <Text>{t("accordion.libraries.title")}</Text>
              <Text size="sm" c="dimmed">
                {t("accordion.libraries.subtitle", {
-                  count: String(Object.keys(dependencies).length),
+                  count: String(Object.keys(attributes.dependencies).length),
                })}
              </Text>
            </Stack>
          </AccordionControl>
          <AccordionPanel>
-            <SimpleGrid cols={{ xs: 1, sm: 2, md: 3, lg: 4, xl: 5 }} spacing="md">
-              {Object.entries(dependencies)
-                .filter(([, value]) => !value.includes("workspace:"))
+            <List>
+              {Object.entries(attributes.dependencies)
                .sort(([key1], [key2]) => key1.localeCompare(key2))
-                .map(([name, version]) => (
-                  <UnstyledButton
-                    key={name}
-                    component="a"
-                    href={`https://www.npmjs.com/package/${name}`}
-                    target="_blank"
-                  >
-                    <Card radius="md" p="xs" className={classes.dependencyCard}>
-                      <Group gap="sm" wrap="nowrap">
-                        <ThemeIcon variant="light" size="lg">
-                          <IconPackage size="1.5rem" stroke={1.5} />
-                        </ThemeIcon>
-
-                        <Stack gap={0}>
-                          <Text size="sm" fw="bold" lineClamp={1} title={name}>
-                            {name}
-                          </Text>
-                          <Text size="sm" c="dimmed">
-                            v{version.replace("^", "").replace("~", "")}
-                          </Text>
-                        </Stack>
-                      </Group>
-                    </Card>
-                  </UnstyledButton>
+                .map(([key, value]) => (
+                  <ListItem key={key}>
+                    {value.includes("workspace:") ? (
+                      <Text>{key}</Text>
+                    ) : (
+                      <a href={`https://www.npmjs.com/package/${key}`}>{key}</a>
+                    )}
+                  </ListItem>
                ))}
-            </SimpleGrid>
+            </List>
          </AccordionPanel>
        </AccordionItem>
        <AccordionItem value="hotkeys">
@@ -1,6 +1,6 @@
 import { Fragment } from "react";
 import { redirect } from "next/navigation";
-import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text } from "@mantine/core";
+import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text, Title } from "@mantine/core";
 import { IconBox, IconPencil } from "@tabler/icons-react";
 import { z } from "zod/v4";

@@ -11,8 +11,9 @@ import type { inferSearchParamsFromSchema } from "@homarr/common/types";
 import { getI18n, getScopedI18n } from "@homarr/translation/server";
 import { Link, SearchInput, TablePagination } from "@homarr/ui";

-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
+import { ManageContainer } from "~/components/manage/manage-container";
 import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { NoResults } from "~/components/no-results";
 import { AppDeleteButton } from "./_app-delete-button";

@@ -38,31 +39,34 @@ export default async function AppsPage(props: AppsPageProps) {
  const { items: apps, totalCount } = await api.app.getPaginated(searchParams);
  const t = await getScopedI18n("app");

-  const canCreate = session.user.permissions.includes("app-create");
-
  return (
-    <ManagePageLayout
-      title={t("page.list.title")}
-      primaryAction={
-        canCreate ? (
-          <MobileAffixButton component={Link} href="/manage/apps/new">
-            {t("page.create.title")}
-          </MobileAffixButton>
-        ) : undefined
-      }
-      toolbar={<SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} flexExpand />}
-      footer={<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />}
-      floatingPrimaryAction={canCreate}
-    >
-      {apps.length === 0 && <AppNoResults />}
-      {apps.length > 0 && (
-        <Stack gap="sm">
-          {apps.map((app) => (
-            <AppCard key={app.id} app={app} />
-          ))}
-        </Stack>
-      )}
-    </ManagePageLayout>
+    <ManageContainer>
+      <DynamicBreadcrumb />
+      <Stack>
+        <Title>{t("page.list.title")}</Title>
+        <Group justify="space-between" align="center">
+          <SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} flexExpand />
+          {session.user.permissions.includes("app-create") && (
+            <MobileAffixButton component={Link} href="/manage/apps/new">
+              {t("page.create.title")}
+            </MobileAffixButton>
+          )}
+        </Group>
+        {apps.length === 0 && <AppNoResults />}
+        {apps.length > 0 && (
+          <Stack gap="sm">
+            {apps.map((app) => (
+              <AppCard key={app.id} app={app} />
+            ))}
+          </Stack>
+        )}
+
+        {/* Added margin to not hide pagination behind affix-button */}
+        <Group justify="end" mb={48}>
+          <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
+        </Group>
+      </Stack>
+    </ManageContainer>
  );
 }

@@ -75,7 +79,7 @@ const AppCard = async ({ app }: AppCardProps) => {
  const session = await auth();

  return (
-    <Card>
+    <Card withBorder>
      <Group justify="space-between" wrap="nowrap">
        <Group align="top" justify="start" wrap="nowrap" style={{ flex: "1" }}>
          <Avatar
@@ -1,38 +1,43 @@
 "use client";

-import { Button, Menu } from "@mantine/core";
+import { Affix, Button, Menu } from "@mantine/core";
 import { IconCategoryPlus, IconChevronDown, IconFileImport } from "@tabler/icons-react";

 import { useModalAction } from "@homarr/modals";
 import { AddBoardModal, ImportBoardModal } from "@homarr/modals-collection";
 import { useI18n } from "@homarr/translation/client";

-import { ManageMobilePrimaryAction } from "~/components/manage/manage-mobile-primary-action";
-
 export const CreateBoardButton = () => {
  const t = useI18n();
  const { openModal: openAddModal } = useModalAction(AddBoardModal);
  const { openModal: openImportModal } = useModalAction(ImportBoardModal);

+  const buttonGroupContent = (
+    <>
+      <Button leftSection={<IconCategoryPlus size="1rem" />} onClick={openAddModal}>
+        {t("management.page.board.action.new.label")}
+      </Button>
+      <Menu position="bottom-end">
+        <Menu.Target>
+          <Button px="xs" ms={1}>
+            <IconChevronDown size="1rem" />
+          </Button>
+        </Menu.Target>
+        <Menu.Dropdown>
+          <Menu.Item onClick={openImportModal} leftSection={<IconFileImport size="1rem" />}>
+            {t("board.action.oldImport.label")}
+          </Menu.Item>
+        </Menu.Dropdown>
+      </Menu>
+    </>
+  );
+
  return (
-    <ManageMobilePrimaryAction>
-      <Button.Group>
-        <Button leftSection={<IconCategoryPlus size="1rem" />} onClick={openAddModal}>
-          {t("management.page.board.action.new.label")}
-        </Button>
-        <Menu position="bottom-end">
-          <Menu.Target>
-            <Button px="xs" ms={1}>
-              <IconChevronDown size="1rem" />
-            </Button>
-          </Menu.Target>
-          <Menu.Dropdown>
-            <Menu.Item onClick={openImportModal} leftSection={<IconFileImport size="1rem" />}>
-              {t("board.action.oldImport.label")}
-            </Menu.Item>
-          </Menu.Dropdown>
-        </Menu>
-      </Button.Group>
-    </ManageMobilePrimaryAction>
+    <>
+      <Button.Group visibleFrom="md">{buttonGroupContent}</Button.Group>
+      <Affix hiddenFrom="md" position={{ bottom: 20, right: 20 }}>
+        <Button.Group>{buttonGroupContent}</Button.Group>
+      </Affix>
+    </>
  );
 };
@@ -9,17 +9,12 @@ import {
  Group,
  Menu,
  MenuTarget,
+  Stack,
  Text,
+  Title,
  Tooltip,
 } from "@mantine/core";
-import {
-  IconDeviceMobile,
-  IconDotsVertical,
-  IconHomeFilled,
-  IconLayoutDashboard,
-  IconLock,
-  IconWorld,
-} from "@tabler/icons-react";
+import { IconDeviceMobile, IconDotsVertical, IconHomeFilled, IconLock, IconWorld } from "@tabler/icons-react";

 import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
@@ -28,8 +23,8 @@ import { getScopedI18n } from "@homarr/translation/server";
 import { Link, UserAvatar } from "@homarr/ui";

 import { getBoardPermissionsAsync } from "~/components/board/permissions/server";
-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
-import { NoResults } from "~/components/no-results";
+import { ManageContainer } from "~/components/manage/manage-container";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { BoardCardMenuDropdown } from "./_components/board-card-menu-dropdown";
 import { CreateBoardButton } from "./_components/create-board-button";

@@ -40,22 +35,23 @@ export default async function ManageBoardsPage() {
  const canCreateBoards = session?.user.permissions.includes("board-create");

  return (
-    <ManagePageLayout
-      title={t("title")}
-      primaryAction={canCreateBoards ? <CreateBoardButton /> : undefined}
-      floatingPrimaryAction={canCreateBoards}
-    >
-      {boards.length === 0 && <NoResults icon={IconLayoutDashboard} title={t("noResults.title")} />}
-      {boards.length > 0 && (
-        <Grid>
+    <ManageContainer>
+      <DynamicBreadcrumb />
+      <Stack>
+        <Group justify="space-between">
+          <Title mb="md">{t("title")}</Title>
+          {canCreateBoards && <CreateBoardButton />}
+        </Group>
+
+        <Grid mb={{ base: "xl", md: 0 }}>
          {boards.map((board) => (
            <GridCol span={{ base: 12, md: 6 }} key={board.id}>
              <BoardCard board={board} />
            </GridCol>
          ))}
        </Grid>
-      )}
-    </ManagePageLayout>
+      </Stack>
+    </ManageContainer>
  );
 }

@@ -70,14 +66,16 @@ const BoardCard = async ({ board }: BoardCardProps) => {
  const VisibilityIcon = board.isPublic ? IconWorld : IconLock;

  return (
-    <Card>
+    <Card radius="lg" withBorder>
      <CardSection p="sm" withBorder>
        <Group justify="space-between" align="center">
          <Group gap="sm">
            <Tooltip label={t(`visibility.${visibility}`)}>
              <VisibilityIcon size={20} stroke={1.5} />
            </Tooltip>
-            <Text fw={700}>{board.name}</Text>
+            <Text fw="bolder" tt="uppercase">
+              {board.name}
+            </Text>
          </Group>

          <Group>
@@ -125,7 +123,6 @@ const BoardCard = async ({ board }: BoardCardProps) => {
                  style={{ borderTop: "none", borderBottom: "none", borderRight: "none", borderRadius: 0 }}
                  variant="default"
                  size="lg"
-                  aria-label={t("action.settings.label")}
                >
                  <IconDotsVertical size={16} stroke={1.5} />
                </ActionIcon>
@@ -33,7 +33,7 @@ export const SecretCard = ({ secret, children, onCancel }: SecretCardProps) => {
  const KindIcon = integrationSecretIcons[secret.kind];

  return (
-    <Card>
+    <Card withBorder>
      <Stack>
        <Group justify="space-between">
          <Group>
@@ -58,12 +58,7 @@ export const SecretCard = ({ secret, children, onCancel }: SecretCardProps) => {
              </Tooltip>
            )}
            {isPublic ? (
-              <ActionIcon
-                color="gray"
-                variant="subtle"
-                onClick={togglePublicSecretDisplay}
-                aria-label={t(publicSecretDisplayOpened ? "common.action.hide" : "common.action.show")}
-              >
+              <ActionIcon color="gray" variant="subtle" onClick={togglePublicSecretDisplay}>
                <DisplayIcon size={16} stroke={1.5} />
              </ActionIcon>
            ) : null}
@@ -84,7 +79,7 @@ export const SecretCard = ({ secret, children, onCancel }: SecretCardProps) => {
            </Button>
          </Group>
        </Group>
-        <Collapse expanded={editMode}>{children}</Collapse>
+        <Collapse in={editMode}>{children}</Collapse>
      </Stack>
    </Card>
  );
@@ -12,7 +12,7 @@ interface FormType {
 interface SecretKindsSegmentedControlProps<TFormType extends FormType> {
  defaultKinds?: IntegrationSecretKind[];
  secretKinds: IntegrationSecretKind[][];
-  form: UseFormReturnType<TFormType, TFormType>;
+  form: UseFormReturnType<TFormType, (values: TFormType) => TFormType>;
 }

 export const SecretKindsSegmentedControl = <TFormType extends FormType>({
@@ -18,7 +18,7 @@ export const IntegrationTestConnectionError = ({ error, url }: IntegrationTestCo
  const causeArray = useMemo(() => toCauseArray(error.cause), [error.cause]);

  return (
-    <Card style={{ borderColor: getMantineColor("red", 8) }}>
+    <Card withBorder style={{ borderColor: getMantineColor("red", 8) }}>
      <Stack>
        <Stack gap="sm">
          <Text size="lg" fw={500} c="red.8">
@@ -216,7 +216,7 @@ export const CertificateDetailsCard = ({ certificate }: CertificateDetailsProps)
  const tCertificateField = useScopedI18n("certificate.field");

  return (
-    <Card>
+    <Card withBorder>
      <Text fw={500}>{tDetails("title")}</Text>
      <Group justify="space-between">
        <Text size="sm" c="dimmed">
@@ -226,7 +226,7 @@ const AppForm = ({ form, canCreateApps }: { form: UseFormReturnType<FormType>; c
        description={t("integration.field.createApp.description")}
      />

-      <Collapse expanded={form.values.hasApp}>
+      <Collapse in={form.values.hasApp}>
        <Fieldset legend={t("integration.field.app.sectionTitle")}>
          <Stack gap="sm">
            {canCreateApps && (
@@ -8,7 +8,7 @@
  border: 1px solid transparent;
  position: relative;
  z-index: 0;
-  transition: background-color 150ms ease;
+  transition: transform 150ms ease;
  overflow: hidden;

  &[data-first="true"] {
@@ -20,9 +20,11 @@
  }

  &[data-active] {
+    transform: scale(1.01);
    z-index: 1;
    background-color: var(--mantine-color-body);
    border-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
+    box-shadow: var(--mantine-shadow-md);
    border-radius: var(--mantine-radius-lg);
  }
 }
@@ -7,7 +7,9 @@ import {
  AccordionPanel,
  ActionIcon,
  ActionIconGroup,
+  Affix,
  Anchor,
+  Box,
  Button,
  Divider,
  Group,
@@ -22,8 +24,9 @@ import {
  TableThead,
  TableTr,
  Text,
+  Title,
 } from "@mantine/core";
-import { IconChevronDown, IconPencil, IconPlugX } from "@tabler/icons-react";
+import { IconChevronDown, IconChevronUp, IconPencil, IconPlugX } from "@tabler/icons-react";

 import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
@@ -34,8 +37,8 @@ import { getIntegrationName } from "@homarr/definitions";
 import { getScopedI18n } from "@homarr/translation/server";
 import { CountBadge, IntegrationAvatar, Link } from "@homarr/ui";

-import { ManageMobilePrimaryAction } from "~/components/manage/manage-mobile-primary-action";
-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
+import { ManageContainer } from "~/components/manage/manage-container";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { NoResults } from "~/components/no-results";
 import { env } from "~/env";
 import { ActiveTabAccordion } from "../../../../components/active-tab-accordion";
@@ -63,23 +66,38 @@ export default async function IntegrationsPage(props: IntegrationsPageProps) {
  const canCreateIntegrations = session.user.permissions.includes("integration-create");

  return (
-    <ManagePageLayout
-      title={t("page.list.title")}
-      primaryAction={
-        canCreateIntegrations ? (
-          <ManageMobilePrimaryAction>
-            <IntegrationSelectMenu>
-              <MenuTarget>
-                <Button rightSection={<IconChevronDown size={16} stroke={1.5} />}>{t("action.create")}</Button>
-              </MenuTarget>
-            </IntegrationSelectMenu>
-          </ManageMobilePrimaryAction>
-        ) : undefined
-      }
-      floatingPrimaryAction={canCreateIntegrations}
-    >
-      <IntegrationList integrations={integrations} activeTab={searchParams.tab} />
-    </ManagePageLayout>
+    <ManageContainer>
+      <DynamicBreadcrumb />
+      <Stack>
+        <Group justify="space-between" align="center">
+          <Title>{t("page.list.title")}</Title>
+
+          {canCreateIntegrations && (
+            <>
+              <Box>
+                <IntegrationSelectMenu>
+                  <Affix hiddenFrom="md" position={{ bottom: 20, right: 20 }}>
+                    <MenuTarget>
+                      <Button rightSection={<IconChevronUp size={16} stroke={1.5} />}>{t("action.create")}</Button>
+                    </MenuTarget>
+                  </Affix>
+                </IntegrationSelectMenu>
+              </Box>
+
+              <Box visibleFrom="md">
+                <IntegrationSelectMenu>
+                  <MenuTarget>
+                    <Button rightSection={<IconChevronDown size={16} stroke={1.5} />}>{t("action.create")}</Button>
+                  </MenuTarget>
+                </IntegrationSelectMenu>
+              </Box>
+            </>
+          )}
+        </Group>
+
+        <IntegrationList integrations={integrations} activeTab={searchParams.tab} />
+      </Stack>
+    </ManageContainer>
  );
 }

@@ -4,15 +4,17 @@ import {
  Anchor,
  Group,
  Image,
+  Stack,
  Table,
  TableTbody,
  TableTd,
  TableTh,
  TableThead,
  TableTr,
+  Title,
  Tooltip,
 } from "@mantine/core";
-import { IconExternalLink, IconPhoto } from "@tabler/icons-react";
+import { IconExternalLink } from "@tabler/icons-react";
 import { z } from "zod/v4";

 import type { RouterOutputs } from "@homarr/api";
@@ -24,9 +26,8 @@ import { createLocalImageUrl } from "@homarr/icons/local";
 import { getI18n } from "@homarr/translation/server";
 import { Link, SearchInput, TablePagination, UserAvatar } from "@homarr/ui";

-import { ManageMobilePrimaryAction } from "~/components/manage/manage-mobile-primary-action";
-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
-import { NoResults } from "~/components/no-results";
+import { ManageContainer } from "~/components/manage/manage-container";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { CopyMedia } from "./_actions/copy-media";
 import { DeleteMedia } from "./_actions/delete-media";
 import { IncludeFromAllUsersSwitch } from "./_actions/show-all";
@@ -47,7 +48,7 @@ interface MediaListPageProps {
  searchParams: Promise<inferSearchParamsFromSchema<typeof searchParamsSchema>>;
 }

-export default async function MediaListPage(props: MediaListPageProps) {
+export default async function GroupsListPage(props: MediaListPageProps) {
  const session = await auth();

  if (!session) {
@@ -57,31 +58,22 @@ export default async function MediaListPage(props: MediaListPageProps) {
  const t = await getI18n();
  const searchParams = searchParamsSchema.parse(await props.searchParams);
  const { items: medias, totalCount } = await api.media.getPaginated(searchParams);
-  const canUpload = session.user.permissions.includes("media-upload");

  return (
-    <ManagePageLayout
-      title={t("media.plural")}
-      primaryAction={
-        canUpload ? (
-          <ManageMobilePrimaryAction>
-            <UploadMediaButton />
-          </ManageMobilePrimaryAction>
-        ) : undefined
-      }
-      toolbar={
-        <Group>
-          <SearchInput placeholder={`${t("media.search")}...`} defaultValue={searchParams.search} />
-          {session.user.permissions.includes("media-view-all") && (
-            <IncludeFromAllUsersSwitch defaultChecked={searchParams.includeFromAllUsers} />
-          )}
+    <ManageContainer>
+      <DynamicBreadcrumb />
+      <Stack>
+        <Title>{t("media.plural")}</Title>
+        <Group justify="space-between">
+          <Group>
+            <SearchInput placeholder={`${t("media.search")}...`} defaultValue={searchParams.search} />
+            {session.user.permissions.includes("media-view-all") && (
+              <IncludeFromAllUsersSwitch defaultChecked={searchParams.includeFromAllUsers} />
+            )}
+          </Group>
+
+          {session.user.permissions.includes("media-upload") && <UploadMediaButton />}
        </Group>
-      }
-      footer={<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />}
-      floatingPrimaryAction={canUpload}
-    >
-      {medias.length === 0 && <NoResults icon={IconPhoto} title={t("media.noResults.title")} />}
-      {medias.length > 0 && (
        <Table striped highlightOnHover>
          <TableThead>
            <TableTr>
@@ -98,8 +90,13 @@ export default async function MediaListPage(props: MediaListPageProps) {
            ))}
          </TableTbody>
        </Table>
-      )}
-    </ManagePageLayout>
+
+        {/* Added margin to not hide pagination behind affix-button */}
+        <Group justify="end" mb={48}>
+          <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
+        </Group>
+      </Stack>
+    </ManageContainer>
  );
 }

@@ -7,7 +7,9 @@ export default async function NotFound() {
  return (
    <Center h="100%">
      <Stack align="center">
-        <Title order={1}>{t("title")}</Title>
+        <Title order={1} tt="uppercase">
+          {t("title")}
+        </Title>
        <Text>{t("text")}</Text>
      </Stack>
    </Center>
@@ -29,20 +29,20 @@ export default async function ManagementPage() {
      <Space h="md" />
      <SimpleGrid cols={{ xs: 1, sm: 2, md: 3 }}>
        {statistics.map((statistic) => (
-          <Card component={Link} href={statistic.path} key={statistic.path}>
+          <Card component={Link} href={statistic.path} key={statistic.path} radius="lg">
            <Group justify="space-between" wrap="nowrap">
              <Group wrap="nowrap">
-                <Text size="xl" fw={700}>
+                <Text size="2.4rem" fw="bolder">
                  {statistic.count}
                </Text>
                <Stack gap={0}>
-                  <Text c="dimmed" size="xs">
+                  <Text c="red" size="xs">
                    {t(`statisticLabel.${statistic.subtitleKey}`)}
                  </Text>
-                  <Text fw={600}>{t(`statistic.${statistic.titleKey}`)}</Text>
+                  <Text fw="bold">{t(`statistic.${statistic.titleKey}`)}</Text>
                </Stack>
              </Group>
-              <IconArrowRight size={16} stroke={1.5} color="var(--mantine-color-dimmed)" />
+              <IconArrowRight />
            </Group>
          </Card>
        ))}
@@ -1,5 +1,5 @@
 import { redirect } from "next/navigation";
-import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text } from "@mantine/core";
+import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text, Title } from "@mantine/core";
 import { IconPencil, IconSearch } from "@tabler/icons-react";
 import { z } from "zod/v4";

@@ -10,8 +10,9 @@ import type { inferSearchParamsFromSchema } from "@homarr/common/types";
 import { getI18n, getScopedI18n } from "@homarr/translation/server";
 import { Link, SearchInput, TablePagination } from "@homarr/ui";

-import { ManagePageLayout } from "~/components/manage/manage-page-layout";
+import { ManageContainer } from "~/components/manage/manage-container";
 import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
+import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { NoResults } from "~/components/no-results";
 import { SearchEngineDeleteButton } from "./_search-engine-delete-button";

@@ -37,31 +38,34 @@ export default async function SearchEnginesPage(props: SearchEnginesPageProps) {

  const tEngine = await getScopedI18n("search.engine");

-  const canCreate = session.user.permissions.includes("search-engine-create");
-
  return (
-    <ManagePageLayout
-      title={tEngine("page.list.title")}
-      primaryAction={
-        canCreate ? (
-          <MobileAffixButton component={Link} href="/manage/search-engines/new">
-            {tEngine("page.create.title")}
-          </MobileAffixButton>
-        ) : undefined
-      }
-      toolbar={<SearchInput placeholder={`${tEngine("search")}...`} defaultValue={searchParams.search} flexExpand />}
-      footer={<TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />}
-      floatingPrimaryAction={canCreate}
-    >
-      {searchEngines.length === 0 && <SearchEngineNoResults />}
-      {searchEngines.length > 0 && (
-        <Stack gap="sm">
-          {searchEngines.map((searchEngine) => (
-            <SearchEngineCard key={searchEngine.id} searchEngine={searchEngine} />
-          ))}
-        </Stack>
-      )}
-    </ManagePageLayout>
+    <ManageContainer>
+      <DynamicBreadcrumb />
+      <Stack>
+        <Title>{tEngine("page.list.title")}</Title>
+        <Group justify="space-between" align="center">
+          <SearchInput placeholder={`${tEngine("search")}...`} defaultValue={searchParams.search} flexExpand />
+          {session.user.permissions.includes("search-engine-create") && (
+            <MobileAffixButton component={Link} href="/manage/search-engines/new">
+              {tEngine("page.create.title")}
+            </MobileAffixButton>
+          )}
+        </Group>
+        {searchEngines.length === 0 && <SearchEngineNoResults />}
+        {searchEngines.length > 0 && (
+          <Stack gap="sm">
+            {searchEngines.map((searchEngine) => (
+              <SearchEngineCard key={searchEngine.id} searchEngine={searchEngine} />
+            ))}
+          </Stack>
+        )}
+
+        {/* Added margin to not hide pagination behind affix-button */}
+        <Group justify="end" mb={48}>
+          <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
+        </Group>
+      </Stack>
+    </ManageContainer>
  );
 }

@@ -74,7 +78,7 @@ const SearchEngineCard = async ({ searchEngine }: SearchEngineCardProps) => {
  const session = await auth();

  return (
-    <Card>
+    <Card withBorder>
      <Group justify="space-between" wrap="nowrap">
        <Group align="top" justify="start" wrap="nowrap" style={{ flex: 1 }}>
          <Avatar
@@ -41,8 +41,8 @@ export const AnalyticsSettings = ({ initialData }: AnalyticsSettingsProps) => {
    <>
      <Title order={2}>{t("title")}</Title>

-      <Card pos="relative">
-        <LoadingOverlay visible={isPending} />
+      <Card pos="relative" withBorder>
+        <LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
        <Stack>
          <SwitchSetting form={form} formKey="enableGeneral" title={t("general.title")} text={t("general.text")} />
        </Stack>
@@ -1,7 +1,7 @@
 "use client";

 import { Group, Text } from "@mantine/core";
-import { IconDeviceDesktop, IconMoon, IconSun } from "@tabler/icons-react";
+import { IconMoon, IconSun } from "@tabler/icons-react";

 import type { ColorScheme } from "@homarr/definitions";
 import { colorSchemes } from "@homarr/definitions";
@@ -34,7 +34,6 @@ export const AppearanceSettingsForm = ({ defaultValues }: { defaultValues: Serve
 };

 const appearanceIcons = {
-  auto: IconDeviceDesktop,
  light: IconSun,
  dark: IconMoon,
 };
@@ -41,11 +41,11 @@ export const CrawlingAndIndexingSettings = ({ initialData }: CrawlingAndIndexing
    <>
      <Title order={2}>{t("title")}</Title>

-      <Card pos="relative">
+      <Card pos="relative" withBorder>
        <Text c={"dimmed"} mb={"lg"}>
          {t("warning")}
        </Text>
-        <LoadingOverlay visible={isPending} />
+        <LoadingOverlay visible={isPending} zIndex={1000} overlayProps={{ radius: "sm", blur: 2 }} />
        <Stack>
          <SwitchSetting form={form} formKey="noIndex" title={t("noIndex.title")} text={t("noIndex.text")} />
          <SwitchSetting form={form} formKey="noFollow" title={t("noFollow.title")} text={t("noFollow.text")} />
@@ -15,7 +15,7 @@ export const SwitchSetting = <TFormValue extends Record<string, boolean>>({
  disabled,
 }: {
  form: Modify<
-    UseFormReturnType<TFormValue, TFormValue>,
+    UseFormReturnType<TFormValue, () => TFormValue>,
    {
      setFieldValue: (key: keyof TFormValue, value: (previous: boolean) => boolean) => void;
    }
@@ -2,7 +2,7 @@ import { headers } from "next/headers";
 import { notFound } from "next/navigation";
 import { Stack, Tabs, TabsList, TabsPanel, TabsTab } from "@mantine/core";

-import { openApiDocument } from "@homarr/api/open-api";
+import { openApiDocument } from "@homarr/api";
 import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
 import { extractBaseUrlFromHeaders } from "@homarr/common";
@@ -14,7 +14,7 @@ import { ApiKeysManagement } from "./components/api-keys";

 export async function generateMetadata() {
  const session = await auth();
-  if (!session?.user.permissions.includes("admin")) {
+  if (!session?.user || !session.user.permissions.includes("admin")) {
    return {};
  }

@@ -27,7 +27,7 @@ export async function generateMetadata() {

 export default async function ApiPage() {
  const session = await auth();
-  if (!session?.user.permissions.includes("admin")) {
+  if (!session?.user || !session.user.permissions.includes("admin")) {
    notFound();
  }
  const document = openApiDocument(extractBaseUrlFromHeaders(await headers()));
@@ -79,7 +79,7 @@ export default async function CertificatesPage({ params }: CertificatesPageProps

        <SimpleGrid cols={{ sm: 1, lg: 2, xl: 3 }} spacing="lg">
          {x509Certificates.map((cert) => (
-            <Card key={cert.fileName}>
+            <Card key={cert.fileName} withBorder>
              <Group wrap="nowrap">
                {cert.isError ? (
                  <IconAlertTriangle
@@ -58,18 +58,6 @@ const createColumns = (
      return <ContainerStateBadge state={cell.row.original.state} />;
    },
  },
-  {
-    accessorKey: "host",
-    header: t("docker.field.host.label"),
-    size: 140,
-    Cell({ row }) {
-      return (
-        <Text truncate="end" title={row.original.host}>
-          {row.original.host}
-        </Text>
-      );
-    },
-  },
  {
    accessorKey: "image",
    header: t("docker.field.containerImage.label"),
@@ -88,7 +76,6 @@ const createColumns = (
    accessorKey: "ports",
    header: t("docker.field.ports.label"),
    Cell({ cell }) {
-      if (!cell.row.original.ports) return null;
      if (!cell.row.original.ports.length) return null;
      return (
        <OverflowBadge overflowCount={1} data={cell.row.original.ports.map((port) => port.PrivatePort.toString())} />
@@ -202,7 +189,7 @@ const ContainerActionBar = ({ selectedContainers }: ContainerActionBarProps) =>
      <ContainerActionBarButton icon={IconPlayerStop} color="red" action="stop" selectedIds={selectedIds} />
      <ContainerActionBarButton icon={IconRotateClockwise} color="orange" action="restart" selectedIds={selectedIds} />
      <ContainerActionBarButton icon={IconTrash} color="red" action="remove" selectedIds={selectedIds} />
-      <Button leftSection={<IconCategoryPlus />} color={"red"} onClick={handleClick} variant="light">
+      <Button leftSection={<IconCategoryPlus />} color={"red"} onClick={handleClick} variant="light" radius="md">
        {t("addToHomarr.label")}
      </Button>
    </Group>
@@ -253,6 +240,7 @@ const ContainerActionBarButton = (props: ContainerActionBarButtonProps) => {
      onClick={handleClickAsync}
      loading={isPending}
      variant="light"
+      radius="md"
    >
      {t(`${props.action}.label`)}
    </Button>
@@ -4,16 +4,28 @@
  overflow: hidden;
  padding: var(--mantine-spacing-xs);
  padding-left: calc(var(--mantine-spacing-xs) * 2);
-  border-left: 1px solid var(--mantine-color-blue-6);
-  background-color: light-dark(
-    var(--mantine-color-blue-0),
-    color-mix(in oklch, var(--mantine-color-blue-9), transparent 85%)
-  );
+
+  @mixin hover {
+    box-shadow: var(--mantine-shadow-md);
+  }
+
+  &::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    width: 6px;
+    background-image: linear-gradient(0, var(--mantine-color-blue-4), var(--mantine-color-blue-9));
+  }

  @mixin rtl {
    padding-left: var(--mantine-spacing-xs);
    padding-right: calc(var(--mantine-spacing-xs) * 2);
-    border-left: none;
-    border-right: 1px solid var(--mantine-color-blue-6);
+
+    &::before {
+      left: unset;
+      right: 0;
+    }
  }
 }
@@ -23,6 +23,7 @@ export function HeaderCard(props: HeaderCardProps) {
      <Flex align="center" justify={isRTL ? "space-between" : "flex-start"} gap="md" direction={"row"}>
        <ThemeIcon
          size="xl"
+          radius="md"
          variant="gradient"
          gradient={{
            deg: 0,
@@ -8,8 +8,6 @@ import { useCurrentLocale, useI18n } from "@homarr/translation/client";
 import { ResourceIcon } from "~/app/[locale]/manage/tools/kubernetes/cluster-dashboard/resource-gauge/resource-icon";
 import classes from "./resource-gauge.module.css";

-const KUBERNETES_BRAND_COLOR = "#326ce5";
-
 interface KubernetesResourceGaugeProps {
  kubernetesCapacity: KubernetesCapacity;
 }
@@ -20,8 +18,8 @@ export function ResourceGauge(props: KubernetesResourceGaugeProps) {
  const isRTL = Boolean(isLocaleRTL(currentLocale));

  return (
-    <Paper className={classes.paper} mt={20}>
-      <ThemeIcon className={classes.icon} size={60} radius={60} bg={KUBERNETES_BRAND_COLOR}>
+    <Paper radius="md" withBorder className={classes.paper} mt={20}>
+      <ThemeIcon className={classes.icon} size={60} radius={60} bg={"#326ce5"}>
        <ResourceIcon type={props.kubernetesCapacity.type} />
      </ThemeIcon>

@@ -17,7 +17,12 @@ interface ResourceTileProps {
 export function ResourceTile(props: ResourceTileProps) {
  const t = useI18n();
  return (
-    <Card component={Link} href={`/manage/tools/kubernetes/${props.label}`} className={classes.cardContainer}>
+    <Card
+      withBorder
+      component={Link}
+      href={`/manage/tools/kubernetes/${props.label}`}
+      className={classes.cardContainer}
+    >
      <Group justify="space-between" wrap="nowrap">
        <Image src={`/images/kubernetes/${props.label}.svg`} alt={props.label} width={64} height={64} />
        <Group gap="xs">
@@ -2,14 +2,12 @@

 import { Select } from "@mantine/core";

-import { logLevelConfiguration, logLevels } from "@homarr/core/infrastructure/logs/constants";
 import type { LogLevel } from "@homarr/core/infrastructure/logs/constants";
+import { logLevelConfiguration, logLevels } from "@homarr/core/infrastructure/logs/constants";
 import { useI18n } from "@homarr/translation/client";

 import { useLogContext } from "./log-context";

-const levelByValue = Object.fromEntries(logLevels.map((logLevel) => [logLevel, logLevel])) as Record<string, LogLevel>;
-
 export const LogLevelSelection = () => {
  const { level, setLevel } = useLogContext();
  const t = useI18n();
@@ -21,12 +19,7 @@ export const LogLevelSelection = () => {
        label: `${logLevelConfiguration[level].prefix} ${t(`log.level.option.${level}`)}`,
      }))}
      value={level}
-      onChange={(value) => {
-        const nextLevel = value && levelByValue[value];
-        if (nextLevel) {
-          setLevel(nextLevel);
-        }
-      }}
+      onChange={(value) => setLevel(value as LogLevel)}
      checkIconPosition="right"
    />
  );
@@ -18,7 +18,7 @@ import { LogContextProvider } from "./log-context";

 export async function generateMetadata() {
  const session = await auth();
-  if (!session?.user.permissions.includes("admin")) {
+  if (!session?.user || !session.user.permissions.includes("admin")) {
    return {};
  }
  const t = await getScopedI18n("management");
@@ -30,7 +30,7 @@ export async function generateMetadata() {

 export default async function LogsManagementPage() {
  const session = await auth();
-  if (!session?.user.permissions.includes("other-view-logs")) {
+  if (!session?.user || !session.user.permissions.includes("other-view-logs")) {
    notFound();
  }

@@ -0,0 +1,85 @@
+"use client";
+
+import { Button, Group, Stack } from "@mantine/core";
+import type { z } from "zod/v4";
+
+import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
+import { revalidatePathActionAsync } from "@homarr/common/client";
+import { useZodForm } from "@homarr/form";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
+import { useI18n } from "@homarr/translation/client";
+import { userChangeHomeBoardsSchema } from "@homarr/validation/user";
+
+import type { Board } from "~/app/[locale]/boards/_types";
+import { BoardSelect } from "~/components/board/board-select";
+
+interface ChangeHomeBoardFormProps {
+  user: RouterOutputs["user"]["getById"];
+  boardsData: Pick<Board, "id" | "name" | "logoImageUrl">[];
+}
+
+export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormProps) => {
+  const t = useI18n();
+  const { mutate, isPending } = clientApi.user.changeHomeBoards.useMutation({
+    async onSettled() {
+      await revalidatePathActionAsync(`/manage/users/${user.id}`);
+    },
+    onSuccess(_, variables) {
+      form.setInitialValues({
+        homeBoardId: variables.homeBoardId,
+        mobileHomeBoardId: variables.mobileHomeBoardId,
+      });
+      showSuccessNotification({
+        message: t("user.action.changeHomeBoard.notification.success.message"),
+      });
+    },
+    onError() {
+      showErrorNotification({
+        message: t("user.action.changeHomeBoard.notification.error.message"),
+      });
+    },
+  });
+  const form = useZodForm(userChangeHomeBoardsSchema, {
+    initialValues: {
+      homeBoardId: user.homeBoardId,
+      mobileHomeBoardId: user.mobileHomeBoardId,
+    },
+  });
+
+  const handleSubmit = (values: FormType) => {
+    mutate({
+      userId: user.id,
+      ...values,
+    });
+  };
+
+  return (
+    <form onSubmit={form.onSubmit(handleSubmit)}>
+      <Stack gap="md">
+        <BoardSelect
+          label={t("management.page.user.setting.general.item.board.type.general")}
+          clearable
+          boards={boardsData}
+          w="100%"
+          {...form.getInputProps("homeBoardId")}
+        />
+        <BoardSelect
+          label={t("management.page.user.setting.general.item.board.type.mobile")}
+          clearable
+          boards={boardsData}
+          w="100%"
+          {...form.getInputProps("mobileHomeBoardId")}
+        />
+
+        <Group justify="end">
+          <Button type="submit" loading={isPending}>
+            {t("common.action.save")}
+          </Button>
+        </Group>
+      </Stack>
+    </form>
+  );
+};
+
+type FormType = z.infer<typeof userChangeHomeBoardsSchema>;
@@ -0,0 +1,78 @@
+"use client";
+
+import { Button, Group, Select, Stack, Switch } from "@mantine/core";
+import type { z } from "zod/v4";
+
+import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
+import { revalidatePathActionAsync } from "@homarr/common/client";
+import { useZodForm } from "@homarr/form";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
+import { useI18n } from "@homarr/translation/client";
+import { userChangeSearchPreferencesSchema } from "@homarr/validation/user";
+
+interface ChangeSearchPreferencesFormProps {
+  user: RouterOutputs["user"]["getById"];
+  searchEnginesData: { value: string; label: string }[];
+}
+
+export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeSearchPreferencesFormProps) => {
+  const t = useI18n();
+  const { mutate, isPending } = clientApi.user.changeSearchPreferences.useMutation({
+    async onSettled() {
+      await revalidatePathActionAsync(`/manage/users/${user.id}`);
+    },
+    onSuccess(_, variables) {
+      form.setInitialValues({
+        defaultSearchEngineId: variables.defaultSearchEngineId,
+        openInNewTab: variables.openInNewTab,
+      });
+      showSuccessNotification({
+        message: t("user.action.changeSearchPreferences.notification.success.message"),
+      });
+    },
+    onError() {
+      showErrorNotification({
+        message: t("user.action.changeSearchPreferences.notification.error.message"),
+      });
+    },
+  });
+  const form = useZodForm(userChangeSearchPreferencesSchema, {
+    initialValues: {
+      defaultSearchEngineId: user.defaultSearchEngineId,
+      openInNewTab: user.openSearchInNewTab,
+    },
+  });
+
+  const handleSubmit = (values: FormType) => {
+    mutate({
+      userId: user.id,
+      ...values,
+    });
+  };
+
+  return (
+    <form onSubmit={form.onSubmit(handleSubmit)}>
+      <Stack gap="md">
+        <Select
+          label={t("user.field.defaultSearchEngine.label")}
+          w="100%"
+          data={searchEnginesData}
+          {...form.getInputProps("defaultSearchEngineId")}
+        />
+        <Switch
+          label={t("user.field.openSearchInNewTab.label")}
+          {...form.getInputProps("openInNewTab", { type: "checkbox" })}
+        />
+
+        <Group justify="end">
+          <Button type="submit" loading={isPending}>
+            {t("common.action.save")}
+          </Button>
+        </Group>
+      </Stack>
+    </form>
+  );
+};
+
+type FormType = z.infer<typeof userChangeSearchPreferencesSchema>;
@@ -0,0 +1,83 @@
+"use client";
+
+import { Button, Group, Radio, Stack } from "@mantine/core";
+import type { DayOfWeek } from "@mantine/dates";
+import dayjs from "dayjs";
+import localeData from "dayjs/plugin/localeData";
+import type { z } from "zod/v4";
+
+import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
+import { revalidatePathActionAsync } from "@homarr/common/client";
+import { useZodForm } from "@homarr/form";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
+import { useI18n } from "@homarr/translation/client";
+import { userFirstDayOfWeekSchema } from "@homarr/validation/user";
+
+dayjs.extend(localeData);
+
+interface FirstDayOfWeekProps {
+  user: RouterOutputs["user"]["getById"];
+}
+
+const weekDays = dayjs.weekdays(false);
+
+export const FirstDayOfWeek = ({ user }: FirstDayOfWeekProps) => {
+  const t = useI18n();
+  const { mutate, isPending } = clientApi.user.changeFirstDayOfWeek.useMutation({
+    async onSettled() {
+      await revalidatePathActionAsync(`/manage/users/${user.id}`);
+    },
+    onSuccess(_, variables) {
+      form.setInitialValues({
+        firstDayOfWeek: variables.firstDayOfWeek,
+      });
+      showSuccessNotification({
+        message: t("user.action.changeFirstDayOfWeek.notification.success.message"),
+      });
+    },
+    onError() {
+      showErrorNotification({
+        message: t("user.action.changeFirstDayOfWeek.notification.error.message"),
+      });
+    },
+  });
+  const form = useZodForm(userFirstDayOfWeekSchema, {
+    initialValues: {
+      firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
+    },
+  });
+
+  const handleSubmit = (values: FormType) => {
+    mutate({
+      id: user.id,
+      ...values,
+    });
+  };
+
+  const inputProps = form.getInputProps("firstDayOfWeek");
+  const onChange = inputProps.onChange as (value: number) => void;
+  const value = (inputProps.value as number).toString();
+
+  return (
+    <form onSubmit={form.onSubmit(handleSubmit)}>
+      <Stack gap="md">
+        <Radio.Group {...inputProps} value={value} onChange={(value) => onChange(parseInt(value))}>
+          <Group mt="xs">
+            <Radio value="1" label={weekDays[1]} />
+            <Radio value="6" label={weekDays[6]} />
+            <Radio value="0" label={weekDays[0]} />
+          </Group>
+        </Radio.Group>
+
+        <Group justify="end">
+          <Button type="submit" loading={isPending}>
+            {t("common.action.save")}
+          </Button>
+        </Group>
+      </Stack>
+    </form>
+  );
+};
+
+type FormType = z.infer<typeof userFirstDayOfWeekSchema>;
@@ -1,332 +0,0 @@
-"use client";
-
-import { useEffect, useMemo, useRef } from "react";
-import {
-  Button,
-  Card,
-  Divider,
-  Group,
-  Radio,
-  Select,
-  SimpleGrid,
-  Stack,
-  Switch,
-  Text,
-  TextInput,
-  Title,
-} from "@mantine/core";
-import type { DayOfWeek } from "@mantine/dates";
-import dayjs from "dayjs";
-import localeData from "dayjs/plugin/localeData";
-import { z } from "zod/v4";
-
-import type { RouterOutputs } from "@homarr/api";
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { env } from "@homarr/common/env";
-import { useZodForm } from "@homarr/form";
-import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n, useScopedI18n } from "@homarr/translation/client";
-import {
-  userChangeHomeBoardsSchema,
-  userChangeSearchPreferencesSchema,
-  userEditProfileSchema,
-  userFirstDayOfWeekSchema,
-  userPingIconsEnabledSchema,
-} from "@homarr/validation/user";
-
-import type { Board } from "~/app/[locale]/boards/_types";
-import { BoardSelect } from "~/components/board/board-select";
-import { CurrentLanguageCombobox } from "~/components/language/current-language-combobox";
-
-dayjs.extend(localeData);
-
-const userGeneralSettingsSchema = z.object({
-  name: userEditProfileSchema.shape.name,
-  email: userEditProfileSchema.shape.email,
-  homeBoardId: userChangeHomeBoardsSchema.shape.homeBoardId,
-  mobileHomeBoardId: userChangeHomeBoardsSchema.shape.mobileHomeBoardId,
-  defaultSearchEngineId: userChangeSearchPreferencesSchema.shape.defaultSearchEngineId,
-  openInNewTab: userChangeSearchPreferencesSchema.shape.openInNewTab,
-  ddgBangsEnabled: userChangeSearchPreferencesSchema.shape.ddgBangsEnabled,
-  firstDayOfWeek: userFirstDayOfWeekSchema.shape.firstDayOfWeek,
-  pingIconsEnabled: userPingIconsEnabledSchema.shape.pingIconsEnabled,
-});
-
-type FormValues = z.infer<typeof userGeneralSettingsSchema>;
-
-const FIRST_DAY_OPTIONS: { value: DayOfWeek; labelKey: number }[] = [
-  { value: 1, labelKey: 1 },
-  { value: 6, labelKey: 6 },
-  { value: 0, labelKey: 0 },
-];
-
-interface UserGeneralSettingsFormProps {
-  user: RouterOutputs["user"]["getById"];
-  boardsData: Pick<Board, "id" | "name" | "logoImageUrl">[];
-  searchEnginesData: { value: string; label: string }[];
-  showLanguageSelector?: boolean;
-}
-
-const buildInitialValues = (user: RouterOutputs["user"]["getById"]): FormValues => ({
-  name: user.name ?? "",
-  email: user.email ?? "",
-  homeBoardId: user.homeBoardId,
-  mobileHomeBoardId: user.mobileHomeBoardId,
-  defaultSearchEngineId: user.defaultSearchEngineId,
-  openInNewTab: user.openSearchInNewTab,
-  ddgBangsEnabled: user.ddgBangs,
-  firstDayOfWeek: user.firstDayOfWeek as DayOfWeek,
-  pingIconsEnabled: user.pingIconsEnabled,
-});
-
-export const UserGeneralSettingsForm = ({
-  user,
-  boardsData,
-  searchEnginesData,
-  showLanguageSelector = false,
-}: UserGeneralSettingsFormProps) => {
-  const t = useI18n();
-  const tGeneral = useScopedI18n("management.page.user.setting.general");
-  const isCredentialsUser = user.provider === "credentials";
-
-  const editProfileMutation = clientApi.user.editProfile.useMutation();
-  const changeHomeBoardsMutation = clientApi.user.changeHomeBoards.useMutation();
-  const changeSearchPreferencesMutation = clientApi.user.changeSearchPreferences.useMutation();
-  const changeFirstDayOfWeekMutation = clientApi.user.changeFirstDayOfWeek.useMutation();
-  const changePingIconsEnabledMutation = clientApi.user.changePingIconsEnabled.useMutation();
-
-  const initialValues = buildInitialValues(user);
-  const initialValuesRef = useRef(initialValues);
-
-  const form = useZodForm(userGeneralSettingsSchema, {
-    initialValues,
-  });
-
-  const isDirtyRef = useRef(false);
-  isDirtyRef.current = form.isDirty();
-
-  const weekDays = useMemo(() => dayjs.weekdays(false), []);
-
-  const mutations = [
-    editProfileMutation,
-    changeHomeBoardsMutation,
-    changeSearchPreferencesMutation,
-    changeFirstDayOfWeekMutation,
-    changePingIconsEnabledMutation,
-  ];
-  const isPending = mutations.some((m) => m.isPending);
-
-  useEffect(() => {
-    const handler = (e: BeforeUnloadEvent) => {
-      if (env.NODE_ENV === "development") return;
-      if (isDirtyRef.current) e.preventDefault();
-    };
-    window.addEventListener("beforeunload", handler);
-    return () => window.removeEventListener("beforeunload", handler);
-  }, []);
-
-  const handleSubmitAsync = async (values: FormValues) => {
-    const parsed = userGeneralSettingsSchema.safeParse(values);
-    if (!parsed.success) return;
-
-    const defaults = initialValuesRef.current;
-    const changed = <K extends keyof FormValues>(...fields: K[]) =>
-      fields.some((f) => (f === "email" ? (values[f] || null) !== (defaults[f] || null) : values[f] !== defaults[f]));
-
-    const saveActions: { when: boolean; action: () => Promise<unknown> }[] = [
-      {
-        when: isCredentialsUser && changed("name", "email"),
-        action: () =>
-          editProfileMutation.mutateAsync({ id: user.id, name: parsed.data.name, email: parsed.data.email ?? "" }),
-      },
-      {
-        when: changed("homeBoardId", "mobileHomeBoardId"),
-        action: () =>
-          changeHomeBoardsMutation.mutateAsync({
-            userId: user.id,
-            homeBoardId: parsed.data.homeBoardId,
-            mobileHomeBoardId: parsed.data.mobileHomeBoardId,
-          }),
-      },
-      {
-        when: changed("defaultSearchEngineId", "openInNewTab", "ddgBangsEnabled"),
-        action: () =>
-          changeSearchPreferencesMutation.mutateAsync({
-            userId: user.id,
-            defaultSearchEngineId: parsed.data.defaultSearchEngineId,
-            openInNewTab: parsed.data.openInNewTab,
-            ddgBangsEnabled: parsed.data.ddgBangsEnabled,
-          }),
-      },
-      {
-        when: changed("firstDayOfWeek"),
-        action: () =>
-          changeFirstDayOfWeekMutation.mutateAsync({ id: user.id, firstDayOfWeek: parsed.data.firstDayOfWeek }),
-      },
-      {
-        when: changed("pingIconsEnabled"),
-        action: () =>
-          changePingIconsEnabledMutation.mutateAsync({ id: user.id, pingIconsEnabled: parsed.data.pingIconsEnabled }),
-      },
-    ];
-
-    const promises = saveActions.filter((s) => s.when).map((s) => s.action());
-    if (promises.length === 0) return;
-
-    try {
-      await Promise.all(promises);
-      const newValues = { ...parsed.data, email: parsed.data.email ?? "" };
-      initialValuesRef.current = newValues;
-      form.setInitialValues(newValues);
-      form.resetDirty();
-      await revalidatePathActionAsync(`/manage/users/${user.id}`);
-      showSuccessNotification({
-        title: t("common.notification.update.success"),
-        message: t("common.notification.update.success"),
-      });
-    } catch {
-      showErrorNotification({
-        title: t("common.notification.update.error"),
-        message: t("common.notification.update.error"),
-      });
-    }
-  };
-
-  const handleDiscard = () => {
-    form.setValues(initialValuesRef.current);
-    form.resetDirty();
-  };
-
-  const firstDayOfWeekInputProps = form.getInputProps("firstDayOfWeek");
-  const firstDayOfWeekOnChange = firstDayOfWeekInputProps.onChange as (value: number) => void;
-  const firstDayOfWeekValue = (firstDayOfWeekInputProps.value as number).toString();
-
-  return (
-    <form onSubmit={form.onSubmit(handleSubmitAsync)}>
-      <Stack gap="lg">
-        <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg" verticalSpacing="lg">
-          <Card withBorder bg="transparent">
-            <Stack gap="md">
-              <Stack gap={2}>
-                <Title order={3}>{t("user.name")}</Title>
-                {!isCredentialsUser && (
-                  <Text c="dimmed" size="sm">
-                    {t("management.page.user.fieldsDisabledExternalProvider")}
-                  </Text>
-                )}
-              </Stack>
-              <Divider />
-              <TextInput
-                disabled={!isCredentialsUser}
-                label={t("user.field.username.label")}
-                withAsterisk
-                {...form.getInputProps("name")}
-              />
-              <TextInput
-                disabled={!isCredentialsUser}
-                label={t("user.field.email.label")}
-                {...form.getInputProps("email")}
-              />
-            </Stack>
-          </Card>
-
-          <Card withBorder bg="transparent">
-            <Stack gap="md">
-              <Stack gap={2}>
-                <Title order={3}>{tGeneral("item.board.title")}</Title>
-              </Stack>
-              <Divider />
-              <BoardSelect
-                label={tGeneral("item.board.type.general")}
-                clearable
-                boards={boardsData}
-                w="100%"
-                withinPortal
-                {...form.getInputProps("homeBoardId")}
-              />
-              <BoardSelect
-                label={tGeneral("item.board.type.mobile")}
-                clearable
-                boards={boardsData}
-                w="100%"
-                withinPortal
-                {...form.getInputProps("mobileHomeBoardId")}
-              />
-            </Stack>
-          </Card>
-
-          <Card withBorder bg="transparent">
-            <Stack gap="md">
-              <Stack gap={2}>
-                <Title order={3}>{tGeneral("item.search")}</Title>
-              </Stack>
-              <Divider />
-              <Select
-                label={t("user.field.defaultSearchEngine.label")}
-                w="100%"
-                data={searchEnginesData}
-                comboboxProps={{ withinPortal: true }}
-                {...form.getInputProps("defaultSearchEngineId")}
-              />
-              <Switch
-                label={t("user.field.openSearchInNewTab.label")}
-                {...form.getInputProps("openInNewTab", { type: "checkbox" })}
-              />
-              <Switch
-                label={t("user.field.ddgBangs.label")}
-                {...form.getInputProps("ddgBangsEnabled", { type: "checkbox" })}
-              />
-            </Stack>
-          </Card>
-
-          <Card withBorder bg="transparent">
-            <Stack gap="md">
-              <Stack gap={2}>
-                <Title order={3}>{tGeneral("item.language")}</Title>
-              </Stack>
-              <Divider />
-              {showLanguageSelector && <CurrentLanguageCombobox withinPortal />}
-              <Title order={4}>{tGeneral("item.firstDayOfWeek")}</Title>
-              <Radio.Group
-                {...firstDayOfWeekInputProps}
-                value={firstDayOfWeekValue}
-                onChange={(nextValue: string) => firstDayOfWeekOnChange(parseInt(nextValue, 10))}
-              >
-                <Group mt="xs" wrap="wrap">
-                  {FIRST_DAY_OPTIONS.map(({ value: dayValue, labelKey }) => (
-                    <Radio key={dayValue} value={dayValue.toString()} label={weekDays[labelKey]} />
-                  ))}
-                </Group>
-              </Radio.Group>
-              <Divider my="xs" />
-              <Title order={4}>{tGeneral("item.accessibility")}</Title>
-              <Switch
-                label={t("user.field.pingIconsEnabled.label")}
-                {...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
-              />
-            </Stack>
-          </Card>
-        </SimpleGrid>
-
-        <div style={{ position: "sticky", bottom: 20 }}>
-          {form.isDirty() && (
-            <Card withBorder>
-              <Group justify="space-between" wrap="wrap">
-                <Text fw={500}>{t("common.unsavedChanges")}</Text>
-                <Group>
-                  <Button disabled={isPending} variant="default" onClick={handleDiscard}>
-                    {t("common.action.discard")}
-                  </Button>
-                  <Button loading={isPending} type="submit" disabled={!form.isValid()}>
-                    {t("common.action.saveChanges")}
-                  </Button>
-                </Group>
-              </Group>
-            </Card>
-          )}
-        </div>
-      </Stack>
-    </form>
-  );
-};
@@ -0,0 +1,69 @@
+"use client";
+
+import { Button, Group, Stack, Switch } from "@mantine/core";
+import type { z } from "zod/v4";
+
+import type { RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
+import { revalidatePathActionAsync } from "@homarr/common/client";
+import { useZodForm } from "@homarr/form";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
+import { useI18n } from "@homarr/translation/client";
+import { userPingIconsEnabledSchema } from "@homarr/validation/user";
+
+interface PingIconsEnabledProps {
+  user: RouterOutputs["user"]["getById"];
+}
+
+export const PingIconsEnabled = ({ user }: PingIconsEnabledProps) => {
+  const t = useI18n();
+  const { mutate, isPending } = clientApi.user.changePingIconsEnabled.useMutation({
+    async onSettled() {
+      await revalidatePathActionAsync(`/manage/users/${user.id}`);
+    },
+    onSuccess(_, variables) {
+      form.setInitialValues({
+        pingIconsEnabled: variables.pingIconsEnabled,
+      });
+      showSuccessNotification({
+        message: t("user.action.changePingIconsEnabled.notification.success.message"),
+      });
+    },
+    onError() {
+      showErrorNotification({
+        message: t("user.action.changePingIconsEnabled.notification.error.message"),
+      });
+    },
+  });
+  const form = useZodForm(userPingIconsEnabledSchema, {
+    initialValues: {
+      pingIconsEnabled: user.pingIconsEnabled,
+    },
+  });
+
+  const handleSubmit = (values: FormType) => {
+    mutate({
+      id: user.id,
+      ...values,
+    });
+  };
+
+  return (
+    <form onSubmit={form.onSubmit(handleSubmit)}>
+      <Stack gap="md">
+        <Switch
+          {...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
+          label={t("user.field.pingIconsEnabled.label")}
+        />
+
+        <Group justify="end">
+          <Button type="submit" loading={isPending}>
+            {t("common.action.save")}
+          </Button>
+        </Group>
+      </Stack>
+    </form>
+  );
+};
+
+type FormType = z.infer<typeof userPingIconsEnabledSchema>;
@@ -2,7 +2,7 @@

 import { useCallback } from "react";
 import { Box, Button, FileButton, Menu, UnstyledButton } from "@mantine/core";
-import { useDisclosure, useMediaQuery } from "@mantine/hooks";
+import { useDisclosure } from "@mantine/hooks";
 import { IconPencil, IconPhotoEdit, IconPhotoX } from "@tabler/icons-react";

 import type { RouterOutputs } from "@homarr/api";
@@ -25,7 +25,6 @@ export const UserProfileAvatarForm = ({ user }: UserProfileAvatarForm) => {
    },
  });
  const [opened, { toggle }] = useDisclosure(false);
-  const isMobile = useMediaQuery("(max-width: 48em)");
  const { openConfirmModal } = useConfirmModal();
  const t = useI18n();
  const tManageAvatar = useScopedI18n("user.action.manageAvatar");
@@ -95,11 +94,11 @@ export const UserProfileAvatarForm = ({ user }: UserProfileAvatarForm) => {
  }, [mutate, user.id, openConfirmModal, tManageAvatar]);

  return (
-    <Box pos="relative" display="flex" style={{ justifyContent: isMobile ? "center" : undefined }}>
-      <Menu opened={opened} keepMounted onChange={toggle} position="bottom-start" withArrow withinPortal>
+    <Box pos="relative">
+      <Menu opened={opened} keepMounted onChange={toggle} position="bottom-start" withArrow>
        <Menu.Target>
          <UnstyledButton onClick={toggle}>
-            <UserAvatar user={user} size={isMobile ? 120 : 200} />
+            <UserAvatar user={user} size={200} />
            <Button
              component="div"
              pos="absolute"
@@ -0,0 +1,94 @@
+"use client";
+
+import { useCallback } from "react";
+import { Button, Group, Stack, TextInput } from "@mantine/core";
+
+import type { RouterInputs, RouterOutputs } from "@homarr/api";
+import { clientApi } from "@homarr/api/client";
+import { revalidatePathActionAsync } from "@homarr/common/client";
+import { useZodForm } from "@homarr/form";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
+import { useI18n } from "@homarr/translation/client";
+import { userEditProfileSchema } from "@homarr/validation/user";
+
+interface UserProfileFormProps {
+  user: RouterOutputs["user"]["getById"];
+}
+
+export const UserProfileForm = ({ user }: UserProfileFormProps) => {
+  const t = useI18n();
+  const { mutate, isPending } = clientApi.user.editProfile.useMutation({
+    async onSettled() {
+      await revalidatePathActionAsync("/manage/users");
+    },
+    onSuccess(_, variables) {
+      // Reset form initial values to reset dirty state
+      form.setInitialValues({
+        name: variables.name,
+        email: variables.email ?? "",
+      });
+      showSuccessNotification({
+        title: t("common.notification.update.success"),
+        message: t("user.action.editProfile.notification.success.message"),
+      });
+    },
+    onError(error) {
+      const message =
+        error.data?.code === "CONFLICT"
+          ? t("user.error.usernameTaken")
+          : t("user.action.editProfile.notification.error.message");
+      showErrorNotification({
+        title: t("common.notification.update.error"),
+        message,
+      });
+    },
+  });
+  const form = useZodForm(userEditProfileSchema.omit({ id: true }), {
+    initialValues: {
+      name: user.name ?? "",
+      email: user.email ?? "",
+    },
+  });
+
+  // Only credentials users can edit their profile
+  const isProviderCredentials = user.provider === "credentials";
+
+  const handleSubmit = useCallback(
+    (values: FormType) => {
+      if (!isProviderCredentials) return;
+      mutate({
+        ...values,
+        id: user.id,
+      });
+    },
+    [isProviderCredentials, mutate, user.id],
+  );
+
+  return (
+    <form onSubmit={form.onSubmit(handleSubmit)}>
+      <Stack>
+        <TextInput
+          disabled={!isProviderCredentials}
+          label={t("user.field.username.label")}
+          withAsterisk
+          {...form.getInputProps("name")}
+        />
+        <TextInput
+          disabled={!isProviderCredentials}
+          label={t("user.field.email.label")}
+          {...form.getInputProps("email")}
+        />
+
+        {isProviderCredentials && (
+          <Group justify="end">
+            <Button type="submit" disabled={!form.isDirty()} loading={isPending}>
+              {t("common.action.saveChanges")}
+            </Button>
+          </Group>
+        )}
+      </Stack>
+    </form>
+  );
+};
+
+type FormType = Omit<RouterInputs["user"]["editProfile"], "id">;
@@ -6,13 +6,18 @@ import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
 import { getI18n, getScopedI18n } from "@homarr/translation/server";

+import { CurrentLanguageCombobox } from "~/components/language/current-language-combobox";
 import { DangerZoneItem, DangerZoneRoot } from "~/components/manage/danger-zone";
 import { catchTrpcNotFound } from "~/errors/trpc-catch-error";
 import { createMetaTitle } from "~/metadata";
 import { canAccessUserEditPage } from "../access";
+import { ChangeHomeBoardForm } from "./_components/_change-home-board";
+import { ChangeSearchPreferencesForm } from "./_components/_change-search-preferences";
 import { DeleteUserButton } from "./_components/_delete-user-button";
-import { UserGeneralSettingsForm } from "./_components/_general-settings-form";
+import { FirstDayOfWeek } from "./_components/_first-day-of-week";
+import { PingIconsEnabled } from "./_components/_ping-icons-enabled";
 import { UserProfileAvatarForm } from "./_components/_profile-avatar-form";
+import { UserProfileForm } from "./_components/_profile-form";

 interface Props {
  params: Promise<{
@@ -58,7 +63,7 @@ export default async function EditUserPage(props: Props) {

  const boards = await api.board.getAllBoards();
  const searchEngines = await api.searchEngine.getSelectable();
-  const isSelf = session?.user.id === user.id;
+
  const isCredentialsUser = user.provider === "credentials";

  return (
@@ -68,25 +73,51 @@ export default async function EditUserPage(props: Props) {
          {t("management.page.user.fieldsDisabledExternalProvider")}
        </Alert>
      )}
+
      <Title>{tGeneral("title")}</Title>
-      <Group gap="xl" align="flex-start" wrap="wrap">
-        <Box flex={1} miw={{ base: "100%", md: 540 }}>
-          <UserGeneralSettingsForm
-            user={user}
-            boardsData={boards.map((board) => ({
-              id: board.id,
-              name: board.name,
-              logoImageUrl: board.logoImageUrl,
-            }))}
-            searchEnginesData={searchEngines}
-            showLanguageSelector={isSelf}
-          />
+      <Group gap="xl">
+        <Box flex={1}>
+          <UserProfileForm user={user} />
        </Box>
-        <Box w={{ base: "100%", lg: 260 }}>
+        <Box w={{ base: "100%", lg: 200 }}>
          <UserProfileAvatarForm user={user} />
        </Box>
      </Group>

+      {session?.user.id === user.id && (
+        <Stack mb="lg">
+          <Title order={2}>{tGeneral("item.language")}</Title>
+          <CurrentLanguageCombobox />
+        </Stack>
+      )}
+
+      <Stack mb="lg">
+        <Title order={2}>{tGeneral("item.board.title")}</Title>
+        <ChangeHomeBoardForm
+          user={user}
+          boardsData={boards.map((board) => ({
+            id: board.id,
+            name: board.name,
+            logoImageUrl: board.logoImageUrl,
+          }))}
+        />
+      </Stack>
+
+      <Stack mb="lg">
+        <Title order={2}>{tGeneral("item.search")}</Title>
+        <ChangeSearchPreferencesForm user={user} searchEnginesData={searchEngines} />
+      </Stack>
+
+      <Stack mb="lg">
+        <Title order={2}>{tGeneral("item.firstDayOfWeek")}</Title>
+        <FirstDayOfWeek user={user} />
+      </Stack>
+
+      <Stack mb="lg">
+        <Title order={2}>{tGeneral("item.accessibility")}</Title>
+        <PingIconsEnabled user={user} />
+      </Stack>
+
      <DangerZoneRoot>
        <DangerZoneItem
          label={t("user.action.delete.label")}
@@ -1,22 +1,24 @@
 "use client";

 import { useMemo } from "react";
-import { Anchor, Group, Text, Tooltip } from "@mantine/core";
+import { Anchor, Button, Group, Text, Title, Tooltip } from "@mantine/core";
 import { IconCheck } from "@tabler/icons-react";
 import type { MRT_ColumnDef } from "mantine-react-table";
 import { MantineReactTable } from "mantine-react-table";

 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
-import { useI18n } from "@homarr/translation/client";
+import { useI18n, useScopedI18n } from "@homarr/translation/client";
 import { Link, UserAvatar } from "@homarr/ui";
 import { useTranslatedMantineReactTable } from "@homarr/ui/hooks";

 interface UserListComponentProps {
  initialUserList: RouterOutputs["user"]["getAll"];
+  credentialsProviderEnabled: boolean;
 }

-export const UserListComponent = ({ initialUserList }: UserListComponentProps) => {
+export const UserListComponent = ({ initialUserList, credentialsProviderEnabled }: UserListComponentProps) => {
+  const tUserList = useScopedI18n("management.page.user.list");
  const t = useI18n();
  const { data, isLoading } = clientApi.user.getAll.useQuery(undefined, {
    initialData: initialUserList,
@@ -67,10 +69,21 @@ export const UserListComponent = ({ initialUserList }: UserListComponentProps) =
    enableFullScreenToggle: false,
    layoutMode: "grid-no-grow",
    getRowId: (row) => row.id,
+    renderTopToolbarCustomActions: () =>
+      credentialsProviderEnabled ? (
+        <Button component={Link} href="/manage/users/create">
+          {t("management.page.user.create.title")}
+        </Button>
+      ) : null,
    state: {
      isLoading,
    },
  });

-  return <MantineReactTable table={table} />;
+  return (
+    <>
+      <Title mb="md">{tUserList("title")}</Title>
+      <MantineReactTable table={table} />
+    </>
+  );
 };
@@ -149,7 +149,7 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
          color={!generalForm.isValid() ? "red" : undefined}
        >
          <form>
-            <Card p="xl">
+            <Card p="xl" shadow="md" withBorder>
              <Stack gap="md">
                <TextInput
                  label={tUserField("username.label")}
@@ -165,7 +165,7 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
        </Stepper.Step>
        <Stepper.Step label={t("step.security.label")} allowStepSelect={false} allowStepClick={false}>
          <form>
-            <Card p="xl">
+            <Card p="xl" shadow="md" withBorder>
              <Stack gap="md">
                <CustomPasswordInput
                  withPasswordRequirements
@@ -185,7 +185,7 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
          </form>
        </Stepper.Step>
        <Stepper.Step label={t("step.groups.label")} allowStepSelect={false} allowStepClick={false}>
-          <Card p="xl">
+          <Card p="xl" shadow="md" withBorder>
            <GroupsForm
              initialGroups={initialGroups}
              addGroup={(groupId) =>
@@ -198,20 +198,20 @@ export const UserCreateStepperComponent = ({ initialGroups }: UserCreateStepperC
          </Card>
        </Stepper.Step>
        <Stepper.Step label={t("step.review.label")} allowStepSelect={false} allowStepClick={false}>
-          <Card p="xl">
+          <Card p="xl" shadow="md" withBorder>
            <Stack maw={300} align="center" mx="auto">
              <UserAvatar
                size="xl"
                user={{ name: generalForm.values.username, email: generalForm.values.email ?? null, image: null }}
              />
-              <Text fw={700} size="xl">
+              <Text tt="uppercase" fw="bolder" size="xl">
                {generalForm.values.username}
              </Text>
            </Stack>
          </Card>
        </Stepper.Step>
        <Stepper.Completed>
-          <Card p="xl">
+          <Card p="xl" shadow="md" withBorder>
            <Stack align="center" maw={300} mx="auto">
              <IconUserCheck size="3rem" />
              <Title order={2}>{t("step.completed.title")}</Title>
@@ -25,7 +25,7 @@ export const StepperNavigationComponent = ({
 }: StepperNavigationComponentProps) => {
  const t = useI18n();
  return (
-    <Card>
+    <Card shadow="md" withBorder>
      {!isComplete ? (
        <Group justify="space-between" wrap="nowrap">
          <Button
@@ -101,7 +101,7 @@ export const SaveAffix = ({ groupId }: SaveAffixProps) => {
    <div style={{ position: "sticky", bottom: 20 }}>
      <Transition transition="slide-up" mounted={form.isDirty()}>
        {(transitionStyles) => (
-          <Card style={transitionStyles}>
+          <Card style={transitionStyles} withBorder>
            <Group justify="space-between">
              <Text fw={500}>{tForm("unsavedChanges")}</Text>
              <Group>
@@ -68,6 +68,7 @@ const PermissionCard = async ({ group, isDanger }: PermissionCardProps) => {
  return (
    <Card
      p="md"
+      withBorder
      style={{
        borderColor: isDanger ? "var(--mantine-color-red-8)" : undefined,
      }}
@@ -1,7 +1,7 @@
 "use client";

-import { useMemo, useState } from "react";
-import { TextInput } from "@mantine/core";
+import { useCallback, useMemo, useState } from "react";
+import { Group, TextInput } from "@mantine/core";
 import { IconSearch } from "@tabler/icons-react";

 import type { RouterOutputs } from "@homarr/api";
@@ -33,20 +33,29 @@ export const GroupsList = ({ groups }: GroupsListProps) => {

  return (
    <>
-      <TextInput
-        leftSection={<IconSearch size={20} stroke={1.5} />}
-        value={search}
-        onChange={(event) => setSearch(event.currentTarget.value)}
-        placeholder={`${t("group.search")}...`}
-      />
+      <Group justify="space-between">
+        <TextInput
+          leftSection={<IconSearch size={20} stroke={1.5} />}
+          value={search}
+          onChange={(event) => setSearch(event.currentTarget.value)}
+          placeholder={`${t("group.search")}...`}
+          style={{ flex: 1 }}
+        />
+        <AddGroup />
+      </Group>
+
      <GroupsTable groups={filteredGroups} initialGroupIds={initialGroupIds} hasFilter={search.length !== 0} />
    </>
  );
 };

-export const AddGroupButton = () => {
+const AddGroup = () => {
  const t = useI18n();
  const { openModal } = useModalAction(AddGroupModal);

-  return <MobileAffixButton onClick={() => openModal()}>{t("group.action.create.label")}</MobileAffixButton>;
+  const handleAddGroup = useCallback(() => {
+    openModal();
+  }, [openModal]);
+
+  return <MobileAffixButton onClick={handleAddGroup}>{t("group.action.create.label")}</MobileAffixButton>;
 };
@@ -259,7 +259,7 @@ const SaveAffix = ({ visible, isPending, onDiscard, onSave }: SaveAffixProps) =>
    <div style={{ position: "sticky", bottom: 20 }}>
      <Transition transition="slide-up" mounted={visible}>
        {(transitionStyles) => (
-          <Card style={transitionStyles}>
+          <Card style={transitionStyles} withBorder>
            <Group justify="space-between">
              <Text fw={500}>{t("common.unsavedChanges")}</Text>
              <Group>
Author	SHA1	Message	Date
copilot-swe-agent[bot]andajnart	25e9cc1125	fix: remove legacy apps/websocket and apps/tasks, exclude build artifacts from tsconfig - Remove apps/websocket/ (merged into custom server in server.ts) - Remove apps/tasks/ (merged into custom server in server.ts) - Exclude customServer.cjs and customServer.css from tsconfig to prevent tsc errors when build artifacts are present - Update pnpm-lock.yaml (removed 138 unnecessary packages) Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com> Agent-Logs-Url: https://github.com/homarr-labs/homarr/sessions/bd83b347-563b-494e-b8c6-91fcc199dd79	2026-03-25 18:44:23 +00:00
copilot-swe-agent[bot]andajnart	8ad05560ad	fix: resolve TypeScript compilation errors in server.ts and integration.ts - Fix TS2502 circular type reference in server.ts by importing jobGroup as a type-only alias (CronJobGroup) matching the pattern from apps/tasks/src/job-manager.ts - Fix TS2578 by removing stale @ts-expect-error for immich documentationUrl (URL now exists in homarr-docs-sitemap.ts) - Fix .gitignore: add customServer.css build artifact, fix missing newline - Update pnpm-lock.yaml to include new deps (ws, fastify, esbuild, etc.) Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com> Agent-Logs-Url: https://github.com/homarr-labs/homarr/sessions/eb8fcd66-878f-4a31-a981-1ba1d663c2ca	2026-03-25 17:37:14 +00:00
copilot-swe-agent[bot]andajnart	a613a7a473	initial plan Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com> Agent-Logs-Url: https://github.com/homarr-labs/homarr/sessions/eb8fcd66-878f-4a31-a981-1ba1d663c2ca	2026-03-25 17:34:09 +00:00
copilot-swe-agent[bot]andajnart	621c0bbaac	style: remove extra blank line in en.json translation file Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-15 15:32:15 +00:00
copilot-swe-agent[bot]andajnart	ed249ce7eb	merge: integrate dev branch (v1.56.0), resolve all conflicts Resolves 15 conflicted files from dev merge: - Version bumps to v1.56.0, pnpm 10.32.0, turbo 2.8.15 - New integrations: tracearr (from dev) - New widgets: tracearr (from dev) - Updated dependencies: mysql2, typescript-eslint, isomorphic-dompurify - Keeps our custom server changes: esbuild, fastify, cron-job-api deps - Keeps our docker:test scripts and APPROACHES.md Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-15 15:30:21 +00:00
copilot-swe-agent[bot]andajnart	deb9916d2d	feat(poc): add Redis-backed widget prefetch cache POC demonstrating Approach 7 from APPROACHES.md. This commit can be cleanly reverted with `git revert` if the approach is not adopted. Changes: - packages/redis/src/index.ts: Add createWidgetPrefetchCache() factory that creates a cache channel per widget kind (5min TTL) - packages/widgets/src/prefetch.ts: Check Redis cache before database queries. On cache miss, falls back to original DB path and writes through to Redis for the next request. Expected behavior: - First page load: cache miss → DB query → write to Redis (same as before) - Subsequent loads within 5min: cache hit → skip DB queries entirely - Redis unavailable: falls back to original behavior (no regression) - Cache invalidation: automatic via 5-minute TTL Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-15 15:26:04 +00:00
copilot-swe-agent[bot]andajnart	38538a94f9	docs: add Redis-backed initial data and ISR caching approaches Documents two new performance optimization strategies in APPROACHES.md: Approach 7 - Redis-Backed TanStack Query Initial Data: - Use Redis cache as initialData for TanStack Query - Cron jobs already populate Redis; read from cache instead of DB - Estimated 2-5x faster TTFB, ~90% fewer DB queries per page load - Includes implementation path and code examples Approach 8 - Client-Side Rendering with ISR Static Shell: - Serve static HTML shell, fetch data client-side - Analysis shows this is NOT recommended for Homarr dashboards - Causes layout shift, breaks hydration, doesn't work with auth - ISR better suited for content sites, not interactive dashboards Includes benchmark comparison table and recommendation. Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-15 15:22:50 +00:00
copilot-swe-agent[bot]andajnart	a508fd1806	test: add robust Docker build+run test script with multi-arch support Replaces inline docker:test script with scripts/docker-test.sh that: - Detects and reports architecture (x86_64/arm64) - Polls health endpoint with configurable timeout (60s) - Verifies home page, health/live, health/ready endpoints - Tests WebSocket endpoint reachability - Proper cleanup on exit via trap - Supports --skip-build flag for CI caching Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-15 15:21:43 +00:00
copilot-swe-agent[bot]andajnart	5a5f1062ce	fix: graceful cleanup in server error handler before exit Close WebSocket, tasks server, and HTTP server before calling process.exit(1) in the error handler. Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-13 09:22:22 +00:00
copilot-swe-agent[bot]andajnart	6cbf72462a	merge: integrate dev branch, resolve package.json and lockfile conflicts Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-13 09:20:05 +00:00
copilot-swe-agent[bot]andajnart	1e438ec3c3	docs: add APPROACHES.md documenting RAM optimization strategies Documents 6 approaches (implemented, considered, and future) with PROs, CONs, measured savings, and recommendations for each. Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-13 09:13:47 +00:00
copilot-swe-agent[bot]andajnart	d09c2cd457	feat: add docker:build and docker:test scripts to package.json docker:build builds the Docker image. docker:test builds, starts the container, waits 15s, checks port 7575 responds, prints tail logs, and stops the container. Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-13 09:10:21 +00:00
copilot-swe-agent[bot]andajnart	1611e8a230	fix: use getUpgradeHandler() for proper HMR delegation in custom server Aligns with Next.js custom server docs by using app.getUpgradeHandler() to delegate non-WS upgrade requests (e.g. _next/webpack-hmr) to Next.js instead of silently dropping them. Also adds server.once("error") handler. Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-13 09:09:24 +00:00
copilot-swe-agent[bot]andajnart	926066365d	fix: handle errors in tasksServer.close() during SIGTERM Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-03 08:48:34 +00:00
copilot-swe-agent[bot]andajnart	9951f88926	feat: integrate tasks/cron server into custom Next.js server - Add tasks dependencies (fastify, cron-job-api, cron-jobs, etc.) to nextjs app - Import and start tasks (JobManager, jobGroup, Fastify cron API) in server.ts - Update root package.json start script to remove tasks.cjs - Update scripts/run.sh to run single process - Update Dockerfile to not copy tasks.cjs - Disable tasks dev script (no-op) Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-03-03 08:45:53 +00:00
copilot-swe-agent[bot]andajnart	835ecd0d28	fix: use port 3000 consistently for WebSocket URL in server-side rendering Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-02-28 09:14:45 +00:00
copilot-swe-agent[bot]andajnart	8994bdedc3	fix: resolve AsyncLocalStorage + dir issues in custom server, update benchmark script Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-02-28 09:13:41 +00:00
copilot-swe-agent[bot]andajnart	c8ae7f283a	feat: implement custom Next.js server with integrated WebSocket (POC) - Create apps/nextjs/server.ts custom server integrating WebSocket via ws - Update nextjs scripts to use custom server for dev and start - Update root start script to remove separate ws server process - Update client tRPC URL to connect to port 3000 in dev - Update nginx.conf to route /websockets to port 3000 - Update Dockerfile and run.sh for integrated server - Disable standalone ws server dev script - Add benchmark-memory.sh script Co-authored-by: ajnart <49837342+ajnart@users.noreply.github.com>	2026-02-28 08:58:34 +00:00
copilot-swe-agent[bot]	000604bd02	Initial plan	2026-02-28 08:49:22 +00:00
@@ -1 +1 @@
 .16.0
 .14.0