fix db lint after v2 merge

Co-authored-by: homarr-renovate[bot] <158783068+homarr-renovate[bot]@users.noreply.github.com>

.dockerignore

@@ -6,7 +6,14 @@ npm-debug.log
 README.md
 .next
 .turbo
+.pnpm-store
+**/.pnpm-store
+coverage
+**/coverage
+**/.docusaurus
+**/build
 .git
+.github
 dev
 .build
 e2e

.github/act/.gitignore

@@ -0,0 +1,2 @@
+.secrets
+!.secrets.example

.github/act/.secrets.example

@@ -0,0 +1,4 @@
+TURBO_API=
+TURBO_TEAM=
+TURBO_TOKEN=
+TURBO_REMOTE_CACHE_SIGNATURE_KEY=

.github/act/README.md

@@ -0,0 +1,36 @@
+# Running CI locally
+
+Install [Act](https://nektosact.com/installation/index.html) and ensure Docker is running, then use:
+
+```bash
+pnpm ci:act:fast
+pnpm ci:act:docker
+pnpm ci:act:all
+pnpm ci:act:cleanup
+```
+
+`fast` runs the quality gate. `docker` and `all` run the gate followed by the single container build, E2E suite, and memory regression test. `cleanup` validates the manual cleanup path without calling GitHub. The wrapper supports regular clones and Git worktrees, including non-default Docker contexts. Linux dependencies are kept in Docker volumes instead of overwriting host `node_modules`. The first run downloads the Act runner and Playwright browser dependencies.
+
+Remote caching is optional locally. Copy `.github/act/.secrets.example` to `.github/act/.secrets`, populate it with rotated credentials, and run with:
+
+```bash
+ACT_SECRET_FILE=.github/act/.secrets pnpm ci:act:all
+```
+
+Act never publishes or deletes GHCR images. The secret file is ignored by Git.
+
+## PR preview images
+
+Successful non-draft pull requests from this repository publish an amd64 image:
+
+```bash
+docker pull ghcr.io/homarr-labs/homarr-test:pr-<number>
+```
+
+The tag is replaced when the pull request is updated and deleted when it closes. Production Homarr images remain the supported multi-architecture releases. The `homarr-test` package must be configured as public in GHCR for unauthenticated testers.
+
+## Dokploy preview cache
+
+Keep `needs-demo` as the Dokploy preview label. Under the application's **Preview Build-time Secrets**, configure `TURBO_API`, `TURBO_TEAM`, `TURBO_TOKEN`, and `TURBO_REMOTE_CACHE_SIGNATURE_KEY`. Dokploy passes these to the Dockerfile as BuildKit secrets. Do not configure the token or signature key as Docker build arguments.
+
+Rotate any credentials that have appeared in chat, logs, or committed configuration before enabling the cache.

.github/workflows/autofix.yml

@@ -0,0 +1,47 @@
+name: Auto-fix lint and format
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches: ["*"]
+
+permissions:
+  contents: write
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  autofix:
+    name: Auto-fix
+    if: github.event.pull_request.head.repo.id == github.repository_id
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+          ref: ${{ github.head_ref }}
+
+      - name: Setup
+        uses: ./tooling/github/setup
+
+      - name: Get changed files
+        id: changed
+        env:
+          BASE_REF: ${{ github.base_ref }}
+        run: |
+          git diff --name-only --diff-filter=ACMR "origin/${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@v7
+        with:
+          commit_message: "style: auto-fix lint and format"

.github/workflows/ci.yml

@@ -0,0 +1,347 @@
+name: CI
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    branches: ["*"]
+  pull_request_target:
+    types: [closed]
+    branches: ["*"]
+  push:
+    branches: [main, dev, beta, next]
+  merge_group:
+  workflow_dispatch:
+    inputs:
+      operation:
+        description: Operation to run
+        required: true
+        default: validate
+        type: choice
+        options:
+          - validate
+          - publish
+          - cleanup
+      pr_number:
+        description: PR number for publish or cleanup
+        required: false
+        type: number
+      ref:
+        description: Git ref to validate or publish
+        required: false
+        type: string
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || inputs.pr_number || github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+env:
+  FORCE_COLOR: 3
+  SKIP_ENV_VALIDATION: true
+  TURBO_TELEMETRY_DISABLED: 1
+  REGISTRY: ghcr.io
+  PREVIEW_IMAGE: ghcr.io/homarr-labs/homarr-test
+
+jobs:
+  fast-gate:
+    name: Fast gate
+    if: github.event_name != 'pull_request_target' && (github.event_name != 'workflow_dispatch' || inputs.operation != 'cleanup')
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    env:
+      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.merge_group.base_sha || github.event.before || 'HEAD~1' }}
+      TURBO_SCM_HEAD: ${{ github.sha }}
+      TURBO_PLATFORM: linux/amd64
+    steps:
+      - uses: actions/checkout@v7
+        if: '!env.ACT'
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+          ref: ${{ github.event_name == 'workflow_dispatch' && inputs.ref || '' }}
+
+      - name: Validate manual inputs
+        if: github.event_name == 'workflow_dispatch' && inputs.operation == 'publish'
+        env:
+          PR_NUMBER: ${{ inputs.pr_number }}
+          BUILD_REF: ${{ inputs.ref }}
+        run: |
+          test -n "$PR_NUMBER" || { echo "pr_number is required for publish"; exit 1; }
+          test -n "$BUILD_REF" || { echo "ref is required for publish"; exit 1; }
+
+      - name: Setup
+        uses: ./tooling/github/setup
+
+      - name: Copy environment defaults
+        run: cp .env.example .env
+
+      - name: Check formatting in affected workspaces
+        run: pnpm turbo run format --affected --continue -- --check
+
+      - name: Lint, typecheck, and build affected workspaces
+        run: pnpm turbo run lint typecheck build --affected --continue=dependencies-successful
+
+      - name: Validate workspace configuration
+        run: pnpm lint:ws
+
+      - name: Run unit tests
+        run: pnpm test
+
+      - name: Report coverage
+        if: always() && !env.ACT
+        uses: davelosert/vitest-coverage-report-action@v2
+
+  container:
+    name: Container, E2E, and memory
+    needs: fast-gate
+    if: |
+      github.event_name == 'merge_group' ||
+      (github.event_name == 'pull_request' && github.event.pull_request.draft == false) ||
+      (github.event_name == 'workflow_dispatch' && (inputs.operation == 'validate' || inputs.operation == 'publish'))
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v7
+        if: '!env.ACT'
+        with:
+          persist-credentials: false
+          ref: ${{ github.event_name == 'workflow_dispatch' && inputs.ref || '' }}
+
+      - name: Setup
+        uses: ./tooling/github/setup
+
+      - name: Set up Docker Buildx
+        if: '!env.ACT'
+        uses: docker/setup-buildx-action@v4
+
+      - name: Build container once
+        if: '!env.ACT'
+        uses: docker/build-push-action@v7
+        with:
+          context: .
+          network: host
+          platforms: linux/amd64
+          load: true
+          push: false
+          tags: |
+            homarr-ci
+            homarr-e2e
+          labels: |
+            org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
+            org.opencontainers.image.revision=${{ github.sha }}
+            org.opencontainers.image.ref.name=pr-${{ github.event.pull_request.number || inputs.pr_number || 'none' }}
+          cache-from: type=gha,scope=homarr-linux-amd64
+          cache-to: type=gha,scope=homarr-linux-amd64,mode=max
+          secrets: |
+            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 }}
+
+      - name: Build container once with Act
+        if: env.ACT
+        env:
+          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 }}
+        run: |
+          secret_args=()
+          for secret in TURBO_API TURBO_TEAM TURBO_TOKEN TURBO_REMOTE_CACHE_SIGNATURE_KEY; do
+            if [ -n "${!secret:-}" ]; then
+              secret_args+=(--secret "id=${secret},env=${secret}")
+            fi
+          done
+          DOCKER_BUILDKIT=1 docker build --platform linux/amd64 \
+            --tag homarr-ci --tag homarr-e2e "${secret_args[@]}" .
+
+      - name: Cache Playwright browsers
+        if: '!env.ACT'
+        id: playwright-cache
+        uses: actions/cache@v6
+        with:
+          path: ~/.cache/ms-playwright
+          key: playwright-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
+
+      - name: Install Playwright Chromium
+        if: steps.playwright-cache.outputs.cache-hit != 'true' || env.ACT
+        run: pnpm exec playwright install --with-deps chromium
+
+      - name: Install Playwright system deps
+        if: steps.playwright-cache.outputs.cache-hit == 'true'
+        run: pnpm exec playwright install-deps chromium
+
+      - name: Run E2E tests
+        run: pnpm test:e2e
+
+      - name: Upload E2E artifacts
+        if: failure() && !env.ACT
+        uses: actions/upload-artifact@v7
+        with:
+          name: playwright-report
+          path: e2e/test-results/
+          retention-days: 7
+
+      - name: Run memory regression test
+        env:
+          CONTAINER_NAME: homarr-mem-${{ github.run_id }}-${{ github.run_attempt }}
+          SECRET_ENCRYPTION_KEY: 0000000000000000000000000000000000000000000000000000000000000000
+        run: |
+          docker run -d --name "$CONTAINER_NAME" -p 127.0.0.1::7575 \
+            -e NO_EXTERNAL_CONNECTION=true \
+            -e SECRET_ENCRYPTION_KEY="$SECRET_ENCRYPTION_KEY" \
+            homarr-ci
+          PORT=$(docker port "$CONTAINER_NAME" 7575/tcp | sed 's/.*://')
+          [[ "$PORT" =~ ^[0-9]+$ ]] || { echo "ERROR: invalid port mapping: '$PORT'"; exit 1; }
+          URL="http://127.0.0.1:${PORT}"
+
+          healthy=false
+          for i in $(seq 1 30); do
+            if curl -sf "$URL/api/health/ready" >/dev/null 2>&1; then
+              echo "Container healthy after $((i * 2))s"
+              healthy=true
+              break
+            fi
+            sleep 2
+          done
+
+          if [ "$healthy" != "true" ]; then
+            echo "ERROR: Container never became healthy"
+            docker logs "$CONTAINER_NAME" --tail 100
+            exit 1
+          fi
+
+          warmup_ok=0
+          for _ in $(seq 1 5); do
+            curl -sf "$URL/" >/dev/null 2>&1 && warmup_ok=$((warmup_ok + 1))
+            sleep 2
+          done
+          if [ "$warmup_ok" -eq 0 ]; then
+            echo "ERROR: All warmup requests failed"
+            docker logs "$CONTAINER_NAME" --tail 50
+            exit 1
+          fi
+
+          docker inspect -f '{{.State.Running}}' "$CONTAINER_NAME" | grep -qx true || {
+            echo "ERROR: Container died before memory measurement"
+            docker logs "$CONTAINER_NAME" --tail 100
+            exit 1
+          }
+
+          RAW_MEMORY=$(docker stats --no-stream --format '{{.MemUsage}}' "$CONTAINER_NAME" | sed 's| /.*||')
+          MEMORY_MB=$(echo "$RAW_MEMORY" | awk '
+            /GiB/ { gsub(/GiB/, ""); print $1 * 1024; next }
+            /MiB/ { gsub(/MiB/, ""); print $1; next }
+            /KiB/ { gsub(/KiB/, ""); print $1 / 1024; next }
+            { print $1 / 1048576 }
+          ')
+
+          echo "Memory usage: ${MEMORY_MB} MB (${RAW_MEMORY})"
+          [[ "$MEMORY_MB" =~ ^[0-9]+(\.[0-9]+)?$ ]] || {
+            echo "ERROR: non-numeric memory value: '$MEMORY_MB' (raw: '$RAW_MEMORY')"
+            docker logs "$CONTAINER_NAME" --tail 100
+            exit 1
+          }
+          if awk "BEGIN { exit !($MEMORY_MB < 50) }"; then
+            echo "ERROR: Memory suspiciously low (${MEMORY_MB} MB) — container may have crashed"
+            docker logs "$CONTAINER_NAME" --tail 100
+            exit 1
+          elif awk "BEGIN { exit !($MEMORY_MB > 700) }"; then
+            echo "ERROR: Memory usage ${MEMORY_MB} MB exceeds 700 MB"
+            docker logs "$CONTAINER_NAME" --tail 100
+            exit 1
+          fi
+
+      - name: Clean up memory test container
+        if: always()
+        env:
+          CONTAINER_NAME: homarr-mem-${{ github.run_id }}-${{ github.run_attempt }}
+        run: docker rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true
+
+      - name: Determine preview tag
+        id: preview
+        if: |
+          !env.ACT &&
+          (
+            (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) ||
+            (github.event_name == 'workflow_dispatch' && inputs.operation == 'publish')
+          )
+        env:
+          PR_NUMBER: ${{ github.event.pull_request.number || inputs.pr_number }}
+        run: echo "tag=pr-${PR_NUMBER}" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GHCR
+        if: steps.preview.outputs.tag != ''
+        uses: docker/login-action@v4
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push preview image
+        if: steps.preview.outputs.tag != ''
+        env:
+          PREVIEW_TAG: ${{ steps.preview.outputs.tag }}
+        run: |
+          docker tag homarr-ci "${PREVIEW_IMAGE}:${PREVIEW_TAG}"
+          docker push "${PREVIEW_IMAGE}:${PREVIEW_TAG}"
+
+      - name: Show Act publication result
+        if: env.ACT
+        run: echo "Act validated the publication path; external GHCR writes are disabled locally."
+
+  cleanup:
+    name: Clean up preview image
+    if: github.event_name == 'pull_request_target' || (github.event_name == 'workflow_dispatch' && inputs.operation == 'cleanup')
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    permissions:
+      packages: write
+    env:
+      IMAGE_TAG: pr-${{ github.event.pull_request.number || inputs.pr_number }}
+    steps:
+      - name: Validate cleanup input
+        if: github.event_name == 'workflow_dispatch'
+        env:
+          PR_NUMBER: ${{ inputs.pr_number }}
+        run: test -n "$PR_NUMBER" || { echo "pr_number is required for cleanup"; exit 1; }
+
+      - name: Delete GHCR package version
+        if: '!env.ACT'
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const packageName = "homarr-test";
+            const org = context.repo.owner;
+            const tag = process.env.IMAGE_TAG;
+            const versions = await github.paginate(
+              github.rest.packages.getAllPackageVersionsForPackageOwnedByOrg,
+              { package_type: "container", package_name: packageName, org, per_page: 100 },
+            );
+            const target = versions.find((version) =>
+              version.metadata?.container?.tags?.includes(tag),
+            );
+            if (!target) {
+              core.info(`No package version found with tag "${tag}"`);
+              return;
+            }
+            await github.rest.packages.deletePackageVersionForOrg({
+              package_type: "container",
+              package_name: packageName,
+              org,
+              package_version_id: target.id,
+            });
+            core.info(`Deleted package version ${target.id} (${tag})`);
+
+      - name: Show Act cleanup result
+        if: env.ACT
+        run: echo "Act validated cleanup for ${IMAGE_TAG}; external GHCR writes are disabled locally."

.github/workflows/code-quality.yml

@@ -1,165 +0,0 @@
-name: "[Quality] Code Analysis"
-permissions:
-  contents: read
-
-on:
-  pull_request:
-    branches: ["*"]
-  push:
-    branches: ["main"]
-  merge_group:
-
-concurrency:
-  group: "${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
-
-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 }}
-
-jobs:
-  lint-format-autofix:
-    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.id == github.repository_id
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v7
-        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@v7
-        with:
-          commit_message: "style: auto-fix lint and format"
-
-  lint:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-
-      - name: Setup
-        uses: ./tooling/github/setup
-
-      - name: Copy env
-        shell: bash
-        run: cp .env.example .env
-
-      - name: Lint
-        run: pnpm turbo lint --affected && pnpm lint:ws
-
-  format:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-
-      - name: Setup
-        uses: ./tooling/github/setup
-
-      - name: Format
-        run: pnpm turbo format --affected --continue
-
-  typecheck:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-
-      - name: Setup
-        uses: ./tooling/github/setup
-
-      - name: Typecheck
-        run: pnpm turbo typecheck --affected
-
-  test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v7
-
-      - name: Setup
-        uses: ./tooling/github/setup
-
-      - name: Test
-        run: pnpm test
-
-      - name: "Report Coverage"
-        # Set if: always() to also generate the report if tests are failing
-        # Only works if you set `reportOnFailure: true` in your vite config as specified above
-        if: always()
-        uses: davelosert/vitest-coverage-report-action@v2
-
-  e2e:
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v7
-      - 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
-        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
-        run: pnpm exec playwright install chromium
-      - name: Run E2E Tests
-        shell: bash
-        run: pnpm test:e2e
-
-  build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v7
-        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

.github/workflows/deployment-docker-image.yml

@@ -148,6 +148,11 @@ jobs:
           platforms: linux/amd64
           labels: ${{ steps.meta.outputs.labels }}
           outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
+          secrets: |
+            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 }}
         env:
           SKIP_ENV_VALIDATION: true
   build-arm64:
@@ -187,6 +192,11 @@ jobs:
           platforms: linux/arm64
           labels: ${{ steps.meta.outputs.labels }}
           outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
+          secrets: |
+            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 }}
         env:
           SKIP_ENV_VALIDATION: true
   extract-asset-amd64:

AUDIT.md

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

Dockerfile

@@ -1,24 +1,43 @@
+# syntax=docker/dockerfile:1.25
+
 FROM node:24.18.0-alpine AS base
 
 FROM base AS builder
-RUN apk add --no-cache libc6-compat
-RUN apk update
-
-# Set working directory
 WORKDIR /app
-RUN apk add --no-cache libc6-compat curl bash
-RUN apk update
+RUN apk add --no-cache libc6-compat curl bash && apk update
+
+RUN corepack enable pnpm
+COPY pnpm-lock.yaml pnpm-workspace.yaml package.json ./
+COPY patches ./patches
+# Workaround for pnpm/pnpm#5268: pnpm fetch crashes when patchedDependencies
+# are configured with nodeLinker: hoisted. The applyPatchToDir function tries
+# to chdir into node_modules/<pkg> which doesn't exist during fetch (only the
+# content-addressable store is populated). By temporarily switching to the
+# isolated linker, patches apply inside the virtual store (node_modules/.pnpm/...)
+# which IS created by pnpm fetch. The original hoisted linker is restored
+# before the install step so the final node_modules layout stays flat.
+RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \
+    pnpm config set store-dir /pnpm/store && \
+    sed -i 's/nodeLinker: hoisted/nodeLinker: isolated/' pnpm-workspace.yaml && \
+    pnpm fetch && \
+    sed -i 's/nodeLinker: isolated/nodeLinker: hoisted/' pnpm-workspace.yaml
+
 COPY . .
+# Follow the pnpm fetch pattern from https://pnpm.io/cli/fetch
+# --frozen-lockfile is omitted as recommended by the pnpm fetch docs
+RUN --mount=type=cache,id=pnpm-store,target=/pnpm/store \
+    pnpm install --recursive
 
-RUN corepack enable pnpm && pnpm install --recursive --frozen-lockfile
-
-# Copy static data as it is not part of the build
-COPY static-data ./static-data
 ARG SKIP_ENV_VALIDATION='true'
 ARG CI='true'
 ARG DISABLE_REDIS_LOGS='true'
+ARG TARGETPLATFORM
 
-RUN corepack enable pnpm && pnpm build
+RUN --mount=type=secret,id=TURBO_API,env=TURBO_API \
+    --mount=type=secret,id=TURBO_TEAM,env=TURBO_TEAM \
+    --mount=type=secret,id=TURBO_TOKEN,env=TURBO_TOKEN \
+    --mount=type=secret,id=TURBO_REMOTE_CACHE_SIGNATURE_KEY,env=TURBO_REMOTE_CACHE_SIGNATURE_KEY \
+    TURBO_PLATFORM="${TARGETPLATFORM:-linux/amd64}" pnpm build
 
 FROM base AS runner
 WORKDIR /app

apps/docs/docs/community/faq.mdx

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

apps/docs/docs/management/mcp.mdx

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

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

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

apps/docs/package.json

@@ -43,7 +43,7 @@
     "random-word-slugs": "^0.1.7",
     "react": "catalog:",
     "react-dom": "catalog:",
-    "swiper": "^14.0.2",
+    "swiper": "^14.0.5",
     "tailwindcss": "^4.3.2"
   },
   "devDependencies": {

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

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

apps/nextjs/package.json

@@ -14,6 +14,12 @@
     "with-env": "dotenv -e ../../.env --"
   },
   "dependencies": {
+    "@codemirror/autocomplete": "catalog:",
+    "@codemirror/commands": "catalog:",
+    "@codemirror/lang-javascript": "catalog:",
+    "@codemirror/lang-json": "catalog:",
+    "@codemirror/lint": "catalog:",
+    "@codemirror/view": "catalog:",
     "@dnd-kit/core": "catalog:",
     "@dnd-kit/modifiers": "catalog:",
     "@dnd-kit/sortable": "catalog:",
@@ -26,6 +32,7 @@
     "@homarr/common": "workspace:^0.1.0",
     "@homarr/core": "workspace:^0.1.0",
     "@homarr/cron-job-status": "workspace:^0.1.0",
+    "@homarr/custom-widgets": "workspace:^0.1.0",
     "@homarr/db": "workspace:^0.1.0",
     "@homarr/definitions": "workspace:^0.1.0",
     "@homarr/docker": "workspace:^0.1.0",
@@ -68,6 +75,7 @@
     "@trpc/next": "catalog:",
     "@trpc/react-query": "catalog:",
     "@trpc/server": "catalog:",
+    "@uiw/react-codemirror": "catalog:",
     "@xterm/addon-canvas": "catalog:",
     "@xterm/addon-fit": "catalog:",
     "@xterm/xterm": "catalog:",

apps/nextjs/src/app/[locale]/_client-providers/trpc.tsx

@@ -2,6 +2,7 @@
 
 import type { PropsWithChildren } from "react";
 import { useState } from "react";
+import type { QueryKey } from "@tanstack/react-query";
 import { QueryClient } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { ReactQueryStreamedHydration } from "@tanstack/react-query-next-experimental";
@@ -33,6 +34,7 @@ import {
 import { createHeadersCallbackForSource, getTrpcUrl } from "@homarr/api/shared";
 import { env } from "@homarr/common/env";
 import { showWarningNotification } from "@homarr/notifications";
+import { widgetImports } from "@homarr/widgets";
 
 import { createWidgetQueryPersister } from "./query-cache-persister";
 
@@ -90,6 +92,13 @@ export function TRPCReactProvider(props: PropsWithChildren) {
       },
     });
     client.setQueryDefaults([["widget"]], { refetchInterval: queryCacheDefaultRefetchIntervalMs });
+    for (const { definition } of Object.values(widgetImports)) {
+      const def = definition as { refetchInterval?: number | null; queryKey?: QueryKey; kind: string };
+      if (def.refetchInterval === undefined) continue;
+      const key = def.queryKey ?? [["widget", def.kind]];
+      const interval = def.refetchInterval === null ? false : def.refetchInterval * 1000;
+      client.setQueryDefaults(key, { refetchInterval: interval });
+    }
     return client;
   });
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

apps/nextjs/src/components/board/items/item-select-modal.tsx

@@ -165,7 +165,7 @@ export const ItemSelectModal = createModal<void>(({ actions }) => {
                   </Text>
                 </Group>
                 <Text lh={1.2} style={{ whiteSpace: "normal" }} size="xs" c="dimmed" lineClamp={1}>
-                  {def.description ?? def.url}
+                  {def.description ?? ""}
                 </Text>
               </Stack>
               <Box

apps/nextjs/src/components/board/items/widget-context-menu.tsx

@@ -1,9 +1,17 @@
 "use client";
 
 import type { MutableRefObject, ReactNode } from "react";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { Group, Loader, Menu, Switch, Text } from "@mantine/core";
-import { IconCopy, IconLayoutKanban, IconRefresh, IconSettings, IconTrash } from "@tabler/icons-react";
+import { useCallback, useMemo } from "react";
+import { Group, Loader, Menu, Switch, Text, Tooltip } from "@mantine/core";
+import {
+  IconAlertTriangle,
+  IconCircleCheck,
+  IconCopy,
+  IconLayoutKanban,
+  IconRefresh,
+  IconSettings,
+  IconTrash,
+} from "@tabler/icons-react";
 import type { QueryClient, QueryKey } from "@tanstack/react-query";
 import { useIsFetching, useQueryClient } from "@tanstack/react-query";
 
@@ -11,10 +19,12 @@ import { clientApi } from "@homarr/api/client";
 import { useSession } from "@homarr/auth/client";
 import { useRequiredBoard } from "@homarr/boards/context";
 import { useEditMode } from "@homarr/boards/edit-mode";
+import { useTimeAgo } from "@homarr/common";
 import { useConfirmModal, useModalAction } from "@homarr/modals";
 import { useSettings } from "@homarr/settings";
 import { translateIfNecessary } from "@homarr/translation";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
+import type { TranslationFunction } from "@homarr/translation";
 import type { WidgetContextMenuAction } from "@homarr/widgets";
 import { reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
 import { WidgetEditModal } from "@homarr/widgets/modals";
@@ -232,11 +242,14 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
             onClick={handleRefetch}
             disabled={isWidgetFetching}
           >
-            <Group justify="space-between" wrap="nowrap">
+            <Group justify="space-between" wrap="nowrap" gap="sm">
               {tMenu("refresh")}
-              <Text size="xs" c="dimmed">
-                <WidgetCacheAge queryClient={queryClient} queryKey={widgetQueryKey} isFetching={isWidgetFetching} />
-              </Text>
+              <WidgetQueryStatus
+                queryClient={queryClient}
+                queryKey={widgetQueryKey}
+                isFetching={isWidgetFetching}
+                t={t}
+              />
             </Group>
           </Menu.Item>
           <Menu.Item
@@ -273,34 +286,65 @@ export const WidgetContextMenu = ({ item, widgetStateRef, children }: WidgetCont
   );
 };
 
-const WidgetCacheAge = ({
-  queryClient,
-  queryKey,
-  isFetching,
-}: {
+interface WidgetQueryStatusProps {
   queryClient: QueryClient;
   queryKey: QueryKey;
   isFetching: boolean;
-}) => {
-  // 1s tick for "just now" → "1s ago" label transition; isFetching prop handles refetch reactivity
-  const [, setTick] = useState(0);
-  useEffect(() => {
-    const id = setInterval(() => setTick((n) => n + 1), 1000);
-    return () => clearInterval(id);
-  }, []);
+  t: TranslationFunction;
+}
 
-  if (isFetching) return <Loader size={12} />;
+const WidgetQueryStatus = ({ queryClient, queryKey, isFetching, t }: WidgetQueryStatusProps) => {
+  const queries = queryClient.getQueryCache().findAll({ queryKey });
+  const timestamps = queries.map((query) => query.state.dataUpdatedAt).filter(Boolean);
+  const latest = timestamps.length > 0 ? Math.max(...timestamps) : 0;
+  const ageLabel = useTimeAgo(new Date(latest));
 
-  const timestamps = queryClient
-    .getQueryCache()
-    .findAll({ queryKey })
-    .map((q) => q.state.dataUpdatedAt)
-    .filter(Boolean);
-  if (timestamps.length === 0) return null;
+  if (isFetching) {
+    return (
+      <Group gap={4} wrap="nowrap">
+        <Loader size={12} />
+        <Text size="xs" c="dimmed">
+          {t("item.menu.status.loading")}
+        </Text>
+      </Group>
+    );
+  }
 
-  const latest = Math.max(...timestamps);
-  const seconds = Math.floor((Date.now() - latest) / 1000);
-  if (seconds < 5) return "just now";
-  if (seconds < 60) return `${seconds}s ago`;
-  return `${Math.floor(seconds / 60)}m ago`;
+  if (queries.length === 0) {
+    return (
+      <Text size="xs" c="dimmed">
+        {t("item.menu.status.idle")}
+      </Text>
+    );
+  }
+
+  const hasError = queries.some((q) => q.state.status === "error");
+
+  if (hasError) {
+    const errorQuery = queries.find((q) => q.state.status === "error");
+    const errorMessage =
+      errorQuery?.state.error instanceof Error
+        ? errorQuery.state.error.message
+        : String(errorQuery?.state.error ?? "Unknown error");
+
+    return (
+      <Tooltip label={errorMessage} multiline position="left" w={250}>
+        <Group gap={4} wrap="nowrap">
+          <IconAlertTriangle size={12} color="var(--mantine-color-red-6)" />
+          <Text size="xs" c="red.6">
+            {t("item.menu.status.error")} · {ageLabel}
+          </Text>
+        </Group>
+      </Tooltip>
+    );
+  }
+
+  return (
+    <Group gap={4} wrap="nowrap">
+      <IconCircleCheck size={12} color="var(--mantine-color-green-6)" />
+      <Text size="xs" c="dimmed">
+        {t("item.menu.status.success")} · {ageLabel}
+      </Text>
+    </Group>
+  );
 };

deployments/prebuilt-debian/package.json

@@ -6,7 +6,7 @@
   },
   "engines": {
     "node": ">=24.18.0",
-    "pnpm": ">=11.10.0"
+    "pnpm": ">=11.11.0"
   },
-  "packageManager": "pnpm@11.10.0"
+  "packageManager": "pnpm@11.11.0"
 }

e2e/custom-widgets-custom-jsx.spec.ts

@@ -3,7 +3,7 @@ import { describe, test } from "vitest";
 
 import { createHomarrContainer } from "./shared/create-homarr-container";
 import { createSqliteDbFileAsync } from "./shared/e2e-db";
-import { startMockApiServerAsync } from "./shared/mock-api-server";
+import { startMockApiContainerAsync } from "./shared/mock-api-container";
 import { seedAdminUserAsync } from "./shared/seed-admin-user";
 
 const adminCredentials = {
@@ -18,7 +18,7 @@ const updatedTemplate = '<Stack gap="xs"><Text>{data.title}</Text><Badge color="
 
 describe("Custom JSX custom widgets", () => {
   test("creates, previews, and edits a customJsx widget", async () => {
-    const mockApi = await startMockApiServerAsync({
+    const mockApi = await startMockApiContainerAsync({
       title: "E2E Widget",
       status: "online",
       value: 42,
@@ -52,12 +52,13 @@ describe("Custom JSX custom widgets", () => {
       await page.waitForURL("**/manage/custom-widgets/new", { timeout: 15_000 });
       await page.getByRole("textbox", { name: "Name" }).fill("E2E Custom JSX");
       await page.getByRole("textbox", { name: "URL", exact: true }).fill(`${mockApi.url}/status`);
-      await page.getByRole("combobox", { name: "Display Type" }).click();
-      await page.getByRole("option", { name: "Custom JSX" }).click();
+      await page.getByRole("button", { name: /Custom JSX/u }).click();
+      await page.getByRole("combobox", { name: "Network scope" }).click();
+      await page.getByRole("option", { name: "Private networks" }).click();
       await page.getByLabel("JSX Template").fill(initialTemplate);
 
-      await page.getByRole("button", { name: "Test" }).first().click();
-      const previewPanel = page.locator(".mantine-Card-root").filter({ hasText: "Preview" });
+      const previewPanel = page.getByRole("complementary", { name: "Preview" });
+      await previewPanel.getByRole("button", { name: "Test" }).click();
       await expect(previewPanel.getByRole("heading", { name: "E2E Widget" }).first()).toBeVisible({
         timeout: 15_000,
       });
@@ -65,18 +66,18 @@ describe("Custom JSX custom widgets", () => {
       await page.getByRole("button", { name: "Create" }).first().click();
       await expect(page.getByText('Widget "E2E Custom JSX" created successfully.')).toBeVisible({ timeout: 15_000 });
       await page.waitForURL("**/manage/custom-widgets/edit/**", { timeout: 15_000 });
-      await expect(page.getByLabel("JSX Template")).toHaveValue(initialTemplate);
+      await expect(page.getByLabel("JSX Template")).toHaveText(initialTemplate);
 
       await page.getByLabel("JSX Template").fill(updatedTemplate);
-      await expect(page.getByLabel("JSX Template")).toHaveValue(updatedTemplate);
+      await expect(page.getByLabel("JSX Template")).toHaveText(updatedTemplate);
 
       await page.getByRole("button", { name: "Save" }).first().click();
       await expect(page.getByText('Widget "E2E Custom JSX" updated successfully.')).toBeVisible({ timeout: 15_000 });
-      await expect(page.getByLabel("JSX Template")).toHaveValue(updatedTemplate);
+      await expect(page.getByLabel("JSX Template")).toHaveText(updatedTemplate);
     } finally {
       await browser.close();
       await homarrContainer.stop();
-      await mockApi.close();
+      await mockApi.stop();
     }
   }, 120_000);
 });

e2e/shared/mock-api-container.ts

@@ -0,0 +1,27 @@
+import { GenericContainer, Wait } from "testcontainers";
+
+import type { StartedTestContainer } from "testcontainers";
+
+export interface MockApiContainer {
+  url: string;
+  stop: () => Promise<void>;
+}
+
+export async function startMockApiContainerAsync(responseBody: unknown): Promise<MockApiContainer> {
+  const body = JSON.stringify(responseBody);
+  const script = [
+    'const { createServer } = require("node:http");',
+    `const body = ${JSON.stringify(body)};`,
+    'createServer((_request, response) => { response.writeHead(200, { "content-type": "application/json" }); response.end(body); }).listen(8080, "0.0.0.0");',
+  ].join("\n");
+  const container: StartedTestContainer = await new GenericContainer("node:24-alpine")
+    .withCommand(["node", "-e", script])
+    .withExposedPorts(8080)
+    .withWaitStrategy(Wait.forHttp("/status", 8080))
+    .start();
+
+  return {
+    url: `http://${container.getIpAddress("bridge")}:8080`,
+    stop: async () => void (await container.stop()),
+  };
+}

e2e/shared/mock-api-server.ts

@@ -1,35 +0,0 @@
-import { createServer } from "node:http";
-
-import type { Server } from "node:http";
-
-export interface MockApiServer {
-  url: string;
-  port: number;
-  close: () => Promise<void>;
-}
-
-export const startMockApiServerAsync = async (responseBody: unknown): Promise<MockApiServer> => {
-  const body = JSON.stringify(responseBody);
-
-  const server: Server = await new Promise((resolve) => {
-    const s = createServer((_req, res) => {
-      res.writeHead(200, { "Content-Type": "application/json" });
-      res.end(body);
-    });
-    s.listen(0, "0.0.0.0", () => resolve(s));
-  });
-
-  const address = server.address();
-  if (!address || typeof address === "string") {
-    throw new Error("Failed to start mock API server");
-  }
-
-  return {
-    port: address.port,
-    url: `http://host.docker.internal:${address.port}`,
-    close: () =>
-      new Promise((resolve, reject) => {
-        server.close((error) => (error ? reject(error) : resolve()));
-      }),
-  };
-};

package.json

@@ -6,6 +6,12 @@
     "build": "cross-env CI=true turbo build",
     "clean": "git clean -xdf node_modules",
     "clean:workspaces": "turbo clean",
+    "check:custom-widgets": "pnpm --filter @homarr/custom-widgets check:architecture",
+    "check:custom-widget-bundle": "node ./scripts/check-custom-widget-bundle.mjs",
+    "ci:act:all": "bash scripts/ci/act.sh all",
+    "ci:act:cleanup": "bash scripts/ci/act.sh cleanup",
+    "ci:act:docker": "bash scripts/ci/act.sh docker",
+    "ci:act:fast": "bash scripts/ci/act.sh fast",
     "cli": "pnpm with-env tsx packages/cli/index.ts",
     "db:migration:mysql:generate": "pnpm -F db migration:mysql:generate",
     "db:migration:mysql:run": "pnpm -F db migration:mysql:run",
@@ -27,12 +33,15 @@
     "scripts:update-bug-report-template": "tsx ./scripts/update-bug-report-template.mts",
     "scripts:update-readme-integrations": "tsx ./scripts/update-integration-list.mts",
     "start": "concurrently \"pnpm with-env node apps/tasks/tasks.cjs\" \"pnpm with-env node apps/websocket/wssServer.cjs\" \"pnpm -F nextjs start\"",
-    "test": "cross-env NODE_ENV=development CI=true vitest run --exclude e2e --coverage.enabled ",
-    "test:e2e": "cross-env NODE_ENV=development CI=true vitest e2e",
+    "test": "cross-env NODE_ENV=development CI=true vitest run --project api-node --project dom --coverage.enabled",
+    "test:e2e": "cross-env NODE_ENV=development CI=true vitest run --project e2e",
     "test:ui": "cross-env NODE_ENV=development CI=true vitest --exclude e2e --ui --coverage.enabled",
     "typecheck": "turbo typecheck",
     "with-env": "dotenv -e .env --"
   },
+  "dependencies": {
+    "jsonpath-plus": "catalog:"
+  },
   "devDependencies": {
     "@playwright/test": "catalog:",
     "@semantic-release/changelog": "catalog:",
@@ -62,10 +71,7 @@
   },
   "engines": {
     "node": ">=24.18.0",
-    "pnpm": ">=11.10.0"
+    "pnpm": ">=11.11.0"
   },
-  "packageManager": "pnpm@11.10.0",
-  "dependencies": {
-    "jsonpath-plus": "catalog:"
-  }
+  "packageManager": "pnpm@11.11.0"
 }

packages/api/package.json

@@ -14,7 +14,6 @@
     "./websocket": "./src/websocket.ts",
     "./shared": "./src/shared.ts",
     "./open-api": "./src/open-api.ts",
-    "./custom-widget/display-data": "./src/router/custom-widget/display-data.ts",
     "./mcp": "./src/mcp.ts"
   },
   "scripts": {
@@ -30,6 +29,7 @@
     "@homarr/core": "workspace:^0.1.0",
     "@homarr/cron-job-status": "workspace:^0.1.0",
     "@homarr/cron-jobs": "workspace:^0.1.0",
+    "@homarr/custom-widgets": "workspace:^0.1.0",
     "@homarr/db": "workspace:^0.1.0",
     "@homarr/definitions": "workspace:^0.1.0",
     "@homarr/docker": "workspace:^0.1.0",
@@ -49,7 +49,6 @@
     "@trpc/react-query": "catalog:",
     "@trpc/server": "catalog:",
     "@trpc/tanstack-react-query": "catalog:",
-    "jsonpath-plus": "catalog:",
     "lodash.clonedeep": "catalog:",
     "next": "catalog:",
     "react": "catalog:",
@@ -57,6 +56,7 @@
     "superjson": "catalog:",
     "trpc-to-mcp": "catalog:",
     "trpc-to-openapi": "catalog:",
+    "undici": "catalog:",
     "zod": "catalog:"
   },
   "devDependencies": {

packages/api/src/mcp.ts

@@ -13,6 +13,7 @@ import { bazarrRouter } from "./router/widgets/bazarr";
 import { serverSettingsRouter } from "./router/serverSettings";
 import { beszelRouter } from "./router/widgets/beszel";
 import { calendarRouter } from "./router/widgets/calendar";
+import { customWidgetRouter } from "./router/custom-widget/custom-widget-router";
 import { dnsHoleRouter } from "./router/widgets/dns-hole";
 import { downloadsRouter } from "./router/widgets/downloads";
 import { healthMonitoringRouter } from "./router/widgets/health-monitoring";
@@ -35,6 +36,7 @@ export const mcpRouter = createTRPCRouter({
   serverSettings: serverSettingsRouter,
   beszel: beszelRouter,
   calendar: calendarRouter,
+  customWidget: customWidgetRouter,
   dnsHole: dnsHoleRouter,
   downloads: downloadsRouter,
   healthMonitoring: healthMonitoringRouter,

packages/api/src/router/custom-widget/auth.ts

@@ -1,15 +1,19 @@
-export const AUTH_HANDLERS: Record<string, (headers: Headers, url: URL, apiKey: string, headerName?: string) => void> =
-  {
-    bearer: (headers, _url, apiKey) => {
-      headers.set("Authorization", `Bearer ${apiKey}`);
-    },
-    apiKeyHeader: (headers, _url, apiKey, headerName) => {
-      headers.set(headerName ?? "X-API-Key", apiKey);
-    },
-    apiKeyQuery: (_headers, url, apiKey, headerName) => {
-      url.searchParams.set(headerName ?? "api_key", apiKey);
-    },
-  };
+type HeaderSetter = Pick<Headers, "set">;
+
+export const AUTH_HANDLERS: Record<
+  string,
+  (headers: HeaderSetter, url: URL, apiKey: string, headerName?: string) => void
+> = {
+  bearer: (headers, _url, apiKey) => {
+    headers.set("Authorization", `Bearer ${apiKey}`);
+  },
+  apiKeyHeader: (headers, _url, apiKey, headerName) => {
+    headers.set(headerName ?? "X-API-Key", apiKey);
+  },
+  apiKeyQuery: (_headers, url, apiKey, headerName) => {
+    url.searchParams.set(headerName ?? "api_key", apiKey);
+  },
+};
 
 export function buildSecretMap(secrets: Array<{ kind: string; value: string }>): Record<string, string> {
   const map: Record<string, string> = {};
@@ -20,7 +24,7 @@ export function buildSecretMap(secrets: Array<{ kind: string; value: string }>):
 }
 
 export function applyAuth(
-  headers: Headers,
+  headers: HeaderSetter,
   url: URL,
   authType: string,
   secrets: Array<{ kind: string; value: string }>,

packages/api/src/router/custom-widget/custom-widget-router.ts

@@ -1,183 +1,150 @@
 import { TRPCError } from "@trpc/server";
-import superjson from "superjson";
+import { stringify as stringifySuperJson } from "superjson";
 import { z } from "zod/v4";
 
 import { createId } from "@homarr/common";
-import { decryptSecret, encryptSecret } from "@homarr/common/server";
+import { encryptSecret } from "@homarr/common/server";
 import { customWidgetDefinitions, customWidgetSecrets } from "@homarr/db/schema";
 import { eq } from "@homarr/db";
 import { createLogger } from "@homarr/core/infrastructure/logs";
 import {
-  customWidgetAuthTypes,
   customWidgetCreateSchema,
-  customWidgetDisplayTypes,
-  customWidgetImportSchema,
-  customWidgetMethods,
-  customWidgetSecretKinds,
   customWidgetUpdateSchema,
-  displayConfigSchema,
-} from "@homarr/validation/custom-widget";
+  customJsxDisplayConfigV2Schema,
+} from "@homarr/custom-widgets/core";
 
-import { createTRPCRouter, permissionRequiredProcedure, protectedProcedure, publicProcedure } from "../../trpc";
-import { applyAuth } from "./auth";
-import { extractDisplayDataWithFallback } from "./display-data";
+import { createTRPCRouter, permissionRequiredProcedure } from "../../trpc";
+import { managementQueryProcedures } from "./management-queries";
+import { metadataProcedures } from "./metadata-procedures";
+import { previewActionProcedures } from "./preview-action-procedures";
+import { previewBaseProcedures } from "./preview-base-procedures";
+import { previewQueryProcedures } from "./preview-query-procedures";
 import { parseDisplayConfig } from "./parse-display-config";
+import { transferProcedures } from "./transfer-procedures";
+import { templateProcedures } from "./template-procedures";
 
 const adminProcedure = permissionRequiredProcedure.requiresPermission("admin");
 
 const logger = createLogger({ module: "custom-widget" });
 
-const FETCH_TIMEOUT_MS = 10_000;
-
-const validateUrl = (urlString: string): URL => new URL(urlString);
-
 const updateFieldSerializers: Record<string, (value: unknown) => unknown> = {
-  displayConfig: (value) => superjson.stringify(value),
+  displayConfig: (value) => stringifySuperJson(value),
 };
 
-let _importJsonSchema: Record<string, unknown> | null = null;
-function getImportJsonSchema() {
-  if (!_importJsonSchema) {
-    _importJsonSchema = {
-      ...z.toJSONSchema(customWidgetImportSchema),
-      title: "Homarr Custom Widget",
-      description:
-        "Schema for importing/exporting custom widget definitions in Homarr. " +
-        "All jsonPath fields use JSONPath syntax (e.g. $.data.count, $.items[0].name). " +
-        "The displayConfig must match the chosen displayType. " +
-        "Secrets (API keys, passwords) are not included in exports and must be configured separately after import.",
-    };
-  }
-  return _importJsonSchema;
-}
-
 export const customWidgetRouter = createTRPCRouter({
-  schema: publicProcedure.query(() => getImportJsonSchema()),
+  ...metadataProcedures,
 
-  all: protectedProcedure.query(async ({ ctx }) => {
-    const definitions = await ctx.db.query.customWidgetDefinitions.findMany({
-      orderBy: (table, { asc }) => asc(table.name),
-    });
+  ...managementQueryProcedures,
 
-    return definitions.map((def) => ({
-      id: def.id,
-      name: def.name,
-      description: def.description,
-      iconUrl: def.iconUrl,
-      url: def.url,
-      method: def.method,
-      displayType: def.displayType,
-      authType: def.authType,
-      enabled: def.enabled,
-    }));
-  }),
+  create: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Create a validated custom widget. Admin only. Call customWidget_schema and customWidget_validate first. For Custom JSX use jsxApiVersion 2, named requests, a GET base method, and no inline credentials.",
+      },
+    })
+    .input(customWidgetCreateSchema)
+    .mutation(async ({ ctx, input }) => {
+      const id = createId();
 
-  byId: protectedProcedure.input(z.object({ id: z.string() })).query(async ({ ctx, input }) => {
-    const definition = await ctx.db.query.customWidgetDefinitions.findFirst({
-      where: eq(customWidgetDefinitions.id, input.id),
-      with: { secrets: true },
-    });
+      await ctx.db.insert(customWidgetDefinitions).values({
+        id,
+        name: input.name,
+        description: input.description,
+        iconUrl: input.iconUrl,
+        url: input.url,
+        authType: input.authType,
+        headerName: input.headerName,
+        method: input.method,
+        requestBody: input.requestBody,
+        displayType: input.displayType,
+        displayConfig: stringifySuperJson(input.displayConfig),
+        creatorId: ctx.session.user.id,
+      });
 
-    if (!definition) {
-      throw new TRPCError({ code: "NOT_FOUND", message: "Custom widget definition not found" });
-    }
-
-    const displayConfig = parseDisplayConfig(
-      definition.displayConfig,
-      input.id,
-      logger,
-      "Corrupt displayConfig in custom widget",
-    );
-
-    return {
-      ...definition,
-      enabled: definition.enabled,
-      displayConfig,
-      secrets: definition.secrets.map((s) => ({
-        kind: s.kind,
-        hasValue: true,
-        updatedAt: s.updatedAt,
-      })),
-    };
-  }),
-
-  create: adminProcedure.input(customWidgetCreateSchema).mutation(async ({ ctx, input }) => {
-    const id = createId();
-
-    await ctx.db.insert(customWidgetDefinitions).values({
-      id,
-      name: input.name,
-      description: input.description,
-      iconUrl: input.iconUrl,
-      url: input.url,
-      authType: input.authType,
-      headerName: input.headerName,
-      method: input.method,
-      requestBody: input.requestBody,
-      displayType: input.displayType,
-      displayConfig: superjson.stringify(input.displayConfig),
-      creatorId: ctx.session.user.id,
-    });
-
-    if (input.secrets.length > 0) {
-      await ctx.db.insert(customWidgetSecrets).values(
-        input.secrets.map((secret) => ({
-          kind: secret.kind,
-          value: encryptSecret(secret.value),
-          definitionId: id,
-          updatedAt: new Date(),
-        })),
-      );
-    }
-
-    logger.info("Created custom widget definition", { id, name: input.name });
-    return { id };
-  }),
-
-  update: adminProcedure.input(customWidgetUpdateSchema).mutation(async ({ ctx, input }) => {
-    const existing = await ctx.db.query.customWidgetDefinitions.findFirst({
-      where: eq(customWidgetDefinitions.id, input.id),
-    });
-
-    if (!existing) {
-      throw new TRPCError({ code: "NOT_FOUND" });
-    }
-
-    const { id, secrets, ...updateFields } = input;
-    const updateValues: Record<string, unknown> = { updatedAt: new Date() };
-
-    for (const [key, value] of Object.entries(updateFields)) {
-      if (value === undefined) continue;
-      const serialize = updateFieldSerializers[key];
-      if (serialize) {
-        updateValues[key] = serialize(value);
-      } else {
-        updateValues[key] = value;
-      }
-    }
-
-    await ctx.db.update(customWidgetDefinitions).set(updateValues).where(eq(customWidgetDefinitions.id, id));
-
-    if (secrets !== undefined) {
-      const effectiveAuthType = (updateFields.authType as string | undefined) ?? existing.authType;
-
-      if (secrets.length > 0) {
-        await ctx.db.delete(customWidgetSecrets).where(eq(customWidgetSecrets.definitionId, id));
+      if (input.secrets.length > 0) {
         await ctx.db.insert(customWidgetSecrets).values(
-          secrets.map((secret) => ({
+          input.secrets.map((secret) => ({
             kind: secret.kind,
             value: encryptSecret(secret.value),
             definitionId: id,
             updatedAt: new Date(),
           })),
         );
-      } else if (effectiveAuthType === "none") {
-        await ctx.db.delete(customWidgetSecrets).where(eq(customWidgetSecrets.definitionId, id));
       }
-    }
 
-    logger.info("Updated custom widget definition", { id });
-  }),
+      logger.info("Created custom widget definition", { id, name: input.name });
+      return { id };
+    }),
+
+  update: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Update an existing custom widget. Admin only. REQUIRED: id. Read it with customWidget_byId, preserve unrelated fields, validate the resulting complete draft, then send the changed fields. Omit secrets to preserve stored credentials.",
+      },
+    })
+    .input(customWidgetUpdateSchema)
+    .mutation(async ({ ctx, input }) => {
+      const existing = await ctx.db.query.customWidgetDefinitions.findFirst({
+        where: eq(customWidgetDefinitions.id, input.id),
+      });
+
+      if (!existing) {
+        throw new TRPCError({ code: "NOT_FOUND" });
+      }
+
+      const effectiveDisplayConfig =
+        input.displayConfig ??
+        parseDisplayConfig(existing.displayConfig, input.id, logger, "Corrupt displayConfig in custom widget update");
+      const effectiveMethod = input.method ?? existing.method;
+      if (customJsxDisplayConfigV2Schema.safeParse(effectiveDisplayConfig).success && effectiveMethod !== "GET") {
+        throw new TRPCError({
+          code: "BAD_REQUEST",
+          message: "Custom JSX v2 base data requests must use GET; mutations belong in named actions",
+        });
+      }
+
+      const { id, secrets, ...updateFields } = input;
+      const updateValues: Record<string, unknown> = { updatedAt: new Date() };
+
+      for (const [key, value] of Object.entries(updateFields)) {
+        if (value === undefined) continue;
+        const serialize = updateFieldSerializers[key];
+        if (serialize) {
+          updateValues[key] = serialize(value);
+        } else {
+          updateValues[key] = value;
+        }
+      }
+
+      await ctx.db.update(customWidgetDefinitions).set(updateValues).where(eq(customWidgetDefinitions.id, id));
+
+      if (secrets !== undefined) {
+        const effectiveAuthType = (updateFields.authType as string | undefined) ?? existing.authType;
+
+        if (secrets.length > 0) {
+          await ctx.db.delete(customWidgetSecrets).where(eq(customWidgetSecrets.definitionId, id));
+          await ctx.db.insert(customWidgetSecrets).values(
+            secrets.map((secret) => ({
+              kind: secret.kind,
+              value: encryptSecret(secret.value),
+              definitionId: id,
+              updatedAt: new Date(),
+            })),
+          );
+        } else if (
+          effectiveAuthType === "none" ||
+          (typeof updateFields.authType === "string" && updateFields.authType !== existing.authType)
+        ) {
+          await ctx.db.delete(customWidgetSecrets).where(eq(customWidgetSecrets.definitionId, id));
+        }
+      }
+
+      logger.info("Updated custom widget definition", { id });
+    }),
 
   toggleEnabled: adminProcedure
     .input(z.object({ id: z.string(), enabled: z.boolean() }))
@@ -209,143 +176,13 @@ export const customWidgetRouter = createTRPCRouter({
     logger.info("Deleted custom widget definition", { id: input.id });
   }),
 
-  export: adminProcedure.input(z.object({ id: z.string() })).query(async ({ ctx, input }) => {
-    const definition = await ctx.db.query.customWidgetDefinitions.findFirst({
-      where: eq(customWidgetDefinitions.id, input.id),
-    });
+  ...templateProcedures,
 
-    if (!definition) {
-      throw new TRPCError({ code: "NOT_FOUND" });
-    }
+  ...transferProcedures,
 
-    return {
-      $schema: "homarr-custom-widget-v2" as const,
-      name: definition.name,
-      description: definition.description,
-      iconUrl: definition.iconUrl,
-      url: definition.url,
-      authType: definition.authType,
-      headerName: definition.headerName,
-      method: definition.method,
-      requestBody: definition.requestBody,
-      displayType: definition.displayType,
-      displayConfig: parseDisplayConfig(
-        definition.displayConfig,
-        input.id,
-        logger,
-        "Corrupt displayConfig during export",
-      ),
-    };
-  }),
-
-  import: adminProcedure.input(customWidgetImportSchema).mutation(async ({ ctx, input }) => {
-    const id = createId();
-
-    await ctx.db.insert(customWidgetDefinitions).values({
-      id,
-      name: input.name,
-      description: input.description,
-      iconUrl: input.iconUrl,
-      url: input.url,
-      authType: input.authType,
-      headerName: input.headerName,
-      method: input.method,
-      requestBody: input.requestBody,
-      displayType: input.displayType,
-      displayConfig: superjson.stringify(input.displayConfig),
-      creatorId: ctx.session.user.id,
-    });
-
-    logger.info("Imported custom widget definition", { id, name: input.name });
-    return { id };
-  }),
-
-  preview: adminProcedure
-    .input(
-      z.object({
-        url: z.string().url(),
-        method: z.enum(customWidgetMethods),
-        authType: z.enum(customWidgetAuthTypes),
-        headerName: z.string().optional(),
-        requestBody: z.string().optional(),
-        displayType: z.enum(customWidgetDisplayTypes),
-        displayConfig: displayConfigSchema,
-        secrets: z.array(z.object({ kind: z.enum(customWidgetSecretKinds), value: z.string() })),
-        definitionId: z.string().optional(),
-      }),
-    )
-    .mutation(async ({ ctx, input }) => {
-      const secrets = [...input.secrets];
-
-      if (input.definitionId) {
-        const existing = await ctx.db.query.customWidgetDefinitions.findFirst({
-          where: eq(customWidgetDefinitions.id, input.definitionId),
-          with: { secrets: true },
-        });
-        if (existing) {
-          for (const dbSecret of existing.secrets) {
-            if (!secrets.some((s) => s.kind === dbSecret.kind)) {
-              secrets.push({ kind: dbSecret.kind, value: decryptSecret(dbSecret.value) });
-            }
-          }
-        }
-      }
-
-      const url = validateUrl(input.url);
-      const headers = new Headers({ Accept: "application/json" });
-
-      if (input.method !== "GET" && input.requestBody) {
-        headers.set("Content-Type", "application/json");
-      }
-
-      applyAuth(headers, url, input.authType, secrets, input.headerName);
-
-      const controller = new AbortController();
-      const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
-
-      try {
-        const response = await fetch(url.toString(), {
-          method: input.method,
-          headers,
-          body: input.method !== "GET" ? input.requestBody : undefined,
-          redirect: "follow",
-          signal: controller.signal,
-        });
-
-        const responseInfo = { status: response.status, statusText: response.statusText };
-
-        if (!response.ok) {
-          const body = await response.text().catch(() => "");
-          return {
-            success: false as const,
-            error: `HTTP ${response.status}: ${response.statusText}`,
-            responseInfo,
-            rawResponse: body,
-          };
-        }
-
-        const json: unknown = await response.json();
-        const displayData = extractDisplayDataWithFallback(json, input.displayType, input.displayConfig);
-
-        return {
-          success: true as const,
-          responseInfo,
-          rawResponse: JSON.stringify(json, null, 2),
-          displayData,
-        };
-      } catch (error) {
-        if (error instanceof TRPCError) throw error;
-        logger.error("Custom widget preview failed", { error });
-        return {
-          success: false as const,
-          error: error instanceof Error ? error.message : "Failed to fetch data",
-          responseInfo: null,
-          rawResponse: null,
-        };
-      } finally {
-        clearTimeout(timeout);
-      }
-    }),
+  ...previewBaseProcedures,
+  ...previewQueryProcedures,
+  ...previewActionProcedures,
 
   duplicate: adminProcedure.input(z.object({ id: z.string() })).mutation(async ({ ctx, input }) => {
     const definition = await ctx.db.query.customWidgetDefinitions.findFirst({
@@ -388,69 +225,4 @@ export const customWidgetRouter = createTRPCRouter({
     logger.info("Duplicated custom widget definition", { sourceId: input.id, newId });
     return { id: newId, name: `${definition.name} (copy)` };
   }),
-
-  execute: protectedProcedure.input(z.object({ definitionId: z.string() })).mutation(async ({ ctx, input }) => {
-    const definition = await ctx.db.query.customWidgetDefinitions.findFirst({
-      where: eq(customWidgetDefinitions.id, input.definitionId),
-      with: { secrets: true },
-    });
-
-    if (!definition) {
-      throw new TRPCError({ code: "NOT_FOUND", message: "Custom widget definition not found" });
-    }
-
-    if (!definition.enabled) {
-      throw new TRPCError({ code: "FORBIDDEN", message: "Widget is disabled" });
-    }
-
-    if (definition.displayType !== "actionButton") {
-      throw new TRPCError({ code: "BAD_REQUEST", message: "Only actionButton widgets can be executed" });
-    }
-
-    const decryptedSecrets = definition.secrets.map((s) => ({
-      kind: s.kind,
-      value: decryptSecret(s.value),
-    }));
-
-    const url = validateUrl(definition.url);
-    const headers = new Headers({ Accept: "application/json" });
-
-    if (definition.method !== "GET" && definition.requestBody) {
-      headers.set("Content-Type", "application/json");
-    }
-
-    applyAuth(headers, url, definition.authType, decryptedSecrets, definition.headerName);
-
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
-
-    try {
-      const response = await fetch(url.toString(), {
-        method: definition.method,
-        headers,
-        body: definition.method !== "GET" ? definition.requestBody : undefined,
-        redirect: "follow",
-        signal: controller.signal,
-      });
-
-      const responseInfo = { status: response.status, statusText: response.statusText };
-
-      if (!response.ok) {
-        return { success: false as const, error: `HTTP ${response.status}: ${response.statusText}`, responseInfo };
-      }
-
-      logger.info("Executed custom widget action", { definitionId: input.definitionId, status: response.status });
-      return { success: true as const, responseInfo };
-    } catch (error) {
-      if (error instanceof TRPCError) throw error;
-      logger.error("Custom widget execute failed", { definitionId: input.definitionId, error });
-      return {
-        success: false as const,
-        error: error instanceof Error ? error.message : "Request failed",
-        responseInfo: null,
-      };
-    } finally {
-      clearTimeout(timeout);
-    }
-  }),
 });

packages/api/src/router/custom-widget/display-data.ts

@@ -1,145 +0,0 @@
-import { JSONPath } from "jsonpath-plus";
-
-type Config = Record<string, unknown>;
-type Extractor = (json: unknown, config: Config) => unknown;
-
-const query = (json: unknown, path: string) => JSONPath({ path, json: json as object, wrap: false });
-
-const queryRows = (json: unknown, path: string): unknown[] => {
-  const rows = JSONPath({ path, json: json as object, wrap: true }) as unknown[];
-  const first = rows[0];
-  if (Array.isArray(first)) return first as unknown[];
-  return rows;
-};
-
-const toNumber = (value: unknown, fallback: number): number => {
-  const num = Number(value);
-  if (num) return num;
-  return fallback;
-};
-
-const optionalMax = (max: unknown): number | undefined => {
-  if (max === undefined) return undefined;
-  return toNumber(max, 100);
-};
-
-const isGoodValue = (value: unknown, goodValues: string[]): boolean =>
-  goodValues.some((gv) => String(value).toLowerCase() === gv.toLowerCase());
-
-const extractors: Record<string, Extractor> = {
-  singleValue: (json, c) => ({
-    type: "singleValue",
-    label: (c.label as string) ?? "",
-    unit: (c.unit as string) ?? "",
-    value: query(json, (c.jsonPath as string) ?? "$"),
-    valueSize: c.valueSize ?? "lg",
-    labelPosition: c.labelPosition ?? "below",
-  }),
-  keyValue: (json, c) => ({
-    type: "keyValue",
-    entries: ((c.mappings as Array<{ label: string; jsonPath: string; unit: string }>) ?? []).map((m) => ({
-      label: m.label,
-      unit: m.unit,
-      value: query(json, m.jsonPath),
-    })),
-    layout: c.layout ?? "list",
-    columns: c.columns ?? 2,
-  }),
-  table: (json, c) => {
-    const columns = (c.columns as Array<{ header: string; jsonPath: string }>) ?? [];
-    const flatRows = queryRows(json, (c.tablePath as string) ?? "$");
-    return {
-      type: "table",
-      columns: columns.map((col) => col.header),
-      rows: flatRows.map((row) => columns.map((col) => query(row, col.jsonPath))),
-      striped: c.striped ?? true,
-      compact: c.compact ?? false,
-    };
-  },
-  statGrid: (json, c) => ({
-    type: "statGrid",
-    items: ((c.items as Array<{ label: string; jsonPath: string; unit: string; color?: string }>) ?? []).map(
-      (item) => ({
-        label: item.label,
-        unit: item.unit,
-        color: item.color ?? "blue",
-        value: query(json, item.jsonPath),
-      }),
-    ),
-    columns: c.columns ?? 2,
-    cardStyle: c.cardStyle ?? "filled",
-  }),
-  progressBars: (json, c) => ({
-    type: "progressBars",
-    bars: (
-      (c.bars as Array<{ label: string; valuePath: string; maxPath?: string; unit: string; color?: string }>) ?? []
-    ).map((bar) => {
-      const value = query(json, bar.valuePath);
-      const max = bar.maxPath ? query(json, bar.maxPath) : undefined;
-      return {
-        label: bar.label,
-        unit: bar.unit,
-        color: bar.color ?? "blue",
-        value: toNumber(value, 0),
-        max: optionalMax(max),
-      };
-    }),
-    showPercentage: c.showPercentage ?? true,
-    barSize: c.barSize ?? "md",
-  }),
-  statusIndicator: (json, c) => ({
-    type: "statusIndicator",
-    items: ((c.items as Array<{ label: string; jsonPath: string; goodValues: string[] }>) ?? []).map((item) => {
-      const value = query(json, item.jsonPath);
-      return { label: item.label, value: String(value ?? "unknown"), isGood: isGoodValue(value, item.goodValues) };
-    }),
-    layout: c.layout ?? "list",
-    dotSize: c.dotSize ?? "md",
-  }),
-  countGrid: (json, c) => ({
-    type: "countGrid",
-    items: ((c.items as Array<{ label: string; jsonPath: string; unit: string }>) ?? []).map((item) => ({
-      label: item.label,
-      unit: item.unit,
-      value: query(json, item.jsonPath),
-    })),
-    columns: c.columns ?? 2,
-    valueSize: c.valueSize ?? "md",
-  }),
-  raw: (json, c) => ({
-    type: "raw",
-    data: query(json, (c.jsonPath as string) ?? "$"),
-    maxHeight: c.maxHeight ?? 300,
-  }),
-  actionButton: (_json, c) => ({
-    type: "actionButton",
-    buttonLabel: c.buttonLabel ?? "Execute",
-    buttonColor: c.buttonColor ?? "blue",
-    confirmText: c.confirmText ?? "",
-    successMessage: c.successMessage ?? "",
-  }),
-  customJsx: (json, config) => ({
-    type: "customJsx" as const,
-    template: config.template as string,
-    data: json,
-  }),
-};
-
-export function extractDisplayData(json: unknown, displayType: string, displayConfig: Config): unknown {
-  const type = (displayConfig.type as string) ?? displayType;
-  const extractor = extractors[type];
-  if (!extractor) {
-    throw new Error(`Unknown display type: ${type}`);
-  }
-  return extractor(json, displayConfig);
-}
-
-export function extractDisplayDataWithFallback(json: unknown, displayType: string, displayConfig: Config): unknown {
-  const type = (displayConfig.type as string) ?? displayType;
-  const extractor = extractors[type] ?? extractors.singleValue;
-  return extractor?.(json, displayConfig);
-}
-
-export function extractActionButtonDisplay(displayConfig: Config): unknown {
-  return extractors.actionButton?.(null, displayConfig);
-}

packages/api/src/router/custom-widget/domain-error.ts

@@ -0,0 +1,16 @@
+import { TRPCError } from "@trpc/server";
+
+import { FlattenError } from "@homarr/common";
+import { CustomWidgetDomainError } from "@homarr/custom-widgets/server";
+
+class RequestLimitTransportError extends FlattenError {}
+
+export function toTrpcError(error: unknown): never {
+  if (error instanceof CustomWidgetDomainError) {
+    const cause = error.retryAfterMs
+      ? new RequestLimitTransportError(error.message, { retryAfterMs: error.retryAfterMs })
+      : error;
+    throw new TRPCError({ code: error.code, message: error.message, cause });
+  }
+  throw error;
+}

packages/api/src/router/custom-widget/management-queries.ts

@@ -0,0 +1,84 @@
+import { TRPCError } from "@trpc/server";
+import { z } from "zod/v4";
+
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import { eq, or } from "@homarr/db";
+import { boards, customWidgetDefinitions } from "@homarr/db/schema";
+
+import { permissionRequiredProcedure, protectedProcedure } from "../../trpc";
+import { throwIfActionForbiddenAsync } from "../board/board-access";
+import { parseDisplayConfig } from "./parse-display-config";
+
+const adminProcedure = permissionRequiredProcedure.requiresPermission("admin");
+const logger = createLogger({ module: "custom-widget" });
+
+export const managementQueryProcedures = {
+  all: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "List all custom-widget definitions. Admin only. Use the returned ID to inspect or update a widget.",
+      },
+    })
+    .query(async ({ ctx }) => {
+      const definitions = await ctx.db.query.customWidgetDefinitions.findMany({
+        orderBy: (table, { asc }) => asc(table.name),
+      });
+      return definitions.map((definition) => ({
+        id: definition.id,
+        name: definition.name,
+        description: definition.description,
+        iconUrl: definition.iconUrl,
+        url: definition.url,
+        method: definition.method,
+        displayType: definition.displayType,
+        authType: definition.authType,
+        enabled: definition.enabled,
+      }));
+    }),
+
+  byId: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Get one complete custom-widget definition for iterative editing. REQUIRED: id. Stored secret values are never returned; only their presence is reported.",
+      },
+    })
+    .input(z.object({ id: z.string() }))
+    .query(async ({ ctx, input }) => {
+      const definition = await ctx.db.query.customWidgetDefinitions.findFirst({
+        where: eq(customWidgetDefinitions.id, input.id),
+        with: { secrets: true },
+      });
+      if (!definition) throw new TRPCError({ code: "NOT_FOUND", message: "Custom widget definition not found" });
+      return {
+        ...definition,
+        displayConfig: parseDisplayConfig(
+          definition.displayConfig,
+          input.id,
+          logger,
+          "Corrupt displayConfig in custom widget",
+        ),
+        secrets: definition.secrets.map((secret) => ({
+          kind: secret.kind,
+          hasValue: true,
+          updatedAt: secret.updatedAt,
+        })),
+      };
+    }),
+
+  available: protectedProcedure
+    .input(z.object({ boardId: z.string(), currentId: z.string().optional() }))
+    .query(async ({ ctx, input }) => {
+      await throwIfActionForbiddenAsync(ctx, eq(boards.id, input.boardId), "modify");
+      return ctx.db.query.customWidgetDefinitions.findMany({
+        where: input.currentId
+          ? or(eq(customWidgetDefinitions.enabled, true), eq(customWidgetDefinitions.id, input.currentId))
+          : eq(customWidgetDefinitions.enabled, true),
+        orderBy: (table, { asc }) => asc(table.name),
+        columns: { id: true, name: true, description: true, iconUrl: true, displayType: true },
+      });
+    }),
+};

packages/api/src/router/custom-widget/metadata-procedures.ts

@@ -0,0 +1,54 @@
+import { z } from "zod/v4";
+
+import { customWidgetImportSchema } from "@homarr/custom-widgets/core";
+
+import { permissionRequiredProcedure, publicProcedure } from "../../trpc";
+
+const adminProcedure = permissionRequiredProcedure.requiresPermission("admin");
+let schemaCache: Record<string, unknown> | undefined;
+
+function getImportJsonSchema() {
+  schemaCache ??= {
+    ...z.toJSONSchema(customWidgetImportSchema),
+    title: "Homarr Custom Widget",
+    description:
+      "Schema for importing/exporting custom widget definitions in Homarr. All jsonPath fields use JSONPath syntax. The displayConfig must match displayType. Secrets are configured separately after import.",
+  };
+  return schemaCache;
+}
+
+export const metadataProcedures = {
+  schema: publicProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Get the JSON Schema for Homarr custom-widget imports. Use this before generating a widget and before calling validate, create, or update.",
+      },
+    })
+    .query(() => getImportJsonSchema()),
+
+  validate: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Validate a complete custom-widget JSON draft without saving or making network requests. Returns structured issue paths so an agent can correct and validate again.",
+      },
+    })
+    .input(z.object({ widget: z.unknown() }))
+    .query(({ input }) => {
+      const result = customWidgetImportSchema.safeParse(input.widget);
+      if (!result.success) {
+        return {
+          valid: false as const,
+          issues: result.error.issues.map((issue) => ({
+            path: issue.path.map(String).join("."),
+            code: issue.code,
+            message: issue.message,
+          })),
+        };
+      }
+      return { valid: true as const, issues: [], widget: result.data };
+    }),
+};

packages/api/src/router/custom-widget/parse-display-config.ts

@@ -1,13 +1,15 @@
 import { TRPCError } from "@trpc/server";
-import superjson from "superjson";
+import { parse as parseSuperJson } from "superjson";
 
 import type { createLogger } from "@homarr/core/infrastructure/logs";
+import { displayConfigSchema } from "@homarr/custom-widgets/core";
+import type { DisplayConfig } from "@homarr/custom-widgets/core";
 
 type Logger = ReturnType<typeof createLogger>;
 
-export function parseDisplayConfig(raw: string, id: string, logger: Logger, context: string): Record<string, unknown> {
+export function parseDisplayConfig(raw: string, id: string, logger: Logger, context: string): DisplayConfig {
   try {
-    return superjson.parse(raw) as Record<string, unknown>;
+    return displayConfigSchema.parse(parseSuperJson(raw));
   } catch {
     logger.error(context, { id });
     throw new TRPCError({ code: "INTERNAL_SERVER_ERROR", message: "Widget has corrupt display configuration" });

packages/api/src/router/custom-widget/preview-action-procedures.ts

@@ -0,0 +1,119 @@
+import { TRPCError } from "@trpc/server";
+import { z } from "zod/v4";
+
+import { permissionRequiredProcedure } from "../../trpc";
+import { previewSessionRequestSchema, recordPreviewJournal } from "./preview-procedure-helpers";
+import { executeCustomWidgetRequest } from "./request-executor";
+import { renderRequestBody, renderRequestTarget } from "./request-manifest";
+import { acquireCustomWidgetRequestLimit } from "./request-limits";
+import { getPreviewSession, getPreviewSessionSecrets } from "./preview-sessions";
+
+const adminProcedure = permissionRequiredProcedure.requiresPermission("admin");
+
+export const previewActionProcedures = {
+  simulatePreviewAction: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Validate and simulate one named custom-widget action without sending a network request. REQUIRED: sessionId from customWidget_preview, action requestId, and typed params. Confirms parameter substitution and records a simulated journal entry. Returns requiredPermission as the action's minimum board permission (view, modify, or full), not as an execution result. This MCP tool never enables or executes live actions.",
+      },
+    })
+    .input(previewSessionRequestSchema)
+    .mutation(async ({ ctx, input }) => {
+      const session = await getPreviewSession(input.sessionId, ctx.session.user.id);
+      const request = session.requests.find(
+        (candidate) => candidate.id === input.requestId && candidate.kind === "action",
+      );
+      if (!request) throw new TRPCError({ code: "NOT_FOUND", message: "Preview action was not found" });
+      renderRequestTarget(session.baseUrl, request, input.params);
+      renderRequestBody(request.bodyTemplate, input.params);
+      await recordPreviewJournal(session, {
+        requestId: request.id,
+        kind: "action",
+        method: request.method,
+        pathTemplate: request.pathTemplate,
+        status: null,
+        durationMs: 0,
+        simulated: true,
+      });
+      return {
+        ok: true,
+        simulated: true as const,
+        requestId: request.id,
+        method: request.method,
+        requiredPermission: request.minimumBoardPermission,
+      };
+    }),
+  previewAction: adminProcedure
+    .input(previewSessionRequestSchema.extend({ confirmed: z.boolean().optional() }))
+    .mutation(async ({ ctx, input }) => {
+      const session = await getPreviewSession(input.sessionId, ctx.session.user.id);
+      const request = session.requests.find(
+        (candidate) => candidate.id === input.requestId && candidate.kind === "action",
+      );
+      if (!request) throw new TRPCError({ code: "NOT_FOUND", message: "Preview action was not found" });
+      const targetUrl = renderRequestTarget(session.baseUrl, request, input.params);
+      const body = renderRequestBody(request.bodyTemplate, input.params);
+      if (!session.liveActions) {
+        await recordPreviewJournal(session, {
+          requestId: request.id,
+          kind: "action",
+          method: request.method,
+          pathTemplate: request.pathTemplate,
+          status: null,
+          durationMs: 0,
+          simulated: true,
+        });
+        return { ok: true, status: 0, statusText: "Simulated", data: null, simulated: true as const };
+      }
+      if (request.method === "DELETE" && input.confirmed !== true) {
+        throw new TRPCError({ code: "PRECONDITION_FAILED", message: "DELETE actions require confirmation" });
+      }
+      const release = await acquireCustomWidgetRequestLimit({
+        category: request.method === "DELETE" ? "delete" : "action",
+        userId: ctx.session.user.id,
+        itemId: `preview:${session.id}`,
+        definitionId: session.definitionId ?? `preview:${session.id}`,
+      });
+      const startedAt = Date.now();
+      try {
+        const response = await executeCustomWidgetRequest({
+          baseUrl: session.baseUrl,
+          targetUrl,
+          method: request.method,
+          body,
+          staticHeaders: request.staticHeaders,
+          auth:
+            request.auth === "none"
+              ? undefined
+              : {
+                  type: session.authType,
+                  secrets: getPreviewSessionSecrets(session),
+                  headerName: session.headerName,
+                },
+          networkScope: session.networkScope,
+          kind: "action",
+        });
+        await recordPreviewJournal(session, {
+          requestId: request.id,
+          kind: "action",
+          method: request.method,
+          pathTemplate: request.pathTemplate,
+          status: response.status,
+          durationMs: Date.now() - startedAt,
+          simulated: false,
+        });
+        return {
+          ok: response.ok,
+          status: response.status,
+          statusText: response.statusText,
+          data: response.data,
+          error: response.ok ? undefined : `HTTP ${response.status}: ${response.statusText}`,
+          simulated: false as const,
+        };
+      } finally {
+        await release();
+      }
+    }),
+};

packages/api/src/router/custom-widget/preview-base-procedures.ts

@@ -0,0 +1,159 @@
+import { TRPCError } from "@trpc/server";
+import { z } from "zod/v4";
+
+import { decryptSecret } from "@homarr/common/server";
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import { eq } from "@homarr/db";
+import { customWidgetDefinitions } from "@homarr/db/schema";
+import {
+  customWidgetAuthTypes,
+  customWidgetDisplayTypes,
+  customWidgetMethods,
+  customWidgetSecretKinds,
+  customJsxDisplayConfigV2Schema,
+  displayConfigSchema,
+  extractActionButtonDisplay,
+  extractDisplayDataWithFallback,
+} from "@homarr/custom-widgets/core";
+
+import { permissionRequiredProcedure } from "../../trpc";
+import { recordPreviewJournal } from "./preview-procedure-helpers";
+import { executeCustomWidgetRequest } from "./request-executor";
+import { acquireCustomWidgetRequestLimit } from "./request-limits";
+import { createPreviewSession, getPreviewSession } from "./preview-sessions";
+
+const adminProcedure = permissionRequiredProcedure.requiresPermission("admin");
+
+const logger = createLogger({ module: "custom-widget" });
+
+export const previewBaseProcedures = {
+  preview: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Test a custom-widget draft through Homarr's hardened preview executor. Admin only. GET only; actions remain simulated. REQUIRED: url, method GET, authType, displayType, displayConfig. OPTIONAL: definitionId reuses that saved widget's stored credentials; omit secrets whenever possible. Returns sanitized response data, HTTP status, and a short-lived preview session for named query testing.",
+      },
+    })
+    .input(
+      z.object({
+        url: z.string().url(),
+        method: z.enum(customWidgetMethods),
+        authType: z.enum(customWidgetAuthTypes),
+        headerName: z.string().optional(),
+        requestBody: z.string().optional(),
+        displayType: z.enum(customWidgetDisplayTypes),
+        displayConfig: displayConfigSchema,
+        secrets: z.array(z.object({ kind: z.enum(customWidgetSecretKinds), value: z.string() })).default([]),
+        definitionId: z.string().optional(),
+      }),
+    )
+    .mutation(async ({ ctx, input }) => {
+      const secrets = [...input.secrets];
+
+      if (input.definitionId) {
+        const existing = await ctx.db.query.customWidgetDefinitions.findFirst({
+          where: eq(customWidgetDefinitions.id, input.definitionId),
+          with: { secrets: true },
+        });
+        if (existing) {
+          for (const dbSecret of existing.secrets) {
+            if (!secrets.some((s) => s.kind === dbSecret.kind)) {
+              secrets.push({ kind: dbSecret.kind, value: decryptSecret(dbSecret.value) });
+            }
+          }
+        }
+      }
+
+      const v2Config = customJsxDisplayConfigV2Schema.safeParse(input.displayConfig);
+      const previewSession = v2Config.success
+        ? await createPreviewSession({
+            userId: ctx.session.user.id,
+            baseUrl: input.url,
+            authType: input.authType,
+            headerName: input.headerName,
+            secrets,
+            networkScope: v2Config.data.networkScope,
+            requests: v2Config.data.requests,
+            definitionId: input.definitionId,
+          })
+        : null;
+      const storedPreviewSession = previewSession
+        ? await getPreviewSession(previewSession.id, ctx.session.user.id)
+        : null;
+
+      if (input.method !== "GET") {
+        return {
+          success: true as const,
+          simulated: true as const,
+          responseInfo: null,
+          rawResponse: null,
+          displayData: input.displayType === "actionButton" ? extractActionButtonDisplay(input.displayConfig) : null,
+          previewSession,
+        };
+      }
+
+      const release = await acquireCustomWidgetRequestLimit({
+        category: "query",
+        userId: ctx.session.user.id,
+        itemId: `preview:${ctx.session.user.id}`,
+        definitionId: input.definitionId ?? `preview:${ctx.session.user.id}`,
+      });
+      const startedAt = Date.now();
+      try {
+        const response = await executeCustomWidgetRequest({
+          baseUrl: input.url,
+          method: input.method,
+          body: undefined,
+          auth: { type: input.authType, secrets, headerName: input.headerName },
+          networkScope: v2Config.success ? v2Config.data.networkScope : "private",
+          kind: "query",
+        });
+        if (storedPreviewSession) {
+          await recordPreviewJournal(storedPreviewSession, {
+            requestId: "base",
+            kind: "query",
+            method: "GET",
+            pathTemplate: new URL(input.url).pathname,
+            status: response.status,
+            durationMs: Date.now() - startedAt,
+            simulated: false,
+          });
+        }
+        const responseInfo = { status: response.status, statusText: response.statusText };
+        if (!response.ok) {
+          return {
+            success: false as const,
+            error: `HTTP ${response.status}: ${response.statusText}`,
+            responseInfo,
+            rawResponse: typeof response.data === "string" ? response.data : JSON.stringify(response.data, null, 2),
+            previewSession,
+          };
+        }
+
+        const displayData = extractDisplayDataWithFallback(response.data, input.displayType, input.displayConfig);
+
+        return {
+          success: true as const,
+          responseInfo,
+          rawResponse: typeof response.data === "string" ? response.data : JSON.stringify(response.data, null, 2),
+          displayData,
+          previewSession,
+        };
+      } catch (error) {
+        if (error instanceof TRPCError) throw error;
+        logger.error("Custom widget preview failed", {
+          errorName: error instanceof Error ? error.name : "UnknownError",
+        });
+        return {
+          success: false as const,
+          error: error instanceof Error ? error.message : "Failed to fetch data",
+          responseInfo: null,
+          rawResponse: null,
+          previewSession,
+        };
+      } finally {
+        await release();
+      }
+    }),
+};

packages/api/src/router/custom-widget/preview-procedure-helpers.ts

@@ -0,0 +1,23 @@
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import { z } from "zod/v4";
+
+import { appendPreviewJournal } from "./preview-sessions";
+
+const logger = createLogger({ module: "custom-widget-preview" });
+
+export const previewSessionRequestSchema = z.object({
+  sessionId: z.string().min(1),
+  requestId: z.string().min(1).max(64),
+  params: z.record(z.string(), z.union([z.string(), z.number(), z.boolean()])).default({}),
+});
+
+export const recordPreviewJournal = async (...args: Parameters<typeof appendPreviewJournal>) => {
+  try {
+    await appendPreviewJournal(...args);
+  } catch (error) {
+    logger.warn("Failed to append custom widget preview journal", {
+      sessionId: args[0].id,
+      errorName: error instanceof Error ? error.name : "UnknownError",
+    });
+  }
+};

packages/api/src/router/custom-widget/preview-query-procedures.ts

@@ -0,0 +1,98 @@
+import { TRPCError } from "@trpc/server";
+import { z } from "zod/v4";
+
+import { permissionRequiredProcedure } from "../../trpc";
+import { previewSessionRequestSchema, recordPreviewJournal } from "./preview-procedure-helpers";
+import { executeCustomWidgetRequest } from "./request-executor";
+import { hashRuntimeParams, renderRequestTarget } from "./request-manifest";
+import { acquireCustomWidgetRequestLimit } from "./request-limits";
+import {
+  getPreviewJournal,
+  getPreviewSession,
+  getPreviewSessionSecrets,
+  setPreviewSessionLiveActions,
+} from "./preview-sessions";
+
+const adminProcedure = permissionRequiredProcedure.requiresPermission("admin");
+
+export const previewQueryProcedures = {
+  previewQuery: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Run one named GET query from a short-lived custom-widget preview session. REQUIRED: sessionId from customWidget_preview, requestId declared as a query, and typed params. Uses the hardened executor and returns sanitized response data for another validate/update iteration.",
+      },
+    })
+    .input(previewSessionRequestSchema)
+    .query(async ({ ctx, input }) => {
+      const session = await getPreviewSession(input.sessionId, ctx.session.user.id);
+      const request = session.requests.find(
+        (candidate) => candidate.id === input.requestId && candidate.kind === "query",
+      );
+      if (!request) throw new TRPCError({ code: "NOT_FOUND", message: "Preview query was not found" });
+      const targetUrl = renderRequestTarget(session.baseUrl, request, input.params);
+      const release = await acquireCustomWidgetRequestLimit({
+        category: "query",
+        userId: ctx.session.user.id,
+        itemId: `preview:${session.id}`,
+        definitionId: session.definitionId ?? `preview:${session.id}`,
+      });
+      const startedAt = Date.now();
+      try {
+        const response = await executeCustomWidgetRequest({
+          baseUrl: session.baseUrl,
+          targetUrl,
+          method: "GET",
+          staticHeaders: request.staticHeaders,
+          auth:
+            request.auth === "none"
+              ? undefined
+              : {
+                  type: session.authType,
+                  secrets: getPreviewSessionSecrets(session),
+                  headerName: session.headerName,
+                },
+          networkScope: session.networkScope,
+          kind: "query",
+          cacheKey: `custom-jsx:preview:${session.id}:${request.id}:${hashRuntimeParams(input.params)}`,
+          cacheTtlSeconds: request.cacheTtlSeconds,
+        });
+        await recordPreviewJournal(session, {
+          requestId: request.id,
+          kind: "query",
+          method: "GET",
+          pathTemplate: request.pathTemplate,
+          status: response.status,
+          durationMs: Date.now() - startedAt,
+          simulated: false,
+        });
+        return {
+          ok: response.ok,
+          status: response.status,
+          statusText: response.statusText,
+          data: response.data,
+          error: response.ok ? undefined : `HTTP ${response.status}: ${response.statusText}`,
+        };
+      } finally {
+        await release();
+      }
+    }),
+
+  setPreviewLiveActions: adminProcedure
+    .input(z.object({ sessionId: z.string().min(1), enabled: z.boolean() }))
+    .mutation(async ({ ctx, input }) =>
+      setPreviewSessionLiveActions(input.sessionId, ctx.session.user.id, input.enabled),
+    ),
+
+  previewJournal: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Read the redacted request journal for a custom-widget preview session. REQUIRED: sessionId. Use it to inspect statuses and durations; credentials and parameter values are never returned.",
+      },
+    })
+    .input(z.object({ sessionId: z.string().min(1) }))
+    .query(async ({ ctx, input }) => getPreviewJournal(input.sessionId, ctx.session.user.id)),
+};

packages/api/src/router/custom-widget/preview-sessions.ts

@@ -0,0 +1,79 @@
+import { createId } from "@homarr/common";
+import { decryptSecret, encryptSecret } from "@homarr/common/server";
+import { createRedisClient } from "@homarr/core/infrastructure/redis";
+import type { RedisClient } from "@homarr/core/infrastructure/redis";
+import { CustomWidgetPreviewSessionService } from "@homarr/custom-widgets/server";
+import type {
+  CreatePreviewSessionInput,
+  CustomWidgetPreviewJournalEntry,
+  CustomWidgetPreviewSession,
+  PreviewSessionStore,
+} from "@homarr/custom-widgets/server";
+
+import { toTrpcError } from "./domain-error";
+
+const SESSION_PREFIX = "custom-widget:preview-session:";
+const JOURNAL_PREFIX = "custom-widget:preview-journal:";
+
+class RedisPreviewSessionStore implements PreviewSessionStore {
+  public constructor(private readonly redis: RedisClient) {}
+
+  public async saveSession(id: string, value: unknown, ttlMs: number) {
+    await this.redis.set(`${SESSION_PREFIX}${id}`, JSON.stringify(value), "PX", ttlMs);
+  }
+
+  public getSession(id: string) {
+    return this.redis.get(`${SESSION_PREFIX}${id}`);
+  }
+  public async deleteSession(id: string) {
+    await this.redis.del(`${SESSION_PREFIX}${id}`);
+  }
+
+  public async appendJournal(id: string, value: unknown, maxEntries: number, ttlMs: number) {
+    const key = `${JOURNAL_PREFIX}${id}`;
+    await this.redis
+      .multi()
+      .lpush(key, JSON.stringify(value))
+      .ltrim(key, 0, maxEntries - 1)
+      .pexpire(key, ttlMs)
+      .exec();
+  }
+
+  public getJournal(id: string, maxEntries: number) {
+    return this.redis.lrange(`${JOURNAL_PREFIX}${id}`, 0, maxEntries - 1);
+  }
+}
+
+let service: CustomWidgetPreviewSessionService | undefined;
+function getService() {
+  if (service) return service;
+  const useLocal = process.env.CI !== undefined || process.env.NODE_ENV === "test";
+  service = new CustomWidgetPreviewSessionService({
+    createId,
+    encrypt: encryptSecret,
+    decrypt: (value) => decryptSecret(value as `${string}.${string}`),
+    store: useLocal ? undefined : new RedisPreviewSessionStore(createRedisClient()),
+  });
+  return service;
+}
+
+async function call<T>(operation: () => Promise<T>): Promise<T> {
+  try {
+    return await operation();
+  } catch (error) {
+    toTrpcError(error);
+  }
+}
+
+export type { CreatePreviewSessionInput, CustomWidgetPreviewJournalEntry, CustomWidgetPreviewSession };
+
+export const createPreviewSession = (input: CreatePreviewSessionInput) => call(() => getService().create(input));
+export const getPreviewSession = (id: string, userId: string) => call(() => getService().get(id, userId));
+export const setPreviewSessionLiveActions = (id: string, userId: string, enabled: boolean) =>
+  call(() => getService().setLiveActions(id, userId, enabled));
+export const appendPreviewJournal = (
+  session: CustomWidgetPreviewSession,
+  entry: Omit<CustomWidgetPreviewJournalEntry, "id" | "timestamp">,
+) => call(() => getService().appendJournal(session, entry));
+export const getPreviewJournal = (id: string, userId: string) => call(() => getService().getJournal(id, userId));
+export const getPreviewSessionSecrets = (session: CustomWidgetPreviewSession) => getService().getSecrets(session);

packages/api/src/router/custom-widget/request-executor.ts

@@ -0,0 +1,83 @@
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import {
+  assertJsonBudget as assertDomainJsonBudget,
+  assertSafeStaticHeaders as assertDomainSafeStaticHeaders,
+  classifyAddress,
+  executeCustomWidgetRequest as executeDomainRequest,
+  MAX_REQUEST_BODY_BYTES,
+  MAX_RESPONSE_BODY_BYTES,
+  MAX_RESPONSE_JSON_DEPTH,
+  MAX_RESPONSE_JSON_NODES,
+  resolveAndValidateHost as resolveDomainHost,
+  resolveSameOriginTarget as resolveDomainTarget,
+  validateCustomWidgetUrl as validateDomainUrl,
+} from "@homarr/custom-widgets/server";
+import type { CustomWidgetHttpRequest, CustomWidgetHttpResponse } from "@homarr/custom-widgets/server";
+
+import { toTrpcError } from "./domain-error";
+
+export type {
+  CustomWidgetAuthConfig,
+  CustomWidgetHttpRequest,
+  CustomWidgetHttpResponse,
+} from "@homarr/custom-widgets/server";
+export {
+  classifyAddress,
+  MAX_REQUEST_BODY_BYTES,
+  MAX_RESPONSE_BODY_BYTES,
+  MAX_RESPONSE_JSON_DEPTH,
+  MAX_RESPONSE_JSON_NODES,
+};
+
+const logger = createLogger({ module: "custom-widget:http" });
+
+export function assertJsonBudget(value: unknown): void {
+  try {
+    assertDomainJsonBudget(value);
+  } catch (error) {
+    toTrpcError(error);
+  }
+}
+
+export function assertSafeStaticHeaders(headers: Record<string, string> | undefined): void {
+  try {
+    assertDomainSafeStaticHeaders(headers);
+  } catch (error) {
+    toTrpcError(error);
+  }
+}
+
+export function validateCustomWidgetUrl(value: string | URL): URL {
+  try {
+    return validateDomainUrl(value);
+  } catch (error) {
+    toTrpcError(error);
+  }
+}
+
+export function resolveSameOriginTarget(baseUrl: string, target?: string | URL): URL {
+  try {
+    return resolveDomainTarget(baseUrl, target);
+  } catch (error) {
+    toTrpcError(error);
+  }
+}
+
+export async function resolveAndValidateHost(hostname: string, scope: CustomWidgetHttpRequest["networkScope"]) {
+  try {
+    return await resolveDomainHost(hostname, scope);
+  } catch (error) {
+    toTrpcError(error);
+  }
+}
+
+export async function executeCustomWidgetRequest(input: CustomWidgetHttpRequest): Promise<CustomWidgetHttpResponse> {
+  try {
+    return await executeDomainRequest({
+      ...input,
+      logError: (event) => logger.error("Custom widget request failed", event),
+    });
+  } catch (error) {
+    toTrpcError(error);
+  }
+}

packages/api/src/router/custom-widget/request-limits.ts

@@ -0,0 +1,74 @@
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import { createRedisClient } from "@homarr/core/infrastructure/redis";
+import type { RedisClient } from "@homarr/core/infrastructure/redis";
+import { CustomWidgetRequestLimiter } from "@homarr/custom-widgets/server";
+import type { RequestLimitInput, RequestLimitStore } from "@homarr/custom-widgets/server";
+
+import { toTrpcError } from "./domain-error";
+
+const logger = createLogger({ module: "custom-widget:limits" });
+const RATE_SCRIPT = `
+local count = redis.call('INCR', KEYS[1])
+if count == 1 then redis.call('PEXPIRE', KEYS[1], ARGV[1]) end
+return { count, redis.call('PTTL', KEYS[1]) }
+`;
+const ACQUIRE_SCRIPT = `
+local count = redis.call('INCR', KEYS[1])
+if count == 1 then redis.call('PEXPIRE', KEYS[1], ARGV[2]) end
+if count > tonumber(ARGV[1]) then redis.call('DECR', KEYS[1]); return 0 end
+return count
+`;
+const RELEASE_SCRIPT = `
+local count = tonumber(redis.call('GET', KEYS[1]) or '0')
+if count <= 1 then redis.call('DEL', KEYS[1]); return 0 end
+return redis.call('DECR', KEYS[1])
+`;
+
+class RedisRequestLimitStore implements RequestLimitStore {
+  public constructor(private readonly redis: RedisClient) {}
+
+  public async incrementRate(key: string, windowMs: number) {
+    const [count, retryAfterMs] = (await this.redis.eval(RATE_SCRIPT, 1, key, windowMs)) as [number, number];
+    return { count: Number(count), retryAfterMs: Number(retryAfterMs) || windowMs };
+  }
+
+  public async acquireConcurrency(key: string, limit: number, ttlMs: number) {
+    return Number(await this.redis.eval(ACQUIRE_SCRIPT, 1, key, limit, ttlMs)) > 0;
+  }
+
+  public async releaseConcurrency(key: string) {
+    await this.redis.eval(RELEASE_SCRIPT, 1, key);
+  }
+}
+
+let limiter: CustomWidgetRequestLimiter | undefined;
+function getLimiter() {
+  if (limiter) return limiter;
+  const useLocal = process.env.CI !== undefined || process.env.NODE_ENV === "test";
+  const store = useLocal ? undefined : new RedisRequestLimitStore(createRedisClient());
+  limiter = new CustomWidgetRequestLimiter({
+    store,
+    onStoreError: (error) =>
+      logger.error("Custom widget rate limiter is unavailable", {
+        errorName: error instanceof Error ? error.name : "UnknownError",
+      }),
+  });
+  return limiter;
+}
+
+export async function acquireCustomWidgetRequestLimit(input: RequestLimitInput): Promise<() => Promise<void>> {
+  try {
+    const release = await getLimiter().acquire(input);
+    return async () => {
+      try {
+        await release();
+      } catch (error) {
+        logger.error("Failed to release custom widget request capacity", {
+          errorName: error instanceof Error ? error.name : "UnknownError",
+        });
+      }
+    };
+  } catch (error) {
+    toTrpcError(error);
+  }
+}

packages/api/src/router/custom-widget/request-manifest.ts

@@ -0,0 +1,37 @@
+import type { CustomJsxRequest } from "@homarr/custom-widgets/core";
+import {
+  hashRuntimeParams,
+  renderRequestBody as renderDomainBody,
+  renderRequestTarget as renderDomainTarget,
+  validateRuntimeParams as validateDomainParams,
+} from "@homarr/custom-widgets/server";
+import type { CustomJsxRuntimeParams } from "@homarr/custom-widgets/server";
+
+import { toTrpcError } from "./domain-error";
+
+export type { CustomJsxRuntimeParams } from "@homarr/custom-widgets/server";
+export { hashRuntimeParams };
+
+export function validateRuntimeParams(request: CustomJsxRequest, params: CustomJsxRuntimeParams): void {
+  try {
+    validateDomainParams(request, params);
+  } catch (error) {
+    toTrpcError(error);
+  }
+}
+
+export function renderRequestBody(request: CustomJsxRequest["bodyTemplate"], params: CustomJsxRuntimeParams) {
+  try {
+    return renderDomainBody(request, params);
+  } catch (error) {
+    toTrpcError(error);
+  }
+}
+
+export function renderRequestTarget(baseUrl: string, request: CustomJsxRequest, params: CustomJsxRuntimeParams) {
+  try {
+    return renderDomainTarget(baseUrl, request, params);
+  } catch (error) {
+    toTrpcError(error);
+  }
+}

packages/api/src/router/custom-widget/template-procedures.ts

@@ -0,0 +1,226 @@
+import { createHash } from "node:crypto";
+
+import { TRPCError } from "@trpc/server";
+import { stringify as stringifySuperJson } from "superjson";
+import { z } from "zod/v4";
+
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import { displayConfigSchema } from "@homarr/custom-widgets/core";
+import { eq } from "@homarr/db";
+import { customWidgetDefinitions } from "@homarr/db/schema";
+
+import { permissionRequiredProcedure } from "../../trpc";
+import { parseDisplayConfig } from "./parse-display-config";
+
+const adminProcedure = permissionRequiredProcedure.requiresPermission("admin");
+
+const logger = createLogger({ module: "custom-widget" });
+
+const getTemplateRevision = (template: string) => createHash("sha256").update(template).digest("hex").slice(0, 16);
+
+const validateUpdatedTemplate = (displayConfig: Record<string, unknown>, template: string) => {
+  displayConfig.template = template;
+  const result = displayConfigSchema.safeParse(displayConfig);
+  if (!result.success) {
+    throw new TRPCError({
+      code: "BAD_REQUEST",
+      message: result.error.issues
+        .map((issue) => `${issue.path.map(String).join(".") || "template"}: ${issue.message}`)
+        .join("; "),
+    });
+  }
+  return result.data;
+};
+
+export const templateProcedures = {
+  readTemplate: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Read the JSX template of a custom widget definition as plain text. Returns the template string separately from the full widget config, making it easier to inspect and edit.",
+      },
+    })
+    .input(z.object({ id: z.string() }))
+    .query(async ({ ctx, input }) => {
+      const definition = await ctx.db.query.customWidgetDefinitions.findFirst({
+        where: eq(customWidgetDefinitions.id, input.id),
+      });
+
+      if (!definition) {
+        throw new TRPCError({ code: "NOT_FOUND", message: "Custom widget definition not found" });
+      }
+
+      const config = parseDisplayConfig(
+        definition.displayConfig,
+        input.id,
+        logger,
+        "Corrupt displayConfig in custom widget readTemplate",
+      );
+
+      if (config.type !== "customJsx") {
+        throw new TRPCError({
+          code: "BAD_REQUEST",
+          message: "Widget is not using customJsx display type",
+        });
+      }
+
+      const template = (config.template as string | undefined) ?? "";
+      return {
+        id: definition.id,
+        name: definition.name,
+        template,
+        templateLines: template.split("\n"),
+        revision: getTemplateRevision(template),
+      };
+    }),
+
+  writeTemplate: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Update only the JSX template of a custom widget definition. Accepts either a single template string or templateLines (array of strings joined with newlines). Validates the template AST before saving. This avoids needing to send the full widget JSON for template-only edits.",
+      },
+    })
+    .input(
+      z
+        .object({
+          id: z.string(),
+          template: z.string().optional(),
+          templateLines: z.array(z.string()).optional(),
+        })
+        .refine((data) => data.template !== undefined || data.templateLines !== undefined, {
+          message: "Provide either template or templateLines",
+        })
+        .refine((data) => !(data.template !== undefined && data.templateLines !== undefined), {
+          message: "Provide template or templateLines, not both",
+        }),
+    )
+    .mutation(async ({ ctx, input }) => {
+      const resolvedTemplate =
+        input.templateLines !== undefined ? input.templateLines.join("\n") : (input.template ?? "");
+
+      const existing = await ctx.db.query.customWidgetDefinitions.findFirst({
+        where: eq(customWidgetDefinitions.id, input.id),
+      });
+
+      if (!existing) {
+        throw new TRPCError({ code: "NOT_FOUND", message: "Custom widget definition not found" });
+      }
+
+      const displayConfig = parseDisplayConfig(
+        existing.displayConfig,
+        input.id,
+        logger,
+        "Corrupt displayConfig in custom widget writeTemplate",
+      );
+
+      if (displayConfig.type !== "customJsx") {
+        throw new TRPCError({
+          code: "BAD_REQUEST",
+          message: "Widget is not using customJsx display type",
+        });
+      }
+
+      if (resolvedTemplate.trim().length === 0) {
+        throw new TRPCError({ code: "BAD_REQUEST", message: "Template must not be empty" });
+      }
+      if (resolvedTemplate.length > 50_000) {
+        throw new TRPCError({ code: "BAD_REQUEST", message: "Template exceeds the 50,000 character limit" });
+      }
+
+      const validatedConfig = validateUpdatedTemplate(displayConfig, resolvedTemplate);
+
+      await ctx.db
+        .update(customWidgetDefinitions)
+        .set({ displayConfig: stringifySuperJson(validatedConfig), updatedAt: new Date() })
+        .where(eq(customWidgetDefinitions.id, input.id));
+
+      logger.info("Updated custom widget template", { id: input.id });
+      return {
+        id: input.id,
+        template: resolvedTemplate,
+        templateLines: resolvedTemplate.split("\n"),
+        revision: getTemplateRevision(resolvedTemplate),
+      };
+    }),
+
+  patchTemplate: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Patch selected lines of a Custom JSX template without rewriting the whole template. First call customWidget_readTemplate and pass its revision as expectedRevision. Each edit uses a 1-based startLine, deleteCount, and replacementLines. Edits are applied atomically, then the complete template and named-request references are validated before saving. A stale revision is rejected so the agent can re-read and retry safely.",
+      },
+    })
+    .input(
+      z.object({
+        id: z.string(),
+        expectedRevision: z.string().length(16),
+        edits: z
+          .array(
+            z.object({
+              startLine: z.number().int().min(1),
+              deleteCount: z.number().int().min(0),
+              replacementLines: z.array(z.string()),
+            }),
+          )
+          .min(1)
+          .max(100),
+      }),
+    )
+    .mutation(async ({ ctx, input }) => {
+      const existing = await ctx.db.query.customWidgetDefinitions.findFirst({
+        where: eq(customWidgetDefinitions.id, input.id),
+      });
+      if (!existing) throw new TRPCError({ code: "NOT_FOUND", message: "Custom widget definition not found" });
+
+      const displayConfig = parseDisplayConfig(
+        existing.displayConfig,
+        input.id,
+        logger,
+        "Corrupt displayConfig in custom widget patchTemplate",
+      );
+      if (displayConfig.type !== "customJsx") {
+        throw new TRPCError({ code: "BAD_REQUEST", message: "Widget is not using customJsx display type" });
+      }
+
+      const currentTemplate = (displayConfig.template as string | undefined) ?? "";
+      if (getTemplateRevision(currentTemplate) !== input.expectedRevision) {
+        throw new TRPCError({
+          code: "CONFLICT",
+          message: "Template changed since it was read. Read the template again and retry the patch.",
+        });
+      }
+
+      const lines = currentTemplate.split("\n");
+      const edits = input.edits.toSorted((left, right) => right.startLine - left.startLine);
+      let nextHigherStart = lines.length + 2;
+      for (const edit of edits) {
+        if (edit.startLine > lines.length + 1 || edit.startLine + edit.deleteCount - 1 > lines.length) {
+          throw new TRPCError({ code: "BAD_REQUEST", message: `Edit at line ${edit.startLine} is out of range` });
+        }
+        if (edit.startLine + Math.max(edit.deleteCount, 1) > nextHigherStart) {
+          throw new TRPCError({ code: "BAD_REQUEST", message: "Template patch edits must not overlap" });
+        }
+        nextHigherStart = edit.startLine;
+        lines.splice(edit.startLine - 1, edit.deleteCount, ...edit.replacementLines);
+      }
+
+      const template = lines.join("\n");
+      const validatedConfig = validateUpdatedTemplate(displayConfig, template);
+      await ctx.db
+        .update(customWidgetDefinitions)
+        .set({ displayConfig: stringifySuperJson(validatedConfig), updatedAt: new Date() })
+        .where(eq(customWidgetDefinitions.id, input.id));
+
+      logger.info("Patched custom widget template", { id: input.id, editCount: input.edits.length });
+      return {
+        id: input.id,
+        template,
+        templateLines: lines,
+        revision: getTemplateRevision(template),
+      };
+    }),
+};

packages/api/src/router/custom-widget/transfer-procedures.ts

@@ -0,0 +1,80 @@
+import { TRPCError } from "@trpc/server";
+import { stringify as stringifySuperJson } from "superjson";
+import { z } from "zod/v4";
+
+import { createId } from "@homarr/common";
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import { eq } from "@homarr/db";
+import { customWidgetDefinitions } from "@homarr/db/schema";
+import { customWidgetImportSchema } from "@homarr/custom-widgets/core";
+
+import { permissionRequiredProcedure } from "../../trpc";
+import { parseDisplayConfig } from "./parse-display-config";
+
+const adminProcedure = permissionRequiredProcedure.requiresPermission("admin");
+const logger = createLogger({ module: "custom-widget" });
+
+export const transferProcedures = {
+  export: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Export one custom widget as a homarr-custom-widget-v3 object. REQUIRED: id. Secrets are excluded.",
+      },
+    })
+    .input(z.object({ id: z.string() }))
+    .query(async ({ ctx, input }) => {
+      const definition = await ctx.db.query.customWidgetDefinitions.findFirst({
+        where: eq(customWidgetDefinitions.id, input.id),
+      });
+      if (!definition) throw new TRPCError({ code: "NOT_FOUND" });
+      return {
+        $schema: "homarr-custom-widget-v3" as const,
+        name: definition.name,
+        description: definition.description,
+        iconUrl: definition.iconUrl,
+        url: definition.url,
+        authType: definition.authType,
+        headerName: definition.headerName,
+        method: definition.method,
+        requestBody: definition.requestBody,
+        displayType: definition.displayType,
+        displayConfig: parseDisplayConfig(
+          definition.displayConfig,
+          input.id,
+          logger,
+          "Corrupt displayConfig during export",
+        ),
+      };
+    }),
+
+  import: adminProcedure
+    .meta({
+      mcp: {
+        enabled: true,
+        description:
+          "Create a custom widget from a validated homarr-custom-widget-v3 import object. Secrets are omitted and configured separately.",
+      },
+    })
+    .input(customWidgetImportSchema)
+    .mutation(async ({ ctx, input }) => {
+      const id = createId();
+      await ctx.db.insert(customWidgetDefinitions).values({
+        id,
+        name: input.name,
+        description: input.description,
+        iconUrl: input.iconUrl,
+        url: input.url,
+        authType: input.authType,
+        headerName: input.headerName,
+        method: input.method,
+        requestBody: input.requestBody,
+        displayType: input.displayType,
+        displayConfig: stringifySuperJson(input.displayConfig),
+        creatorId: ctx.session.user.id,
+      });
+      logger.info("Imported custom widget definition", { id, name: input.name });
+      return { id };
+    }),
+};

packages/api/src/router/test/custom-widget/preview-sessions.spec.ts

@@ -0,0 +1,67 @@
+import { describe, expect, test } from "vitest";
+
+import {
+  appendPreviewJournal,
+  createPreviewSession,
+  getPreviewJournal,
+  getPreviewSession,
+  getPreviewSessionSecrets,
+  setPreviewSessionLiveActions,
+} from "../../custom-widget/preview-sessions";
+
+const queryRequest = {
+  id: "status",
+  kind: "query",
+  method: "GET",
+  pathTemplate: "/status/{id}",
+  parameters: { id: "string" },
+  auth: "inherit",
+  minimumBoardPermission: "view",
+} as const;
+
+describe("custom widget preview sessions", () => {
+  test("stores encrypted credentials in a short-lived user-bound manifest", async () => {
+    const created = await createPreviewSession({
+      userId: "admin-1",
+      baseUrl: "https://example.com/api",
+      authType: "bearer",
+      secrets: [{ kind: "apiKey", value: "plain-secret" }],
+      networkScope: "public",
+      requests: [queryRequest],
+    });
+
+    const session = await getPreviewSession(created.id, "admin-1");
+
+    expect(session.secrets[0]?.value).not.toContain("plain-secret");
+    expect(getPreviewSessionSecrets(session)).toEqual([{ kind: "apiKey", value: "plain-secret" }]);
+    await expect(getPreviewSession(created.id, "admin-2")).rejects.toMatchObject({ code: "NOT_FOUND" });
+  });
+
+  test("keeps actions simulated until explicitly enabled", async () => {
+    const created = await createPreviewSession({
+      userId: "admin-1",
+      baseUrl: "https://example.com/api",
+      authType: "none",
+      secrets: [],
+      networkScope: "public",
+      requests: [queryRequest],
+    });
+
+    expect((await getPreviewSession(created.id, "admin-1")).liveActions).toBe(false);
+    await setPreviewSessionLiveActions(created.id, "admin-1", true);
+    const session = await getPreviewSession(created.id, "admin-1");
+    expect(session.liveActions).toBe(true);
+    await appendPreviewJournal(session, {
+      requestId: "status",
+      kind: "query",
+      method: "GET",
+      pathTemplate: "/status/{id}",
+      status: 200,
+      durationMs: 12,
+      simulated: false,
+    });
+    expect(await getPreviewJournal(created.id, "admin-1")).toEqual([
+      expect.objectContaining({ requestId: "status", pathTemplate: "/status/{id}", durationMs: 12 }),
+    ]);
+  });
+});

packages/api/src/router/test/custom-widget/request-executor.spec.ts

@@ -0,0 +1,65 @@
+import { describe, expect, test } from "vitest";
+
+import {
+  assertJsonBudget,
+  assertSafeStaticHeaders,
+  classifyAddress,
+  resolveAndValidateHost,
+  resolveSameOriginTarget,
+  validateCustomWidgetUrl,
+} from "../../custom-widget/request-executor";
+
+describe("custom widget request executor", () => {
+  test.each([
+    ["8.8.8.8", "public"],
+    ["10.0.0.1", "private"],
+    ["127.0.0.1", "loopback"],
+    ["169.254.169.254", "blocked"],
+    ["224.0.0.1", "blocked"],
+    ["::ffff:127.0.0.1", "blocked"],
+    ["fe80::1", "blocked"],
+  ] as const)("classifies %s as %s", (address, expected) => {
+    expect(classifyAddress(address)).toBe(expected);
+  });
+
+  test("enforces configured address scopes", async () => {
+    await expect(resolveAndValidateHost("10.0.0.1", "public")).rejects.toMatchObject({ code: "FORBIDDEN" });
+    await expect(resolveAndValidateHost("10.0.0.1", "private")).resolves.toHaveLength(1);
+    await expect(resolveAndValidateHost("127.0.0.1", "private")).rejects.toMatchObject({ code: "FORBIDDEN" });
+    await expect(resolveAndValidateHost("127.0.0.1", "loopback")).resolves.toHaveLength(1);
+    await expect(resolveAndValidateHost("169.254.169.254", "loopback")).rejects.toMatchObject({
+      code: "FORBIDDEN",
+    });
+  });
+
+  test("allows only credential-free HTTP(S) URLs without fragments", () => {
+    expect(validateCustomWidgetUrl("https://example.com/api").href).toBe("https://example.com/api");
+    expect(() => validateCustomWidgetUrl("file:///etc/passwd")).toThrow("Only HTTP and HTTPS");
+    expect(() => validateCustomWidgetUrl("https://user:password@example.com/api")).toThrow("credentials");
+    expect(() => validateCustomWidgetUrl("https://example.com/api#secret")).toThrow("fragments");
+  });
+
+  test("rejects cross-origin named request targets", () => {
+    expect(resolveSameOriginTarget("https://example.com/base", "https://example.com/status").pathname).toBe("/status");
+    expect(() => resolveSameOriginTarget("https://example.com/base", "https://attacker.example/status")).toThrow(
+      "origin",
+    );
+  });
+
+  test.each(["Authorization", "Cookie", "Host", "Proxy-Authorization", "Sec-Fetch-Site", "X-Forwarded-For"])(
+    "rejects the reserved %s header",
+    (header) => {
+      expect(() => assertSafeStaticHeaders({ [header]: "value" })).toThrow("reserved");
+    },
+  );
+
+  test("rejects response JSON that exceeds the depth budget", () => {
+    let nested: Record<string, unknown> = {};
+    const root = nested;
+    for (let index = 0; index < 40; index += 1) {
+      nested.child = {};
+      nested = nested.child as Record<string, unknown>;
+    }
+    expect(() => assertJsonBudget(root)).toThrow("deeply nested");
+  });
+});

packages/api/src/router/test/custom-widget/request-limits.spec.ts

@@ -0,0 +1,30 @@
+import { expect, test } from "vitest";
+
+import { createId } from "@homarr/common";
+
+import { acquireCustomWidgetRequestLimit } from "../../custom-widget/request-limits";
+
+test("enforces the server-side DELETE rate limit with retry metadata", async () => {
+  const input = { category: "delete" as const, userId: createId(), itemId: createId(), definitionId: createId() };
+  for (let count = 0; count < 3; count += 1) {
+    const release = await acquireCustomWidgetRequestLimit(input);
+    await release();
+  }
+
+  try {
+    await acquireCustomWidgetRequestLimit(input);
+    expect.unreachable("the fourth DELETE request should be rate limited");
+  } catch (error) {
+    expect(error).toMatchObject({ code: "TOO_MANY_REQUESTS" });
+    const cause = (error as { cause?: { flatten?: () => Record<string, unknown> } }).cause;
+    expect(cause?.flatten?.()).toMatchObject({ retryAfterMs: expect.any(Number) });
+  }
+});
+
+test("enforces four concurrent requests per user and item", async () => {
+  const input = { category: "query" as const, userId: createId(), itemId: createId(), definitionId: createId() };
+  const releases = await Promise.all(Array.from({ length: 4 }, () => acquireCustomWidgetRequestLimit(input)));
+
+  await expect(acquireCustomWidgetRequestLimit(input)).rejects.toMatchObject({ code: "TOO_MANY_REQUESTS" });
+  await Promise.all(releases.map((release) => release()));
+});

packages/api/src/router/test/widgets/custom-api.spec.ts

@@ -0,0 +1,224 @@
+import { stringify as stringifySuperJson } from "superjson";
+import { beforeEach, describe, expect, test, vi } from "vitest";
+
+import type { Session } from "@homarr/auth";
+import { createId } from "@homarr/common";
+import { eq } from "@homarr/db";
+import { boardUserPermissions, boards, customWidgetDefinitions, items, users } from "@homarr/db/schema";
+import { createDb } from "@homarr/db/test";
+
+const mocks = vi.hoisted(() => ({
+  executeRequest: vi.fn(async () => ({ ok: true, status: 200, statusText: "OK", data: { value: 42 } })),
+}));
+
+vi.mock("../../custom-widget/request-executor", () => ({
+  executeCustomWidgetRequest: mocks.executeRequest,
+  resolveSameOriginTarget: (_baseUrl: string, targetUrl: string | URL) => new URL(targetUrl),
+}));
+
+vi.mock("../../custom-widget/request-limits", () => ({
+  acquireCustomWidgetRequestLimit: vi.fn(async () => async () => undefined),
+}));
+
+import { customApiRouter } from "../../widgets/custom-api";
+
+const createSession = (userId: string): Session => ({
+  user: { id: userId, permissions: [], colorScheme: "light" },
+  expires: new Date(Date.now() + 60_000).toISOString(),
+});
+
+const queryRequest = {
+  id: "status",
+  kind: "query",
+  method: "GET",
+  pathTemplate: "/status/{name}",
+  parameters: { name: "string" },
+  auth: "inherit",
+  minimumBoardPermission: "view",
+} as const;
+
+const actionRequest = {
+  id: "toggle",
+  kind: "action",
+  method: "POST",
+  pathTemplate: "/toggle",
+  parameters: { enabled: "boolean" },
+  bodyTemplate: { enabled: { $param: "enabled" } },
+  auth: "inherit",
+  minimumBoardPermission: "modify",
+} as const;
+
+const deleteRequest = {
+  id: "delete",
+  kind: "action",
+  method: "DELETE",
+  pathTemplate: "/resource",
+  parameters: {},
+  auth: "inherit",
+  minimumBoardPermission: "full",
+} as const;
+
+const setup = async ({
+  isPublic = true,
+  method = "GET",
+  requests = [queryRequest, actionRequest, deleteRequest],
+}: {
+  isPublic?: boolean;
+  method?: "GET" | "POST";
+  requests?: readonly Record<string, unknown>[];
+} = {}) => {
+  const db = createDb();
+  const ownerId = createId();
+  const boardId = createId();
+  const itemId = createId();
+  const definitionId = createId();
+  await db.insert(users).values({ id: ownerId });
+  await db.insert(boards).values({ id: boardId, name: createId(), creatorId: ownerId, isPublic });
+  await db.insert(customWidgetDefinitions).values({
+    id: definitionId,
+    name: "Custom JSX",
+    url: "https://example.com/api",
+    method,
+    authType: "none",
+    displayType: "customJsx",
+    displayConfig: stringifySuperJson({
+      type: "customJsx",
+      jsxApiVersion: 2,
+      template: "<Text>{data.value}</Text>",
+      networkScope: "public",
+      requests,
+    }),
+    creatorId: ownerId,
+  });
+  await db.insert(items).values({
+    id: itemId,
+    boardId,
+    kind: "customApi",
+    options: stringifySuperJson({ definitionId, refreshInterval: 30 }),
+  });
+  return { db, ownerId, boardId, itemId, definitionId };
+};
+
+describe("customApiRouter v2", () => {
+  beforeEach(() => mocks.executeRequest.mockClear());
+
+  test("does not expose the removed raw subFetch procedure", () => {
+    expect(Object.hasOwn(customApiRouter._def.procedures, "subFetch")).toBe(false);
+  });
+
+  test("allows anonymous queries only through a public board placement", async () => {
+    const { db, itemId } = await setup();
+    const caller = customApiRouter.createCaller({ db, deviceType: undefined, session: null });
+
+    const result = await caller.queryRequest({ itemId, requestId: "status", params: { name: "homarr" } });
+
+    expect(result).toMatchObject({ ok: true, status: 200, data: { value: 42 } });
+    expect(mocks.executeRequest).toHaveBeenCalledOnce();
+  });
+
+  test("does not expose a placed definition through an inaccessible board", async () => {
+    const { db, itemId } = await setup({ isPublic: false });
+    const caller = customApiRouter.createCaller({ db, deviceType: undefined, session: null });
+
+    await expect(caller.getData({ itemId })).rejects.toMatchObject({ code: "NOT_FOUND" });
+    expect(mocks.executeRequest).not.toHaveBeenCalled();
+  });
+
+  test("does not execute non-GET base data requests automatically", async () => {
+    const { db, itemId } = await setup({ method: "POST" });
+    const caller = customApiRouter.createCaller({ db, deviceType: undefined, session: null });
+
+    await expect(caller.getData({ itemId })).resolves.toEqual({ type: "networkAccessNeedsReview" });
+    expect(mocks.executeRequest).not.toHaveBeenCalled();
+  });
+
+  test("cannot select a request from a definition that is not attached to the item", async () => {
+    const { db, itemId, ownerId } = await setup({ requests: [] });
+    const otherDefinitionId = createId();
+    await db.insert(customWidgetDefinitions).values({
+      id: otherDefinitionId,
+      name: "Other",
+      url: "https://example.com/api",
+      method: "GET",
+      authType: "none",
+      displayType: "customJsx",
+      displayConfig: stringifySuperJson({
+        type: "customJsx",
+        jsxApiVersion: 2,
+        template: "<Text />",
+        networkScope: "public",
+        requests: [queryRequest],
+      }),
+      creatorId: ownerId,
+    });
+    const caller = customApiRouter.createCaller({ db, deviceType: undefined, session: null });
+
+    await expect(
+      caller.queryRequest({ itemId, requestId: "status", params: { name: "homarr" } }),
+    ).rejects.toMatchObject({ code: "NOT_FOUND" });
+    expect(mocks.executeRequest).not.toHaveBeenCalled();
+  });
+
+  test("rejects mismatched request kinds and typed parameters", async () => {
+    const { db, itemId } = await setup();
+    const caller = customApiRouter.createCaller({ db, deviceType: undefined, session: null });
+
+    await expect(caller.queryRequest({ itemId, requestId: "toggle", params: { enabled: true } })).rejects.toMatchObject(
+      { code: "NOT_FOUND" },
+    );
+    await expect(caller.queryRequest({ itemId, requestId: "status", params: { name: 42 } })).rejects.toMatchObject({
+      code: "BAD_REQUEST",
+    });
+    expect(mocks.executeRequest).not.toHaveBeenCalled();
+  });
+
+  test("rejects disabled definitions before any network request", async () => {
+    const { db, itemId, definitionId } = await setup();
+    await db
+      .update(customWidgetDefinitions)
+      .set({ enabled: false })
+      .where(eq(customWidgetDefinitions.id, definitionId));
+    const caller = customApiRouter.createCaller({ db, deviceType: undefined, session: null });
+
+    await expect(caller.getData({ itemId })).rejects.toMatchObject({ code: "FORBIDDEN" });
+    expect(mocks.executeRequest).not.toHaveBeenCalled();
+  });
+
+  test("requires modify permission for named actions", async () => {
+    const { db, itemId } = await setup();
+    const viewerId = createId();
+    await db.insert(users).values({ id: viewerId });
+    const caller = customApiRouter.createCaller({ db, deviceType: undefined, session: createSession(viewerId) });
+
+    await expect(
+      caller.executeAction({ itemId, requestId: "toggle", params: { enabled: true } }),
+    ).rejects.toMatchObject({ code: "NOT_FOUND" });
+    expect(mocks.executeRequest).not.toHaveBeenCalled();
+  });
+
+  test("executes an authorized named action once with typed body substitution", async () => {
+    const { db, itemId, boardId } = await setup({ isPublic: false });
+    const editorId = createId();
+    await db.insert(users).values({ id: editorId });
+    await db.insert(boardUserPermissions).values({ boardId, userId: editorId, permission: "modify" });
+    const caller = customApiRouter.createCaller({ db, deviceType: undefined, session: createSession(editorId) });
+
+    const result = await caller.executeAction({ itemId, requestId: "toggle", params: { enabled: true } });
+
+    expect(result.ok).toBe(true);
+    expect(mocks.executeRequest).toHaveBeenCalledOnce();
+    expect(mocks.executeRequest).toHaveBeenCalledWith(
+      expect.objectContaining({ method: "POST", body: '{"enabled":true}' }),
+    );
+  });
+
+  test("requires explicit confirmation before DELETE", async () => {
+    const { db, itemId, ownerId } = await setup({ isPublic: false });
+    const caller = customApiRouter.createCaller({ db, deviceType: undefined, session: createSession(ownerId) });
+
+    await expect(caller.executeAction({ itemId, requestId: "delete", params: {} })).rejects.toMatchObject({
+      code: "PRECONDITION_FAILED",
+    });
+    expect(mocks.executeRequest).not.toHaveBeenCalled();
+  });
+});

packages/api/src/router/widgets/__tests__/custom-api-extractors.spec.ts

@@ -1,252 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { JSONPath } from "jsonpath-plus";
-
-import {
-  sonarrResponse,
-  sonarrStatGridConfig,
-  proxmoxResponse,
-  proxmoxProgressBarsConfig,
-  diskUsageResponse,
-  diskTableConfig,
-  piholeResponse,
-  piholeStatusIndicatorConfig,
-  piholeCountGridConfig,
-  radarrResponse,
-  radarrStatGridConfig,
-  jellyfinItemCountsResponse,
-  jellyfinCountGridConfig,
-} from "./custom-api-fixtures";
-
-const extractors: Record<string, (json: unknown, config: Record<string, unknown>) => unknown> = {
-  singleValue: (json, c) => ({
-    type: "singleValue",
-    label: (c.label as string) ?? "",
-    unit: (c.unit as string) ?? "",
-    value: JSONPath({ path: (c.jsonPath as string) ?? "$", json: json as object, wrap: false }),
-    valueSize: c.valueSize ?? "lg",
-    labelPosition: c.labelPosition ?? "below",
-  }),
-  keyValue: (json, c) => ({
-    type: "keyValue",
-    entries: ((c.mappings as Array<{ label: string; jsonPath: string; unit: string }>) ?? []).map((m) => ({
-      label: m.label,
-      unit: m.unit,
-      value: JSONPath({ path: m.jsonPath, json: json as object, wrap: false }),
-    })),
-    layout: c.layout ?? "list",
-    columns: c.columns ?? 2,
-  }),
-  table: (json, c) => {
-    const tablePath = (c.tablePath as string) ?? "$";
-    const columns = (c.columns as Array<{ header: string; jsonPath: string }>) ?? [];
-    const rows = JSONPath({ path: tablePath, json: json as object, wrap: true }) as unknown[];
-    const flatRows = Array.isArray(rows[0]) ? (rows[0] as unknown[]) : rows;
-    return {
-      type: "table",
-      columns: columns.map((col) => col.header),
-      rows: flatRows.map((row) =>
-        columns.map((col) => JSONPath({ path: col.jsonPath, json: row as object, wrap: false })),
-      ),
-      striped: c.striped ?? true,
-      compact: c.compact ?? false,
-    };
-  },
-  statGrid: (json, c) => ({
-    type: "statGrid",
-    items: ((c.items as Array<{ label: string; jsonPath: string; unit: string; color?: string }>) ?? []).map(
-      (item) => ({
-        label: item.label,
-        unit: item.unit,
-        color: item.color ?? "blue",
-        value: JSONPath({ path: item.jsonPath, json: json as object, wrap: false }),
-      }),
-    ),
-    columns: c.columns ?? 2,
-    cardStyle: c.cardStyle ?? "filled",
-  }),
-  progressBars: (json, c) => ({
-    type: "progressBars",
-    bars: (
-      (c.bars as Array<{ label: string; valuePath: string; maxPath?: string; unit: string; color?: string }>) ?? []
-    ).map((bar) => {
-      const value = JSONPath({ path: bar.valuePath, json: json as object, wrap: false });
-      const max = bar.maxPath ? JSONPath({ path: bar.maxPath, json: json as object, wrap: false }) : undefined;
-      return {
-        label: bar.label,
-        unit: bar.unit,
-        color: bar.color ?? "blue",
-        value: Number(value) || 0,
-        max: max !== undefined ? Number(max) || 100 : undefined,
-      };
-    }),
-    showPercentage: c.showPercentage ?? true,
-    barSize: c.barSize ?? "md",
-  }),
-  statusIndicator: (json, c) => ({
-    type: "statusIndicator",
-    items: ((c.items as Array<{ label: string; jsonPath: string; goodValues: string[] }>) ?? []).map((item) => {
-      const value = JSONPath({ path: item.jsonPath, json: json as object, wrap: false });
-      const isGood = item.goodValues.some((gv) => String(value).toLowerCase() === gv.toLowerCase());
-      return { label: item.label, value: String(value ?? "unknown"), isGood };
-    }),
-    layout: c.layout ?? "list",
-    dotSize: c.dotSize ?? "md",
-  }),
-  countGrid: (json, c) => ({
-    type: "countGrid",
-    items: ((c.items as Array<{ label: string; jsonPath: string; unit: string }>) ?? []).map((item) => ({
-      label: item.label,
-      unit: item.unit,
-      value: JSONPath({ path: item.jsonPath, json: json as object, wrap: false }),
-    })),
-    columns: c.columns ?? 2,
-    valueSize: c.valueSize ?? "md",
-  }),
-  raw: (json, c) => ({
-    type: "raw",
-    data: JSONPath({ path: (c.jsonPath as string) ?? "$", json: json as object, wrap: false }),
-    maxHeight: c.maxHeight ?? 300,
-  }),
-  customJsx: (json, config) => ({
-    type: "customJsx" as const,
-    template: config.template as string,
-    data: json,
-  }),
-};
-
-function extract(type: string, json: unknown, config: Record<string, unknown>) {
-  const fn = extractors[type];
-  if (!fn) throw new Error(`No extractor for type: ${type}`);
-  return fn(json, config);
-}
-
-describe("custom-api extractors", () => {
-  it("sonarr statGrid extracts missing and queue counts", () => {
-    const result = extract("statGrid", sonarrResponse, sonarrStatGridConfig) as {
-      type: string;
-      items: Array<{ label: string; value: unknown; color: string }>;
-    };
-
-    expect(result.type).toBe("statGrid");
-    expect(result.items).toHaveLength(2);
-    expect(result.items[0]?.value).toBe(42);
-    expect(result.items[0]?.label).toBe("Missing");
-    expect(result.items[0]?.color).toBe("red");
-    expect(result.items[1]?.value).toBe(5);
-  });
-
-  it("proxmox progressBars extracts memory and disk usage", () => {
-    const result = extract("progressBars", proxmoxResponse, proxmoxProgressBarsConfig) as {
-      type: string;
-      bars: Array<{ label: string; value: number; max: number }>;
-    };
-
-    expect(result.type).toBe("progressBars");
-    expect(result.bars).toHaveLength(2);
-    expect(result.bars[0]?.value).toBe(12_884_901_888);
-    expect(result.bars[0]?.max).toBe(34_359_738_368);
-    expect(result.bars[1]?.label).toBe("Disk");
-  });
-
-  it("disk table extracts filesystem rows", () => {
-    const result = extract("table", diskUsageResponse, diskTableConfig) as {
-      type: string;
-      columns: string[];
-      rows: unknown[][];
-    };
-
-    expect(result.type).toBe("table");
-    expect(result.columns).toEqual(["Mount", "Size", "Used"]);
-    expect(result.rows).toHaveLength(3);
-    expect(result.rows[0]?.[0]).toBe("/");
-    expect(result.rows[2]?.[2]).toBe("95%");
-  });
-
-  it("pihole statusIndicator detects enabled state", () => {
-    const result = extract("statusIndicator", piholeResponse, piholeStatusIndicatorConfig) as {
-      type: string;
-      items: Array<{ label: string; value: string; isGood: boolean }>;
-    };
-
-    expect(result.type).toBe("statusIndicator");
-    expect(result.items).toHaveLength(1);
-    expect(result.items[0]?.isGood).toBe(true);
-    expect(result.items[0]?.value).toBe("enabled");
-  });
-
-  it("pihole countGrid extracts all 4 stats", () => {
-    const result = extract("countGrid", piholeResponse, piholeCountGridConfig) as {
-      type: string;
-      items: Array<{ label: string; value: unknown; unit: string }>;
-    };
-
-    expect(result.type).toBe("countGrid");
-    expect(result.items).toHaveLength(4);
-    expect(result.items[0]?.value).toBe(12_847);
-    expect(result.items[1]?.value).toBe(48_291);
-    expect(result.items[2]?.value).toBe(26.6);
-    expect(result.items[2]?.unit).toBe("%");
-    expect(result.items[3]?.value).toBe(14);
-  });
-
-  it("radarr statGrid with outline card style", () => {
-    const result = extract("statGrid", radarrResponse, radarrStatGridConfig) as {
-      type: string;
-      items: Array<{ label: string; value: unknown }>;
-      cardStyle: string;
-    };
-
-    expect(result.type).toBe("statGrid");
-    expect(result.cardStyle).toBe("outline");
-    expect(result.items[0]?.value).toBe(15);
-    expect(result.items[1]?.value).toBe(3);
-  });
-
-  it("raw extractor returns raw data at path", () => {
-    const result = extract("raw", piholeResponse, { type: "raw", jsonPath: "$.status", maxHeight: 200 }) as {
-      type: string;
-      data: unknown;
-      maxHeight: number;
-    };
-
-    expect(result.type).toBe("raw");
-    expect(result.data).toBe("enabled");
-    expect(result.maxHeight).toBe(200);
-  });
-
-  it("customJsx passes full JSON and template through", () => {
-    const json = { title: "Status", items: [{ name: "CPU", value: 42 }] };
-    const config = {
-      type: "customJsx" as const,
-      template: "<Stack><Title>{data.title}</Title></Stack>",
-    };
-
-    const result = extract("customJsx", json, config) as {
-      type: string;
-      template: string;
-      data: typeof json;
-    };
-
-    expect(result.type).toBe("customJsx");
-    expect(result.template).toBe(config.template);
-    expect(result.data).toEqual(json);
-  });
-
-  it("jellyfin countGrid extracts movies/series/episodes/songs in 4-column grid", () => {
-    const result = extract("countGrid", jellyfinItemCountsResponse, jellyfinCountGridConfig) as {
-      type: string;
-      items: Array<{ label: string; value: unknown; unit: string }>;
-      columns: number;
-      valueSize: string;
-    };
-
-    expect(result.type).toBe("countGrid");
-    expect(result.columns).toBe(4);
-    expect(result.valueSize).toBe("lg");
-    expect(result.items).toHaveLength(4);
-    expect(result.items[0]).toEqual({ label: "Movies", value: 185, unit: "" });
-    expect(result.items[1]).toEqual({ label: "Series", value: 38, unit: "" });
-    expect(result.items[2]).toEqual({ label: "Episodes", value: 770, unit: "" });
-    expect(result.items[3]).toEqual({ label: "Songs", value: 0, unit: "" });
-  });
-});

packages/api/src/router/widgets/__tests__/custom-api-fixtures.ts

@@ -1,142 +0,0 @@
-export const sonarrResponse = {
-  wanted: { totalRecords: 42 },
-  queue: { totalRecords: 5 },
-  series: [
-    { title: "Breaking Bad", seasons: 5, episodeCount: 62, episodeFileCount: 60 },
-    { title: "The Wire", seasons: 5, episodeCount: 60, episodeFileCount: 55 },
-  ],
-  diskspace: [
-    { path: "/tv", label: "TV Shows", freeSpace: 150_000_000_000, totalSpace: 500_000_000_000 },
-    { path: "/movies", label: "Movies", freeSpace: 80_000_000_000, totalSpace: 250_000_000_000 },
-  ],
-};
-
-export const sonarrStatGridConfig = {
-  type: "statGrid" as const,
-  items: [
-    { label: "Missing", jsonPath: "$.wanted.totalRecords", unit: "", color: "red" },
-    { label: "Queue", jsonPath: "$.queue.totalRecords", unit: "", color: "blue" },
-  ],
-  columns: 2,
-  cardStyle: "filled" as const,
-};
-
-export const proxmoxResponse = {
-  data: {
-    cpu: 0.23,
-    memory: { used: 12_884_901_888, total: 34_359_738_368 },
-    rootfs: { used: 42_949_672_960, total: 107_374_182_400 },
-    uptime: 864_000,
-    status: "running",
-    maxcpu: 8,
-    maxmem: 34_359_738_368,
-    name: "proxmox-node1",
-  },
-};
-
-export const proxmoxProgressBarsConfig = {
-  type: "progressBars" as const,
-  bars: [
-    { label: "Memory", valuePath: "$.data.memory.used", maxPath: "$.data.memory.total", unit: "B", color: "blue" },
-    { label: "Disk", valuePath: "$.data.rootfs.used", maxPath: "$.data.rootfs.total", unit: "B", color: "orange" },
-  ],
-  showPercentage: true,
-  barSize: "md" as const,
-};
-
-export const diskUsageResponse = {
-  filesystems: [
-    { filesystem: "/dev/sda1", size: "500G", used: "350G", avail: "150G", usePct: "70%", mountedOn: "/" },
-    { filesystem: "/dev/sdb1", size: "2T", used: "1.2T", avail: "800G", usePct: "60%", mountedOn: "/data" },
-    { filesystem: "/dev/sdc1", size: "4T", used: "3.8T", avail: "200G", usePct: "95%", mountedOn: "/media" },
-  ],
-};
-
-export const diskTableConfig = {
-  type: "table" as const,
-  tablePath: "$.filesystems",
-  columns: [
-    { header: "Mount", jsonPath: "$.mountedOn" },
-    { header: "Size", jsonPath: "$.size" },
-    { header: "Used", jsonPath: "$.usePct" },
-  ],
-  striped: true,
-  compact: false,
-};
-
-export const piholeResponse = {
-  domains_being_blocked: 125_432,
-  dns_queries_today: 48_291,
-  ads_blocked_today: 12_847,
-  ads_percentage_today: 26.6,
-  unique_clients: 14,
-  status: "enabled",
-  gravity_last_updated: { relative: { days: 2, hours: 3 } },
-};
-
-export const piholeStatusIndicatorConfig = {
-  type: "statusIndicator" as const,
-  items: [{ label: "Pi-Hole", jsonPath: "$.status", goodValues: ["enabled"] }],
-  layout: "list" as const,
-  dotSize: "md" as const,
-};
-
-export const piholeCountGridConfig = {
-  type: "countGrid" as const,
-  items: [
-    { label: "Blocked Today", jsonPath: "$.ads_blocked_today", unit: "" },
-    { label: "DNS Queries", jsonPath: "$.dns_queries_today", unit: "" },
-    { label: "Block Rate", jsonPath: "$.ads_percentage_today", unit: "%" },
-    { label: "Clients", jsonPath: "$.unique_clients", unit: "" },
-  ],
-  columns: 2,
-  valueSize: "md" as const,
-};
-
-export const radarrResponse = {
-  wanted: { totalRecords: 15 },
-  queue: { totalRecords: 3 },
-  movie: [
-    { title: "Inception", hasFile: true, monitored: true, runtime: 148, year: 2010 },
-    { title: "Interstellar", hasFile: false, monitored: true, runtime: 169, year: 2014 },
-    { title: "The Dark Knight", hasFile: true, monitored: false, runtime: 152, year: 2008 },
-  ],
-  rootfolder: [{ path: "/movies", freeSpace: 200_000_000_000, totalSpace: 1_000_000_000_000 }],
-};
-
-export const radarrStatGridConfig = {
-  type: "statGrid" as const,
-  items: [
-    { label: "Missing", jsonPath: "$.wanted.totalRecords", unit: "", color: "red" },
-    { label: "Queue", jsonPath: "$.queue.totalRecords", unit: "", color: "teal" },
-  ],
-  columns: 2,
-  cardStyle: "outline" as const,
-};
-
-export const jellyfinItemCountsResponse = {
-  MovieCount: 185,
-  SeriesCount: 38,
-  EpisodeCount: 770,
-  ArtistCount: 0,
-  ProgramCount: 0,
-  TrailerCount: 0,
-  SongCount: 0,
-  AlbumCount: 0,
-  MusicVideoCount: 0,
-  BoxSetCount: 12,
-  BookCount: 0,
-  ItemCount: 0,
-};
-
-export const jellyfinCountGridConfig = {
-  type: "countGrid" as const,
-  items: [
-    { label: "Movies", jsonPath: "$.MovieCount", unit: "" },
-    { label: "Series", jsonPath: "$.SeriesCount", unit: "" },
-    { label: "Episodes", jsonPath: "$.EpisodeCount", unit: "" },
-    { label: "Songs", jsonPath: "$.SongCount", unit: "" },
-  ],
-  columns: 4,
-  valueSize: "lg" as const,
-};

packages/api/src/router/widgets/custom-api.ts

@@ -1,91 +1,275 @@
 import { TRPCError } from "@trpc/server";
-import superjson from "superjson";
+import { parse as parseSuperJson } from "superjson";
 import { z } from "zod/v4";
 
 import { decryptSecret } from "@homarr/common/server";
-import { customWidgetDefinitions } from "@homarr/db/schema";
-import { eq } from "@homarr/db";
 import { createLogger } from "@homarr/core/infrastructure/logs";
-import { createTRPCRouter, protectedProcedure } from "../../trpc";
-import { applyAuth } from "../custom-widget/auth";
-import { extractActionButtonDisplay, extractDisplayDataWithFallback } from "../custom-widget/display-data";
+import { eq } from "@homarr/db";
+import { boards, customWidgetDefinitions, items } from "@homarr/db/schema";
+import type { BoardPermission } from "@homarr/definitions";
+import {
+  customJsxDisplayConfigV2Schema,
+  displayConfigSchema,
+  extractActionButtonDisplay,
+  extractDisplayDataWithFallback,
+} from "@homarr/custom-widgets/core";
+import type { CustomJsxRequest, CustomWidgetMethod, DisplayConfig } from "@homarr/custom-widgets/core";
+
+import { createTRPCRouter, protectedProcedure, publicProcedure } from "../../trpc";
+import { throwIfActionForbiddenAsync } from "../board/board-access";
+import { executeCustomWidgetRequest } from "../custom-widget/request-executor";
+import { hashRuntimeParams, renderRequestBody, renderRequestTarget } from "../custom-widget/request-manifest";
+import { acquireCustomWidgetRequestLimit } from "../custom-widget/request-limits";
 
 const logger = createLogger({ module: "widget:customApi" });
 
-const FETCH_TIMEOUT_MS = 10_000;
+const runtimeParamsSchema = z.record(z.string(), z.union([z.string(), z.number(), z.boolean()]));
+const itemInputSchema = z.object({ itemId: z.string().min(1) });
+const namedRequestInputSchema = itemInputSchema.extend({
+  requestId: z.string().min(1).max(64),
+  params: runtimeParamsSchema.default({}),
+});
 
-const validateUrl = (urlString: string): URL => new URL(urlString);
+type RouterContext = Parameters<typeof throwIfActionForbiddenAsync>[0];
+type ResolvedDefinition = Awaited<ReturnType<typeof resolvePlacedDefinitionAsync>>;
+
+const parseItemOptions = (raw: string): { definitionId: string } => {
+  try {
+    const options = parseSuperJson(raw) as Record<string, unknown>;
+    if (typeof options.definitionId !== "string" || options.definitionId.length === 0) throw new Error();
+    return { definitionId: options.definitionId };
+  } catch {
+    throw new TRPCError({ code: "NOT_FOUND", message: "Custom widget item not found" });
+  }
+};
+
+const parseDisplayConfig = (raw: string): DisplayConfig => {
+  try {
+    return displayConfigSchema.parse(parseSuperJson(raw));
+  } catch (error) {
+    logger.error("Invalid custom widget display configuration", { error });
+    throw new TRPCError({
+      code: "PRECONDITION_FAILED",
+      message: "Custom widget network access needs review",
+    });
+  }
+};
+
+async function resolvePlacedDefinitionAsync(ctx: RouterContext, itemId: string) {
+  const item = await ctx.db.query.items.findFirst({
+    where: eq(items.id, itemId),
+    columns: { id: true, boardId: true, kind: true, options: true },
+  });
+  if (!item || item.kind !== "customApi") {
+    throw new TRPCError({ code: "NOT_FOUND", message: "Custom widget item not found" });
+  }
+
+  await throwIfActionForbiddenAsync(ctx, eq(boards.id, item.boardId), "view");
+  const { definitionId } = parseItemOptions(item.options);
+  const definition = await ctx.db.query.customWidgetDefinitions.findFirst({
+    where: eq(customWidgetDefinitions.id, definitionId),
+    with: { secrets: true },
+  });
+  if (!definition) {
+    throw new TRPCError({ code: "NOT_FOUND", message: "Custom widget definition not found" });
+  }
+  if (!definition.enabled) {
+    throw new TRPCError({ code: "FORBIDDEN", message: "Widget is disabled" });
+  }
+
+  return { item, definition, displayConfig: parseDisplayConfig(definition.displayConfig) };
+}
+
+const getDecryptedSecrets = (resolved: ResolvedDefinition) =>
+  resolved.definition.secrets.map((secret) => ({ kind: secret.kind, value: decryptSecret(secret.value) }));
+
+const getAuth = (resolved: ResolvedDefinition, mode: "inherit" | "none" = "inherit") =>
+  mode === "none"
+    ? undefined
+    : {
+        type: resolved.definition.authType,
+        secrets: getDecryptedSecrets(resolved),
+        headerName: resolved.definition.headerName,
+      };
+
+const getNetworkScope = (displayConfig: DisplayConfig) =>
+  displayConfig.type === "customJsx" && "jsxApiVersion" in displayConfig && displayConfig.jsxApiVersion === 2
+    ? displayConfig.networkScope
+    : ("private" as const);
+
+const getV2Config = (resolved: ResolvedDefinition) => {
+  const parsed = customJsxDisplayConfigV2Schema.safeParse(resolved.displayConfig);
+  if (!parsed.success) {
+    throw new TRPCError({
+      code: "PRECONDITION_FAILED",
+      message: "This template must be reviewed and migrated to named requests",
+    });
+  }
+  return parsed.data;
+};
+
+const findNamedRequest = (resolved: ResolvedDefinition, requestId: string, kind: "query" | "action") => {
+  const request = getV2Config(resolved).requests.find((candidate) => candidate.id === requestId);
+  if (!request || request.kind !== kind) {
+    throw new TRPCError({ code: "NOT_FOUND", message: "Named request not found" });
+  }
+  return request;
+};
+
+const getCacheKey = (
+  resolved: ResolvedDefinition,
+  request: CustomJsxRequest,
+  params: Record<string, string | number | boolean>,
+) => {
+  const digest = hashRuntimeParams(params);
+  return `custom-jsx:${resolved.item.id}:${request.id}:${digest}`;
+};
+
+const assertUpstreamSuccess = (response: { ok: boolean; status: number; statusText: string }) => {
+  if (!response.ok) {
+    throw new TRPCError({ code: "BAD_GATEWAY", message: `API returned ${response.status}: ${response.statusText}` });
+  }
+};
+
+const withRequestLimit = async <T>(
+  ctx: RouterContext,
+  resolved: ResolvedDefinition,
+  category: "query" | "action" | "delete",
+  callback: () => Promise<T>,
+) => {
+  const release = await acquireCustomWidgetRequestLimit({
+    category,
+    userId: ctx.session?.user.id,
+    itemId: resolved.item.id,
+    definitionId: resolved.definition.id,
+  });
+  try {
+    return await callback();
+  } finally {
+    await release();
+  }
+};
 
 export const customApiRouter = createTRPCRouter({
-  getData: protectedProcedure.input(z.object({ definitionId: z.string() })).query(async ({ ctx, input }) => {
-    const definition = await ctx.db.query.customWidgetDefinitions.findFirst({
-      where: eq(customWidgetDefinitions.id, input.definitionId),
-      with: { secrets: true },
-    });
-
-    if (!definition) {
-      throw new TRPCError({ code: "NOT_FOUND", message: "Custom widget definition not found" });
-    }
-
-    if (!definition.enabled) {
-      return { type: "disabled" };
-    }
-
-    let displayConfig: Record<string, unknown>;
-    try {
-      displayConfig = superjson.parse(definition.displayConfig) as Record<string, unknown>;
-    } catch {
-      throw new TRPCError({ code: "INTERNAL_SERVER_ERROR", message: "Widget has corrupt display configuration" });
-    }
+  getData: publicProcedure.input(itemInputSchema).query(async ({ ctx, input }) => {
+    const resolved = await resolvePlacedDefinitionAsync(ctx, input.itemId);
+    const { definition, displayConfig } = resolved;
 
     if (definition.displayType === "actionButton") {
-      return extractActionButtonDisplay(displayConfig);
+      return {
+        ...(extractActionButtonDisplay(displayConfig) as Record<string, unknown>),
+        requiresConfirmation: definition.method === "DELETE",
+      };
+    }
+    if (definition.method !== "GET") {
+      return { type: "networkAccessNeedsReview" as const };
     }
 
-    const decryptedSecrets = definition.secrets.map((s) => ({
-      kind: s.kind,
-      value: decryptSecret(s.value),
-    }));
+    const response = await withRequestLimit(ctx, resolved, "query", () =>
+      executeCustomWidgetRequest({
+        baseUrl: definition.url,
+        method: "GET",
+        auth: getAuth(resolved),
+        networkScope: getNetworkScope(displayConfig),
+        kind: "query",
+        cacheKey: `custom-widget:base:${resolved.item.id}`,
+      }),
+    );
+    assertUpstreamSuccess(response);
+    return extractDisplayDataWithFallback(response.data, definition.displayType, displayConfig);
+  }),
 
-    const url = validateUrl(definition.url);
-    const headers = new Headers({ Accept: "application/json" });
+  queryRequest: publicProcedure.input(namedRequestInputSchema).query(async ({ ctx, input }) => {
+    const resolved = await resolvePlacedDefinitionAsync(ctx, input.itemId);
+    const request = findNamedRequest(resolved, input.requestId, "query");
+    const targetUrl = renderRequestTarget(resolved.definition.url, request, input.params);
+    const response = await withRequestLimit(ctx, resolved, "query", () =>
+      executeCustomWidgetRequest({
+        baseUrl: resolved.definition.url,
+        targetUrl,
+        method: "GET",
+        staticHeaders: request.staticHeaders,
+        auth: getAuth(resolved, request.auth),
+        networkScope: getV2Config(resolved).networkScope,
+        kind: "query",
+        cacheKey: getCacheKey(resolved, request, input.params),
+        cacheTtlSeconds: request.cacheTtlSeconds,
+      }),
+    );
+    return {
+      ok: response.ok,
+      status: response.status,
+      statusText: response.statusText,
+      data: response.data,
+      error: response.ok ? undefined : `HTTP ${response.status}: ${response.statusText}`,
+    };
+  }),
 
-    if (definition.method !== "GET" && definition.requestBody) {
-      headers.set("Content-Type", "application/json");
-    }
-
-    applyAuth(headers, url, definition.authType, decryptedSecrets, definition.headerName);
-
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
-
-    try {
-      const response = await fetch(url.toString(), {
-        method: definition.method,
-        headers,
-        body: definition.method !== "GET" ? definition.requestBody : undefined,
-        redirect: "follow",
-        signal: controller.signal,
-      });
-
-      if (!response.ok) {
-        throw new TRPCError({
-          code: "BAD_REQUEST",
-          message: `API returned ${response.status}: ${response.statusText}`,
-        });
+  executeBaseAction: protectedProcedure
+    .input(itemInputSchema.extend({ confirmed: z.boolean().optional() }))
+    .mutation(async ({ ctx, input }) => {
+      const resolved = await resolvePlacedDefinitionAsync(ctx, input.itemId);
+      const { definition } = resolved;
+      if (definition.displayType !== "actionButton") {
+        throw new TRPCError({ code: "BAD_REQUEST", message: "Only actionButton widgets can use this action" });
       }
 
-      const json: unknown = await response.json();
-      return extractDisplayDataWithFallback(json, definition.displayType, displayConfig);
-    } catch (error) {
-      if (error instanceof TRPCError) throw error;
-      logger.error("Failed to fetch custom API data", { definitionId: input.definitionId, error });
-      throw new TRPCError({
-        code: "INTERNAL_SERVER_ERROR",
-        message: error instanceof Error ? error.message : "Failed to fetch data from external API",
-      });
-    } finally {
-      clearTimeout(timeout);
-    }
-  }),
+      const permission: BoardPermission = definition.method === "DELETE" ? "full" : "modify";
+      await throwIfActionForbiddenAsync(ctx, eq(boards.id, resolved.item.boardId), permission);
+      if (definition.method === "DELETE" && input.confirmed !== true) {
+        throw new TRPCError({ code: "PRECONDITION_FAILED", message: "DELETE actions require confirmation" });
+      }
+
+      const response = await withRequestLimit(ctx, resolved, definition.method === "DELETE" ? "delete" : "action", () =>
+        executeCustomWidgetRequest({
+          baseUrl: definition.url,
+          method: definition.method,
+          body: definition.method === "GET" ? undefined : (definition.requestBody ?? undefined),
+          auth: getAuth(resolved),
+          networkScope: getNetworkScope(resolved.displayConfig),
+          kind: definition.method === "GET" ? "query" : "action",
+        }),
+      );
+      return {
+        success: response.ok,
+        error: response.ok ? undefined : `HTTP ${response.status}: ${response.statusText}`,
+        responseInfo: { status: response.status, statusText: response.statusText },
+      };
+    }),
+
+  executeAction: protectedProcedure
+    .input(namedRequestInputSchema.extend({ confirmed: z.boolean().optional() }))
+    .mutation(async ({ ctx, input }) => {
+      const resolved = await resolvePlacedDefinitionAsync(ctx, input.itemId);
+      const request = findNamedRequest(resolved, input.requestId, "action");
+      if (request.method === "DELETE" && input.confirmed !== true) {
+        throw new TRPCError({ code: "PRECONDITION_FAILED", message: "DELETE actions require confirmation" });
+      }
+
+      await throwIfActionForbiddenAsync(
+        ctx,
+        eq(boards.id, resolved.item.boardId),
+        request.minimumBoardPermission as BoardPermission,
+      );
+      const targetUrl = renderRequestTarget(resolved.definition.url, request, input.params);
+      const response = await withRequestLimit(ctx, resolved, request.method === "DELETE" ? "delete" : "action", () =>
+        executeCustomWidgetRequest({
+          baseUrl: resolved.definition.url,
+          targetUrl,
+          method: request.method as CustomWidgetMethod,
+          body: renderRequestBody(request.bodyTemplate, input.params),
+          staticHeaders: request.staticHeaders,
+          auth: getAuth(resolved, request.auth),
+          networkScope: getV2Config(resolved).networkScope,
+          kind: "action",
+        }),
+      );
+      return {
+        ok: response.ok,
+        status: response.status,
+        statusText: response.statusText,
+        data: response.data,
+        error: response.ok ? undefined : `HTTP ${response.status}: ${response.statusText}`,
+      };
+    }),
 });

packages/api/src/router/widgets/releases.ts

@@ -3,6 +3,7 @@ import { escapeForRegEx } from "@tiptap/react";
 import { z } from "zod/v4";
 
 import { decryptSecret } from "@homarr/common/server";
+import { createLogger } from "@homarr/core/infrastructure/logs";
 import { eq } from "@homarr/db";
 import { boards, items, widgetSecrets } from "@homarr/db/schema";
 import { releaseProviderKinds } from "@homarr/definitions";
@@ -11,6 +12,8 @@ import { releasesRequestHandler } from "@homarr/request-handler/releases";
 import { createTRPCRouter, publicProcedure } from "../../trpc";
 import { throwIfActionForbiddenAsync } from "../board/board-access";
 
+const logger = createLogger({ module: "releasesRouter" });
+
 const formatVersionFilterRegex = (versionFilter: z.infer<typeof releaseVersionFilterSchema> | undefined) => {
   if (!versionFilter) return undefined;
 
@@ -71,13 +74,13 @@ export const releasesRouter = createTRPCRouter({
             for (const secret of secrets) {
               try {
                 tokensByProvider.set(secret.kind, decryptSecret(secret.value));
-              } catch {
-                // Skip corrupt secrets
+              } catch (error) {
+                logger.warn("Failed to decrypt widget secret", { itemId: input.itemId, kind: secret.kind, error });
               }
             }
           }
-        } catch {
-          // Access denied or table not yet migrated -- proceed without tokens
+        } catch (error) {
+          logger.warn("Failed to load release widget tokens", { itemId: input.itemId, error });
         }
       }
 

packages/api/src/test/mcp.spec.ts

@@ -3,6 +3,7 @@ import { extractToolsFromProcedures } from "trpc-to-mcp";
 
 import { appRouter } from "../router/app";
 import { boardRouter } from "../router/board";
+import { customWidgetRouter } from "../router/custom-widget/custom-widget-router";
 import { infoRouter } from "../router/info";
 import { inviteRouter } from "../router/invite";
 import { serverSettingsRouter } from "../router/serverSettings";
@@ -13,6 +14,7 @@ vi.mock("@homarr/auth", () => ({}));
 const mcpTestRouter = createTRPCRouter({
   app: appRouter,
   board: boardRouter,
+  customWidget: customWidgetRouter,
   info: infoRouter,
   invite: inviteRouter,
   serverSettings: serverSettingsRouter,
@@ -34,6 +36,19 @@ test("MCP tools should contain expected procedures", () => {
   expect(toolNames).toContain("app_create");
   expect(toolNames).toContain("board_savePartialBoardSettings");
   expect(toolNames).toContain("board_duplicateBoard");
+  expect(toolNames).toContain("customWidget_schema");
+  expect(toolNames).toContain("customWidget_validate");
+  expect(toolNames).toContain("customWidget_all");
+  expect(toolNames).toContain("customWidget_byId");
+  expect(toolNames).toContain("customWidget_readTemplate");
+  expect(toolNames).toContain("customWidget_writeTemplate");
+  expect(toolNames).toContain("customWidget_patchTemplate");
+  expect(toolNames).toContain("customWidget_create");
+  expect(toolNames).toContain("customWidget_import");
+  expect(toolNames).toContain("customWidget_update");
+  expect(toolNames).toContain("customWidget_preview");
+  expect(toolNames).toContain("customWidget_previewQuery");
+  expect(toolNames).toContain("customWidget_simulatePreviewAction");
   expect(toolNames).toContain("info_getInfo");
   expect(toolNames).toContain("invite_getAll");
   expect(toolNames).toContain("serverSettings_getBoardSettings");
@@ -47,3 +62,31 @@ test("MCP tools should have descriptions", () => {
     expect(tool.description, `Tool ${tool.name} should have a description`).toBeTruthy();
   }
 });
+
+test("custom widget public procedures remain available", () => {
+  expect(Object.keys(customWidgetRouter._def.procedures)).toEqual(
+    expect.arrayContaining([
+      "all",
+      "byId",
+      "available",
+      "create",
+      "update",
+      "toggleEnabled",
+      "delete",
+      "duplicate",
+      "export",
+      "import",
+      "schema",
+      "validate",
+      "readTemplate",
+      "writeTemplate",
+      "patchTemplate",
+      "preview",
+      "previewQuery",
+      "previewAction",
+      "simulatePreviewAction",
+      "setPreviewLiveActions",
+      "previewJournal",
+    ]),
+  );
+});

packages/custom-widgets/package.json

@@ -0,0 +1,53 @@
+{
+  "name": "@homarr/custom-widgets",
+  "version": "0.1.0",
+  "private": true,
+  "license": "Apache-2.0",
+  "type": "module",
+  "typesVersions": {
+    "*": {
+      "*": [
+        "src/*"
+      ]
+    }
+  },
+  "exports": {
+    "./core": "./src/core/index.ts",
+    "./jsx": "./src/jsx/index.ts",
+    "./runtime": "./src/runtime/index.ts",
+    "./server": "./src/server/index.ts",
+    "./workbench": "./src/workbench/index.ts"
+  },
+  "scripts": {
+    "clean": "rm -rf .turbo node_modules",
+    "check:architecture": "node ./scripts/check-architecture.mjs",
+    "format": "oxfmt .",
+    "lint": "oxlint",
+    "test": "vitest run",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@mantine/charts": "catalog:",
+    "@mantine/core": "catalog:",
+    "@mantine/dates": "catalog:",
+    "@mantine/hooks": "catalog:",
+    "@tabler/icons-react": "catalog:",
+    "@tanstack/react-query": "catalog:",
+    "acorn": "catalog:",
+    "acorn-jsx": "catalog:",
+    "jsonpath-plus": "catalog:",
+    "react": "catalog:",
+    "undici": "catalog:",
+    "zod": "catalog:"
+  },
+  "devDependencies": {
+    "@homarr/tsconfig": "workspace:^0.1.0",
+    "@types/node": "catalog:",
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
+    "jsdom": "catalog:",
+    "react-dom": "catalog:",
+    "typescript": "catalog:",
+    "vitest": "catalog:"
+  }
+}

packages/custom-widgets/scripts/check-architecture.mjs

@@ -0,0 +1,98 @@
+import { readdir, readFile } from "node:fs/promises";
+import { extname, join, relative, resolve } from "node:path";
+
+const packageRoot = resolve(import.meta.dirname, "..");
+const repositoryRoot = resolve(packageRoot, "../..");
+const sourceRoots = [
+  join(packageRoot, "src"),
+  join(repositoryRoot, "packages/api/src/router/custom-widget"),
+  join(repositoryRoot, "packages/widgets/src/custom-api"),
+  join(repositoryRoot, "apps/nextjs/src/app/[locale]/manage/custom-widgets"),
+];
+const productionFiles = [];
+
+async function collect(directory) {
+  for (const entry of await readdir(directory, { withFileTypes: true })) {
+    const path = join(directory, entry.name);
+    if (entry.isDirectory()) {
+      if (entry.name !== "test") await collect(path);
+    } else if ([".ts", ".tsx"].includes(extname(entry.name)) && !/\.spec\.tsx?$/u.test(entry.name)) {
+      productionFiles.push(path);
+    }
+  }
+}
+
+for (const sourceRoot of sourceRoots) await collect(sourceRoot);
+const failures = [];
+const graph = new Map();
+const algorithmicExceptions = new Map([
+  ["packages/custom-widgets/src/jsx/analyzer.ts", 400],
+  ["packages/custom-widgets/src/jsx/interpreter.tsx", 400],
+]);
+
+for (const file of productionFiles) {
+  const source = await readFile(file, "utf8");
+  const name = relative(repositoryRoot, file);
+  const lineCount = source.trimEnd().split("\n").length;
+  const limit = algorithmicExceptions.get(name) ?? 300;
+  if (lineCount > limit) failures.push(`${name} has ${lineCount} lines (limit ${limit})`);
+  if (file.startsWith(join(packageRoot, "src")) && /from\s+["']@homarr\/(?:api|widgets)(?:\/|["'])/u.test(source)) {
+    failures.push(`${name} imports a forbidden adapter package`);
+  }
+  if (extname(file) === ".tsx" && /(?:runtime|workbench|custom-widgets|custom-api)/u.test(name)) {
+    for (const line of source.split("\n")) {
+      const match = line.match(/>\s*([A-Za-z][A-Za-z0-9 .,!?'-]*)\s*</u);
+      if (match) failures.push(`${name} contains untranslated JSX text: ${JSON.stringify(match[1]?.trim())}`);
+    }
+    if (/\b(?:aria-label|description|label|placeholder|title)=["'][A-Za-z]/u.test(source)) {
+      failures.push(`${name} contains an untranslated user-facing attribute`);
+    }
+  }
+  const dependencies = [];
+  for (const match of source.matchAll(/from\s+["'](\.[^"']+)["']/gu)) {
+    const candidate = resolve(file, "..", match[1]);
+    const resolved = productionFiles.find(
+      (item) =>
+        item === candidate ||
+        item === `${candidate}.ts` ||
+        item === `${candidate}.tsx` ||
+        item === join(candidate, "index.ts"),
+    );
+    if (resolved) dependencies.push(resolved);
+  }
+  graph.set(file, dependencies);
+}
+
+const visiting = new Set();
+const visited = new Set();
+function visit(file, path = []) {
+  if (visiting.has(file)) {
+    failures.push(`circular dependency: ${[...path, file].map((item) => relative(repositoryRoot, item)).join(" -> ")}`);
+    return;
+  }
+  if (visited.has(file)) return;
+  visiting.add(file);
+  for (const dependency of graph.get(file) ?? []) visit(dependency, [...path, file]);
+  visiting.delete(file);
+  visited.add(file);
+}
+for (const file of productionFiles) visit(file);
+
+const widgetAdapter = await readFile(join(repositoryRoot, "packages/widgets/src/custom-api/component.tsx"), "utf8");
+if (!/dynamic\(\(\)\s*=>\s*import\(["']\.\/custom-jsx-display["']\)/u.test(widgetAdapter)) {
+  failures.push("Custom JSX board rendering must remain dynamically loaded");
+}
+const editorAdapter = await readFile(
+  join(repositoryRoot, "apps/nextjs/src/app/[locale]/manage/custom-widgets/_code-editor.tsx"),
+  "utf8",
+);
+if (!/dynamic\(\(\)\s*=>\s*import\(["']@uiw\/react-codemirror["']\)/u.test(editorAdapter)) {
+  failures.push("CodeMirror must remain dynamically loaded");
+}
+
+if (failures.length > 0) {
+  console.error(failures.join("\n"));
+  process.exitCode = 1;
+} else {
+  console.log(`Custom Widgets architecture checks passed for ${productionFiles.length} production modules.`);
+}

packages/custom-widgets/src/core/ai-prompt.ts

@@ -0,0 +1,168 @@
+import { customJsxExamples } from "./examples";
+import { enabledCustomJsxComponents } from "./component-registry";
+
+const PROMPT_HEADER = `You are configuring a Homarr custom widget. Ask a concise clarifying question only when the requested behavior is ambiguous.
+
+For Custom JSX, return a Homarr authoring bundle with exactly two fenced code blocks:
+1. A \`json\` block containing the complete import object. Set \`displayConfig.template\` to \`"__HOMARR_TEMPLATE__"\`.
+2. A \`jsx\` block containing the readable, multiline template with no JSON escaping.
+
+The user can paste both blocks together into Homarr. Homarr combines and validates them before import. For non-Custom-JSX display types, return only the complete JSON block.
+
+## Rules
+- Use \`"$schema": "homarr-custom-widget-v3"\`.
+- \`displayType\` and \`displayConfig.type\` must match.
+- Prefer \`customJsx\` with \`jsxApiVersion: 2\` for custom layouts.
+- The base widget request must use GET. Mutations belong in named action requests.
+- JSX cannot call \`fetch\` or use event handlers. Use SubFetch, ActionButton, ToggleSwitch, and RefreshButton.
+- Version 2 network components reference a literal \`requestId\` and pass only declared \`params\`.
+- SubFetch can reference query requests only. ActionButton and ToggleSwitch can reference action requests only.
+- Prefer the SubFetch function-as-children API for fetched data. The callback receives \`(response, metadata)\` and may return any safe JSX tree. Use SubData only for very small path-based displays.
+- SubFetch owns loading, failure, retry, cancellation, and stale-response handling. The render callback runs only when response data is available.
+- Named request paths are same-origin paths beginning with \`/\`. Do not put credentials in a template or export.
+- Query requests use GET and view permission. POST, PUT, and PATCH actions default to modify. DELETE requires full permission and confirmation.
+- Use only components in the generated component reference below.
+- Template output must fit inside a dashboard widget and remain usable at narrow widths.
+- Return the complete import object, not a template fragment. Preserve unrelated fields from the current configuration.
+- Include stable keys for rendered collections, accessible labels for controls and images, useful empty states, and concise content that works in light and dark themes.
+- Prefer one clear information hierarchy over nested cards. Use ActionButton and ToggleSwitch only when the named action and required permission are declared.
+
+## Named request shape
+\`\`\`ts
+interface CustomJsxRequest {
+  id: string;
+  kind: "query" | "action";
+  method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+  pathTemplate: \`/\${string}\`;
+  parameters: Record<string, "string" | "number" | "boolean">;
+  bodyTemplate?: unknown;
+  staticHeaders?: Record<string, string>;
+  auth: "inherit" | "none";
+  minimumBoardPermission: "view" | "modify" | "full";
+  cacheTtlSeconds?: number;
+}
+\`\`\`
+
+Path parameters use \`{name}\`. JSON body parameters use \`{ "$param": "name" }\` and preserve the declared type.
+
+## SubFetch rendering
+Use a render child when a named query needs its own layout:
+
+\`\`\`jsx
+<SubFetch requestId="service-detail" params={{ id: data.serviceId }}>
+  {(detail, meta) =>
+    <Stack gap="xs">
+      <Group justify="space-between">
+        <Text fw={700}>{detail.name}</Text>
+        <Badge color={meta.ok ? "green" : "red"}>HTTP {meta.status}</Badge>
+      </Group>
+      {detail.metrics.map((metric) =>
+        <Group key={metric.name} justify="space-between">
+          <Text size="sm">{metric.name}</Text>
+          <Text fw={600}>{metric.value}</Text>
+        </Group>
+      )}
+    </Stack>
+  }
+</SubFetch>
+\`\`\`
+
+The callback is an interpreter-managed inline arrow function. Do not use native callbacks, event handlers, global state, or direct network access. Keep list keys stable and design for narrow and wide widget sizes.
+`;
+
+const PROMPT_NO_RESPONSE = `No sample response is available. Leave this marker in your reasoning and ask the user for a representative response if its shape is required:
+
+\`\`\`json
+PASTE_API_RESPONSE_HERE
+\`\`\`
+`;
+
+function buildComponentReference() {
+  const categories = new Map<string, string[]>();
+  for (const component of enabledCustomJsxComponents) {
+    const names = categories.get(component.category) ?? [];
+    names.push(component.name);
+    categories.set(component.category, names);
+  }
+
+  return [...categories.entries()].map(([category, names]) => `- ${category}: ${names.join(", ")}`).join("\n");
+}
+
+function buildExamples() {
+  return customJsxExamples
+    .map(
+      (example) => `### ${example.title}
+${example.description}
+\`\`\`json
+${JSON.stringify(
+  {
+    displayType: "customJsx",
+    displayConfig: {
+      type: "customJsx",
+      jsxApiVersion: 2,
+      networkScope: "public",
+      template: "__HOMARR_TEMPLATE__",
+      requests: example.requests,
+    },
+  },
+  null,
+  2,
+)}
+\`\`\`
+\`\`\`jsx
+${example.template}
+\`\`\``,
+    )
+    .join("\n\n");
+}
+
+export function buildCustomWidgetAiPrompt(
+  jsonSchema: unknown,
+  rawResponse?: string | null,
+  currentConfig?: Record<string, unknown> | null,
+) {
+  const responseSection = rawResponse
+    ? `## API response\n\n\`\`\`json\n${rawResponse}\n\`\`\`\n`
+    : `## API response\n\n${PROMPT_NO_RESPONSE}`;
+  const currentDisplayConfig = currentConfig?.displayConfig;
+  const currentTemplate =
+    currentDisplayConfig && typeof currentDisplayConfig === "object" && "template" in currentDisplayConfig
+      ? currentDisplayConfig.template
+      : null;
+  const readableCurrentConfig = currentConfig
+    ? {
+        ...currentConfig,
+        ...(currentTemplate && typeof currentTemplate === "string"
+          ? {
+              displayConfig: {
+                ...(currentDisplayConfig as Record<string, unknown>),
+                template: "__HOMARR_TEMPLATE__",
+              },
+            }
+          : {}),
+      }
+    : null;
+  const configSection = readableCurrentConfig
+    ? `## Current configuration\n\nUse this as the starting point and preserve unrelated settings.\n\n\`\`\`json\n${JSON.stringify(readableCurrentConfig, null, 2)}\n\`\`\`\n${typeof currentTemplate === "string" ? `\n\`\`\`jsx\n${currentTemplate}\n\`\`\`\n` : ""}`
+    : "";
+
+  return `${PROMPT_HEADER}
+## Import schema
+The \`__HOMARR_TEMPLATE__\` value is an authoring transport placeholder. Homarr replaces it with the following JSX block before schema and AST validation.
+
+\`\`\`json
+${JSON.stringify(jsonSchema, null, 2)}
+\`\`\`
+
+## Generated component reference
+${buildComponentReference()}
+
+## Tested examples
+${buildExamples()}
+
+${responseSection}
+${configSection}
+## Requested widget
+Describe what the widget should show and which interactions it needs:
+`;
+}

packages/custom-widgets/src/core/built-in-display-schemas.ts

@@ -0,0 +1,235 @@
+import { z } from "zod/v4";
+
+export const singleValueDisplayConfigSchema = z.object({
+  type: z
+    .literal("singleValue")
+    .describe("Display type discriminator — must be 'singleValue' when displayType is singleValue"),
+  jsonPath: z
+    .string()
+    .min(1)
+    .describe(
+      "JSONPath expression to extract the value from the API response (e.g. $.data.count, $.items[0].name, $.status). Use $ for the root object.",
+    ),
+  label: z
+    .string()
+    .describe("Human-readable label shown alongside the extracted value (e.g. 'CPU Temperature', 'Total Users')"),
+  unit: z
+    .string()
+    .describe("Unit suffix displayed after the value (e.g. '°C', '%', 'GB'). Leave empty string if no unit is needed."),
+  valueSize: z
+    .enum(["sm", "md", "lg", "xl"])
+    .optional()
+    .describe(
+      "Font size of the displayed value: 'sm' (small), 'md' (medium), 'lg' (large, default), 'xl' (extra large)",
+    ),
+  labelPosition: z
+    .enum(["above", "below"])
+    .optional()
+    .describe("Position of the label relative to the value: 'above' or 'below' (default: below)"),
+});
+
+const keyValueMappingSchema = z.object({
+  label: z.string().min(1).describe("Label for this key-value pair (e.g. 'CPU', 'Memory', 'Uptime')"),
+  jsonPath: z
+    .string()
+    .min(1)
+    .describe(
+      "JSONPath expression to extract this value from the API response (e.g. $.cpu.percent, $.memory.used). Use $ for the root object.",
+    ),
+  unit: z
+    .string()
+    .describe("Unit suffix for this value (e.g. '%', 'GB', 'ms'). Leave empty string if no unit is needed."),
+});
+
+export const keyValueDisplayConfigSchema = z.object({
+  type: z.literal("keyValue").describe("Display type discriminator — must be 'keyValue' when displayType is keyValue"),
+  mappings: z
+    .array(keyValueMappingSchema)
+    .min(1)
+    .describe("Array of label/jsonPath/unit mappings — each entry becomes one labeled value in the widget"),
+  layout: z
+    .enum(["list", "grid"])
+    .optional()
+    .describe("Layout style: 'list' (vertical stack, default) or 'grid' (multi-column grid)"),
+  columns: z
+    .number()
+    .int()
+    .min(1)
+    .max(3)
+    .optional()
+    .describe("Number of columns when layout is 'grid' (1–3, default: 2)"),
+});
+
+const tableColumnSchema = z.object({
+  header: z.string().min(1).describe("Column header text shown in the table (e.g. 'Name', 'Status', 'Size')"),
+  jsonPath: z
+    .string()
+    .min(1)
+    .describe(
+      "JSONPath expression relative to each row object to extract the cell value (e.g. $.name, $.status, $.size). Do not include the array path here — that goes in tablePath.",
+    ),
+});
+
+export const tableDisplayConfigSchema = z.object({
+  type: z.literal("table").describe("Display type discriminator — must be 'table' when displayType is table"),
+  tablePath: z
+    .string()
+    .min(1)
+    .describe(
+      "JSONPath expression to the array of row objects in the API response (e.g. $.data.items, $.results, $.users[*])",
+    ),
+  columns: z
+    .array(tableColumnSchema)
+    .min(1)
+    .describe("Column definitions — each column has a header and a jsonPath relative to each row"),
+  striped: z
+    .boolean()
+    .optional()
+    .describe("Whether to alternate row background colors for readability (default: true)"),
+  compact: z.boolean().optional().describe("Whether to use compact row spacing (default: false)"),
+});
+
+const statGridItemSchema = z.object({
+  label: z.string().min(1).describe("Label for this stat card (e.g. 'Movies', 'Series', 'Episodes')"),
+  jsonPath: z
+    .string()
+    .min(1)
+    .describe(
+      "JSONPath expression to extract the stat value from the API response (e.g. $.library.movies, $.counts.series)",
+    ),
+  unit: z.string().describe("Unit suffix for the stat (e.g. '', 'GB', '%'). Leave empty string if no unit is needed."),
+  color: z
+    .string()
+    .optional()
+    .describe("Mantine color name for the stat card (e.g. 'blue', 'green', 'red', 'orange', 'violet'). Default: blue"),
+});
+
+export const statGridDisplayConfigSchema = z.object({
+  type: z.literal("statGrid").describe("Display type discriminator — must be 'statGrid' when displayType is statGrid"),
+  items: z
+    .array(statGridItemSchema)
+    .min(1)
+    .describe("Array of stat cards — each item shows a labeled value in a colored card"),
+  columns: z.number().int().min(1).max(4).optional().describe("Number of columns in the stat grid (1–4, default: 2)"),
+  cardStyle: z
+    .enum(["filled", "outline", "subtle"])
+    .optional()
+    .describe(
+      "Visual style of stat cards: 'filled' (solid background, default), 'outline' (border only), 'subtle' (light tint)",
+    ),
+});
+
+const progressBarItemSchema = z.object({
+  label: z.string().min(1).describe("Label for this progress bar (e.g. 'Disk Usage', 'Memory', 'Quota')"),
+  valuePath: z
+    .string()
+    .min(1)
+    .describe(
+      "JSONPath expression to extract the current value (numerator) from the API response (e.g. $.disk.used, $.memory.used_bytes)",
+    ),
+  maxPath: z
+    .string()
+    .optional()
+    .describe(
+      "JSONPath expression to extract the maximum value (denominator). If omitted, defaults to 100. Use for ratios like used/total (e.g. $.disk.total)",
+    ),
+  unit: z
+    .string()
+    .describe("Unit suffix shown alongside values (e.g. 'GB', 'MB', '%'). Leave empty string if no unit is needed."),
+  color: z
+    .string()
+    .optional()
+    .describe("Mantine color name for the progress bar fill (e.g. 'blue', 'green', 'red'). Default: blue"),
+});
+
+export const progressBarsDisplayConfigSchema = z.object({
+  type: z
+    .literal("progressBars")
+    .describe("Display type discriminator — must be 'progressBars' when displayType is progressBars"),
+  bars: z
+    .array(progressBarItemSchema)
+    .min(1)
+    .describe("Array of progress bar definitions — each bar shows value/max as a visual progress indicator"),
+  showPercentage: z.boolean().optional().describe("Whether to display the percentage next to each bar (default: true)"),
+  barSize: z
+    .enum(["sm", "md", "lg"])
+    .optional()
+    .describe("Height of progress bars: 'sm' (small), 'md' (medium, default), 'lg' (large)"),
+});
+
+const statusIndicatorItemSchema = z.object({
+  label: z.string().min(1).describe("Label for this status indicator (e.g. 'Web Server', 'Database', 'API')"),
+  jsonPath: z
+    .string()
+    .min(1)
+    .describe(
+      "JSONPath expression to extract the status value from the API response (e.g. $.services.web.status, $.health.database)",
+    ),
+  goodValues: z
+    .array(z.string())
+    .min(1)
+    .describe(
+      "Array of string values considered 'healthy/good' — case-insensitive match (e.g. ['online', 'up', 'true', 'healthy', 'ok'])",
+    ),
+});
+
+export const statusIndicatorDisplayConfigSchema = z.object({
+  type: z
+    .literal("statusIndicator")
+    .describe("Display type discriminator — must be 'statusIndicator' when displayType is statusIndicator"),
+  items: z
+    .array(statusIndicatorItemSchema)
+    .min(1)
+    .describe("Array of status indicators — each shows a green dot if the value matches goodValues, red otherwise"),
+  layout: z
+    .enum(["list", "grid"])
+    .optional()
+    .describe("Layout style: 'list' (vertical, default) or 'grid' (multi-column)"),
+  dotSize: z
+    .enum(["sm", "md", "lg"])
+    .optional()
+    .describe("Size of status dots: 'sm' (small), 'md' (medium, default), 'lg' (large)"),
+});
+
+const countGridItemSchema = z.object({
+  label: z.string().min(1).describe("Label for this count (e.g. 'Movies', 'Shows', 'Albums')"),
+  jsonPath: z
+    .string()
+    .min(1)
+    .describe(
+      "JSONPath expression to extract the count value from the API response (e.g. $.counts.movies, $.stats.total)",
+    ),
+  unit: z.string().describe("Unit suffix for the count (e.g. '', 'items'). Leave empty string if no unit is needed."),
+});
+
+export const countGridDisplayConfigSchema = z.object({
+  type: z
+    .literal("countGrid")
+    .describe("Display type discriminator — must be 'countGrid' when displayType is countGrid"),
+  items: z
+    .array(countGridItemSchema)
+    .min(1)
+    .describe("Array of count items — each shows a number with a label in a simple grid (no colors)"),
+  columns: z.number().int().min(2).max(4).optional().describe("Number of columns in the count grid (2–4, default: 2)"),
+  valueSize: z
+    .enum(["sm", "md", "lg"])
+    .optional()
+    .describe("Font size of count values: 'sm' (small), 'md' (medium, default), 'lg' (large)"),
+});
+
+export const rawDisplayConfigSchema = z.object({
+  type: z.literal("raw").describe("Display type discriminator — must be 'raw' when displayType is raw"),
+  jsonPath: z
+    .string()
+    .min(1)
+    .describe(
+      "JSONPath expression to extract the data to display (e.g. $ for entire response, $.data, $.result). The extracted value is pretty-printed as JSON.",
+    ),
+  maxHeight: z
+    .number()
+    .int()
+    .min(50)
+    .max(1000)
+    .optional()
+    .describe("Maximum height of the raw JSON display area in pixels (50–1000, default: 300)"),
+});

packages/custom-widgets/src/core/component-descriptor.ts

@@ -0,0 +1,91 @@
+import { categorySafeProps, commonSafeProps } from "./component-props";
+import type {
+  CustomJsxComponentCategory,
+  CustomJsxComponentPackage,
+  CustomJsxComponentSafety,
+} from "./component-types";
+export type * from "./component-types";
+
+export interface CustomJsxComponentDescriptor {
+  name: string;
+  package: CustomJsxComponentPackage;
+  category: CustomJsxComponentCategory;
+  safety: CustomJsxComponentSafety;
+  supportedProps: readonly string[];
+  subcomponents: readonly string[];
+  accessibilityRequirements: readonly string[];
+  documentationUrl: string;
+  reason?: string;
+}
+
+export const subcomponentsByName: Readonly<Record<string, readonly string[]>> = {
+  Accordion: ["Accordion.Item", "Accordion.Control", "Accordion.Panel"],
+  Avatar: ["Avatar.Group"],
+  Card: ["Card.Section"],
+  Chip: ["Chip.Group"],
+  DataList: ["DataList.Item", "DataList.ItemLabel", "DataList.ItemValue"],
+  EmptyState: ["EmptyState.Indicator", "EmptyState.Title", "EmptyState.Description", "EmptyState.Actions"],
+  Grid: ["Grid.Col"],
+  List: ["List.Item"],
+  Menu: ["Menu.Target", "Menu.Dropdown", "Menu.Item", "Menu.Label", "Menu.Divider"],
+  Progress: ["Progress.Section"],
+  Table: ["Table.Thead", "Table.Tbody", "Table.Tfoot", "Table.Caption", "Table.Tr", "Table.Th", "Table.Td"],
+  Tabs: ["Tabs.List", "Tabs.Tab", "Tabs.Panel"],
+  Timeline: ["Timeline.Item"],
+};
+
+export const accessibilityByCategory: Record<CustomJsxComponentCategory, readonly string[]> = {
+  layout: ["Keep visual order consistent with reading order."],
+  content: ["Provide meaningful text alternatives for non-text content."],
+  feedback: ["Do not rely on color alone to communicate status."],
+  navigation: ["Provide an accessible label for controls without visible text."],
+  charts: ["Include a nearby text summary of the chart data."],
+  dates: ["Include a textual date when the visual calendar carries meaning."],
+  interaction: ["Provide a visible label or aria-label."],
+  network: ["Action labels must describe their effect; destructive actions require confirmation."],
+  blocked: [],
+};
+
+const componentSafeProps: Readonly<Record<string, readonly string[]>> = {
+  "Tabs.List": ["grow"],
+  ScrollArea: ["offsetScrollbars"],
+  SubData: ["alt", "fit"],
+};
+
+export function documentationUrl(packageName: CustomJsxComponentPackage, name: string): string {
+  if (packageName === "@homarr/widgets") return "https://homarr.dev/docs/management/custom-widgets/";
+  const section = packageName === "@mantine/core" ? "core" : packageName === "@mantine/charts" ? "charts" : "dates";
+  const slug = (name.split(".")[0] ?? "")
+    .replace(/([a-z0-9])([A-Z])/g, "$1-$2")
+    .replace(/([A-Z]+)([A-Z][a-z])/g, "$1-$2")
+    .toLowerCase();
+  return `https://mantine.dev/${section}/${slug}/`;
+}
+
+export const describe = (
+  packageName: CustomJsxComponentPackage,
+  category: CustomJsxComponentCategory,
+  safety: CustomJsxComponentSafety,
+  names: readonly string[],
+  reason?: string,
+): CustomJsxComponentDescriptor[] =>
+  names.map((name) => ({
+    name,
+    package: packageName,
+    category,
+    safety,
+    supportedProps:
+      safety === "denied"
+        ? []
+        : [
+            ...new Set<string>([
+              ...commonSafeProps,
+              ...categorySafeProps[category],
+              ...(componentSafeProps[name] ?? []),
+            ]),
+          ],
+    subcomponents: subcomponentsByName[name] ?? [],
+    accessibilityRequirements: accessibilityByCategory[category],
+    documentationUrl: documentationUrl(packageName, name),
+    reason,
+  }));

packages/custom-widgets/src/core/component-props.ts

@@ -0,0 +1,230 @@
+import type { CustomJsxComponentCategory } from "./component-types";
+
+export const commonSafeProps = [
+  "key",
+  "id",
+  "style",
+  "title",
+  "role",
+  "aria-label",
+  "aria-describedby",
+  "aria-hidden",
+  "tabIndex",
+  "w",
+  "h",
+  "miw",
+  "maw",
+  "mih",
+  "mah",
+  "m",
+  "mx",
+  "my",
+  "mt",
+  "mr",
+  "mb",
+  "ml",
+  "p",
+  "px",
+  "py",
+  "pt",
+  "pr",
+  "pb",
+  "pl",
+  "bg",
+  "c",
+  "opacity",
+  "display",
+  "hiddenFrom",
+  "visibleFrom",
+  "bd",
+  "bdrs",
+  "flex",
+  "fz",
+  "fw",
+  "lh",
+  "lts",
+  "ta",
+  "td",
+  "tt",
+  "radius",
+  "shadow",
+  "variant",
+  "color",
+  "size",
+  "withBorder",
+] as const;
+
+export const categorySafeProps: Record<CustomJsxComponentCategory, readonly string[]> = {
+  layout: [
+    "gap",
+    "align",
+    "justify",
+    "wrap",
+    "direction",
+    "grow",
+    "cols",
+    "spacing",
+    "verticalSpacing",
+    "gutter",
+    "span",
+    "offset",
+    "order",
+    "type",
+    "orientation",
+    "withBorder",
+    "shadow",
+    "radius",
+  ],
+  content: [
+    "alt",
+    "src",
+    "href",
+    "target",
+    "rel",
+    "size",
+    "fw",
+    "fs",
+    "td",
+    "tt",
+    "ta",
+    "lts",
+    "lh",
+    "lineClamp",
+    "truncate",
+    "inherit",
+    "gradient",
+    "variant",
+    "color",
+    "value",
+    "prefix",
+    "suffix",
+    "decimalScale",
+    "thousandSeparator",
+    "striped",
+    "highlightOnHover",
+    "withTableBorder",
+    "withColumnBorders",
+    "type",
+    "icon",
+    "image",
+    "order",
+    "fit",
+    "fallbackSrc",
+    "loading",
+    "referrerPolicy",
+    "crossOrigin",
+    "decoding",
+    "draggable",
+    "center",
+    "spacing",
+    "listStyleType",
+  ],
+  feedback: ["color", "variant", "radius", "size", "value", "sections", "label", "animated", "striped"],
+  navigation: [
+    "value",
+    "defaultValue",
+    "active",
+    "label",
+    "description",
+    "leftSection",
+    "rightSection",
+    "opened",
+    "disabled",
+    "multiple",
+    "chevronPosition",
+    "orientation",
+    "keepMounted",
+    "transitionDuration",
+  ],
+  charts: [
+    "data",
+    "dataKey",
+    "series",
+    "type",
+    "curveType",
+    "color",
+    "colors",
+    "withLegend",
+    "withTooltip",
+    "withXAxis",
+    "withYAxis",
+    "withDots",
+    "gridAxis",
+    "unit",
+    "valueFormatter",
+    "strokeWidth",
+    "fillOpacity",
+    "connectNulls",
+    "tooltipAnimationDuration",
+  ],
+  dates: [
+    "date",
+    "defaultDate",
+    "value",
+    "minDate",
+    "maxDate",
+    "locale",
+    "firstDayOfWeek",
+    "weekendDays",
+    "hideOutsideDates",
+    "hideWeekdays",
+    "showWeekNumbers",
+    "numberOfColumns",
+    "level",
+    "size",
+  ],
+  interaction: [
+    "label",
+    "value",
+    "values",
+    "data",
+    "checked",
+    "defaultChecked",
+    "disabled",
+    "readOnly",
+    "color",
+    "variant",
+    "size",
+    "radius",
+    "leftSection",
+    "rightSection",
+    "loading",
+    "min",
+    "max",
+    "step",
+    "total",
+    "page",
+    "pageSize",
+    "defaultTab",
+    "title",
+    "defaultOpen",
+    "type",
+    "fullWidth",
+  ],
+  network: [
+    "requestId",
+    "params",
+    "onParams",
+    "offParams",
+    "initialValue",
+    "label",
+    "loadingLabel",
+    "successMessage",
+    "errorMessage",
+    "confirmMessage",
+    "invalidate",
+    "refreshInterval",
+    "trigger",
+    "render",
+    "path",
+    "as",
+    "fallback",
+    "icon",
+    "color",
+    "variant",
+    "size",
+    "radius",
+    "disabled",
+  ],
+  blocked: [],
+};

packages/custom-widgets/src/core/component-registry-denied.ts

@@ -0,0 +1,218 @@
+import { describe } from "./component-descriptor";
+import type { CustomJsxComponentDescriptor } from "./component-descriptor";
+
+export const customJsxDeniedComponentRegistry: readonly CustomJsxComponentDescriptor[] = [
+  ...describe(
+    "@mantine/core",
+    "blocked",
+    "denied",
+    [
+      "AppShell",
+      "Affix",
+      "ComboboxPopover",
+      "Dialog",
+      "Drawer",
+      "FloatingWindow",
+      "FocusTrap",
+      "Menubar",
+      "Modal",
+      "ModalBase",
+      "Portal",
+      "Popover",
+      "RemoveScroll",
+    ],
+    "Escapes the widget layout or focus boundary",
+  ),
+  ...describe(
+    "@mantine/core",
+    "blocked",
+    "denied",
+    [
+      "AngleSlider",
+      "Autocomplete",
+      "Checkbox",
+      "ColorInput",
+      "ColorPicker",
+      "Combobox",
+      "FileButton",
+      "FileInput",
+      "Input",
+      "InputBase",
+      "JsonInput",
+      "MaskInput",
+      "MultiSelect",
+      "NativeSelect",
+      "NumberInput",
+      "PasswordInput",
+      "PillsInput",
+      "PinInput",
+      "Radio",
+      "Select",
+      "TagsInput",
+      "Textarea",
+      "TextInput",
+      "TreeSelect",
+      "UnstyledButton",
+    ],
+    "Arbitrary form controls are not connected to the declarative action model",
+  ),
+  ...describe(
+    "@mantine/core",
+    "blocked",
+    "denied",
+    ["OverflowList", "Scroller", "Splitter", "TableOfContents"],
+    "Requires callback, document, or layout capabilities that are not exposed to templates",
+  ),
+  ...describe(
+    "@mantine/core",
+    "blocked",
+    "denied",
+    [
+      "AccordionChevron",
+      "ActionIconGroup",
+      "ActionIconGroupSection",
+      "AlphaSlider",
+      "AppShellAside",
+      "AppShellFooter",
+      "AppShellHeader",
+      "AppShellMain",
+      "AppShellNavbar",
+      "AppShellSection",
+      "ButtonGroup",
+      "ButtonGroupSection",
+      "CheckIcon",
+      "CheckboxCard",
+      "CheckboxGroup",
+      "CheckboxIndicator",
+      "CloseIcon",
+      "ColorSchemeScript",
+      "ComboboxChevron",
+      "ComboboxClearButton",
+      "ComboboxDropdown",
+      "ComboboxDropdownTarget",
+      "ComboboxEmpty",
+      "ComboboxEventsTarget",
+      "ComboboxFooter",
+      "ComboboxGroup",
+      "ComboboxHeader",
+      "ComboboxHiddenInput",
+      "ComboboxOption",
+      "ComboboxOptions",
+      "ComboboxPopoverTarget",
+      "ComboboxSearch",
+      "ComboboxTarget",
+      "DirectionProvider",
+      "DrawerBody",
+      "DrawerCloseButton",
+      "DrawerContent",
+      "DrawerHeader",
+      "DrawerOverlay",
+      "DrawerRoot",
+      "DrawerStack",
+      "DrawerTitle",
+      "FlatTreeNode",
+      "FloatingArrow",
+      "FocusTrapInitialFocus",
+      "HeadlessMantineProvider",
+      "HoverCardGroup",
+      "HueSlider",
+      "InlineStyles",
+      "InputClearButton",
+      "InputClearSection",
+      "InputDescription",
+      "InputError",
+      "InputLabel",
+      "InputPlaceholder",
+      "InputSuccess",
+      "InputWrapper",
+      "MantineProvider",
+      "MantineThemeProvider",
+      "MenuCheckboxGroup",
+      "MenuCheckboxItem",
+      "MenuContextMenu",
+      "MenuRadioGroup",
+      "MenuRadioItem",
+      "MenuSearch",
+      "MenuSub",
+      "MenuSubDropdown",
+      "MenuSubItem",
+      "MenuSubTarget",
+      "MenubarDropdown",
+      "MenubarMenu",
+      "MenubarTarget",
+      "ModalBaseBody",
+      "ModalBaseCloseButton",
+      "ModalBaseContent",
+      "ModalBaseHeader",
+      "ModalBaseOverlay",
+      "ModalBaseTitle",
+      "ModalBody",
+      "ModalCloseButton",
+      "ModalContent",
+      "ModalHeader",
+      "ModalOverlay",
+      "ModalRoot",
+      "ModalStack",
+      "ModalTitle",
+      "NativeScrollArea",
+      "OptionalPortal",
+      "OptionsDropdown",
+      "PaginationControl",
+      "PaginationDots",
+      "PaginationFirst",
+      "PaginationItems",
+      "PaginationLabel",
+      "PaginationLast",
+      "PaginationNext",
+      "PaginationPrevious",
+      "PaginationRoot",
+      "PillGroup",
+      "PillsInputField",
+      "PopoverContextMenu",
+      "PopoverDropdown",
+      "PopoverTarget",
+      "ProgressLabel",
+      "ProgressRoot",
+      "RadioCard",
+      "RadioGroup",
+      "RadioIcon",
+      "RadioIndicator",
+      "RangeSlider",
+      "ScrollAreaAutosize",
+      "SplitterPane",
+      "StepperCompleted",
+      "SwitchGroup",
+      "TableScrollContainer",
+      "TooltipFloating",
+      "TooltipGroup",
+      "TreeSelectOption",
+    ],
+    "Internal, provider, compound-control, form, portal, or document-level export outside the safe declarative surface",
+  ),
+  ...describe(
+    "@mantine/charts",
+    "blocked",
+    "denied",
+    ["AreaGradient"],
+    "Low-level chart implementation helper that is not a standalone declarative display component",
+  ),
+  ...describe(
+    "@mantine/dates",
+    "blocked",
+    "denied",
+    [
+      "DatesProvider",
+      "HiddenDatesInput",
+      "TimeInput",
+      "TimePicker",
+      "PickerInputBase",
+      "DateInput",
+      "DateTimePicker",
+      "InlineDateTimePicker",
+      "YearPickerInput",
+      "MonthPickerInput",
+      "DatePickerInput",
+    ],
+    "Input and provider components are outside the read-only template surface",
+  ),
+];

packages/custom-widgets/src/core/component-registry-enabled.ts

@@ -0,0 +1,192 @@
+/**
+ * The source of truth for the Custom JSX public component surface.
+ *
+ * Components marked `wrapped` require a runtime wrapper that removes unsafe props
+ * or supplies inert/read-only behavior. `denied` entries are deliberately kept in
+ * the registry so Mantine upgrades cannot silently expand the template surface.
+ */
+export const customJsxEnabledComponentRegistry: readonly CustomJsxComponentDescriptor[] = [
+  ...describe("@mantine/core", "layout", "allowed", [
+    "Box",
+    "Stack",
+    "Group",
+    "Flex",
+    "Grid",
+    "Grid.Col",
+    "SimpleGrid",
+    "Center",
+    "Space",
+    "Container",
+    "AspectRatio",
+    "ScrollArea",
+    "Paper",
+    "Card",
+    "Card.Section",
+    "Divider",
+    "Fieldset",
+    "VisuallyHidden",
+    "Typography",
+    "FloatingIndicator",
+  ]),
+  ...describe("@mantine/core", "content", "allowed", [
+    "Text",
+    "Title",
+    "Code",
+    "Highlight",
+    "Mark",
+    "Kbd",
+    "Blockquote",
+    "NumberFormatter",
+    "Badge",
+    "ThemeIcon",
+    "ColorSwatch",
+    "Table",
+    "Table.Thead",
+    "Table.Tbody",
+    "Table.Tfoot",
+    "Table.Caption",
+    "Table.Tr",
+    "Table.Th",
+    "Table.Td",
+    "List",
+    "List.Item",
+    "Timeline",
+    "Timeline.Item",
+    "Indicator",
+    "Pill",
+    "Image",
+    "Avatar",
+    "Avatar.Group",
+    "BackgroundImage",
+    "DataList",
+    "DataList.Item",
+    "DataList.ItemLabel",
+    "DataList.ItemValue",
+    "EmptyState",
+    "EmptyState.Indicator",
+    "EmptyState.Title",
+    "EmptyState.Description",
+    "EmptyState.Actions",
+    "Marquee",
+    "RollingNumber",
+  ]),
+  ...describe("@mantine/core", "feedback", "allowed", [
+    "Alert",
+    "Progress",
+    "Progress.Section",
+    "RingProgress",
+    "SemiCircleProgress",
+    "Skeleton",
+    "Loader",
+  ]),
+  ...describe("@mantine/core", "feedback", "wrapped", ["Notification", "LoadingOverlay", "Overlay"]),
+  ...describe("@mantine/core", "navigation", "allowed", [
+    "Accordion",
+    "Accordion.Item",
+    "Accordion.Control",
+    "Accordion.Panel",
+    "Tabs",
+    "Tabs.List",
+    "Tabs.Tab",
+    "Tabs.Panel",
+    "Stepper.Step",
+    "HoverCard",
+    "HoverCard.Target",
+    "HoverCard.Dropdown",
+    "Menu",
+    "Menu.Target",
+    "Menu.Dropdown",
+    "Menu.Item",
+    "Menu.Label",
+    "Menu.Divider",
+    "Tooltip",
+    "Spoiler",
+    "Collapse",
+    "Transition",
+  ]),
+  ...describe("@mantine/core", "navigation", "wrapped", ["Anchor", "NavLink", "Breadcrumbs", "Stepper", "Tree"]),
+  ...describe("@mantine/core", "interaction", "wrapped", [
+    "Button",
+    "ActionIcon",
+    "Burger",
+    "CloseButton",
+    "Chip",
+    "Chip.Group",
+    "CopyButton",
+    "Pagination",
+    "Rating",
+    "SegmentedControl",
+    "Slider",
+    "Switch",
+  ]),
+  ...describe("@mantine/charts", "charts", "allowed", [
+    "AreaChart",
+    "BarChart",
+    "BarsList",
+    "BubbleChart",
+    "ChartLegend",
+    "ChartTooltip",
+    "CompositeChart",
+    "DonutChart",
+    "FunnelChart",
+    "Heatmap",
+    "LineChart",
+    "PieChart",
+    "RadarChart",
+    "RadialBarChart",
+    "SankeyChart",
+    "ScatterChart",
+    "Sparkline",
+    "Treemap",
+  ]),
+  ...describe("@mantine/dates", "dates", "wrapped", [
+    "Calendar",
+    "MiniCalendar",
+    "DatePicker",
+    "Day",
+    "WeekdaysRow",
+    "Month",
+    "CalendarHeader",
+    "YearPicker",
+    "MonthPicker",
+    "TimeGrid",
+    "PickerControl",
+    "YearsList",
+    "MonthsList",
+    "DecadeLevel",
+    "YearLevel",
+    "MonthLevel",
+    "LevelsGroup",
+    "DecadeLevelGroup",
+    "YearLevelGroup",
+    "MonthLevelGroup",
+  ]),
+  ...describe("@mantine/dates", "dates", "allowed", ["TimeValue"]),
+  ...describe("@homarr/widgets", "interaction", "allowed", [
+    "PaginatedList",
+    "TabsContainer",
+    "TabPanel",
+    "Collapsible",
+    "StatBar",
+    "TypeBadge",
+  ]),
+  ...describe("@homarr/widgets", "network", "wrapped", [
+    "SubFetch",
+    "SubData",
+    "ActionButton",
+    "ToggleSwitch",
+    "RefreshButton",
+  ]),
+  {
+    name: "TablerIcon",
+    package: "@homarr/widgets",
+    category: "content",
+    safety: "wrapped",
+    supportedProps: ["name", "size", "color", "stroke"],
+    subcomponents: [],
+    accessibilityRequirements: accessibilityByCategory.content,
+    documentationUrl: documentationUrl("@homarr/widgets", "TablerIcon"),
+  },
+];
+import { accessibilityByCategory, describe, documentationUrl } from "./component-descriptor";
+import type { CustomJsxComponentDescriptor } from "./component-descriptor";

packages/custom-widgets/src/core/component-registry.ts

@@ -0,0 +1,19 @@
+export type {
+  CustomJsxComponentCategory,
+  CustomJsxComponentDescriptor,
+  CustomJsxComponentPackage,
+  CustomJsxComponentSafety,
+} from "./component-descriptor";
+
+import { customJsxDeniedComponentRegistry } from "./component-registry-denied";
+import { customJsxEnabledComponentRegistry } from "./component-registry-enabled";
+
+export const customJsxComponentRegistry = [
+  ...customJsxEnabledComponentRegistry,
+  ...customJsxDeniedComponentRegistry,
+] as const;
+export const enabledCustomJsxComponents = customJsxEnabledComponentRegistry;
+export const customJsxComponentByName = new Map(customJsxComponentRegistry.map((entry) => [entry.name, entry]));
+export const customJsxSupportedPropsByName = new Map(
+  customJsxComponentRegistry.map((entry) => [entry.name, new Set(entry.supportedProps)]),
+);

packages/custom-widgets/src/core/component-types.ts

@@ -0,0 +1,12 @@
+export type CustomJsxComponentPackage = "@mantine/core" | "@mantine/charts" | "@mantine/dates" | "@homarr/widgets";
+export type CustomJsxComponentSafety = "allowed" | "wrapped" | "denied";
+export type CustomJsxComponentCategory =
+  | "layout"
+  | "content"
+  | "feedback"
+  | "navigation"
+  | "charts"
+  | "dates"
+  | "interaction"
+  | "network"
+  | "blocked";

packages/custom-widgets/src/core/custom-jsx-schema.ts

@@ -0,0 +1,263 @@
+import { z } from "zod/v4";
+
+import { validateCustomJsxTemplate } from "../jsx/analyzer";
+import { customWidgetMethods } from "./schema-types";
+
+export const customJsxNetworkScopes = ["public", "private", "loopback"] as const;
+export type CustomJsxNetworkScope = (typeof customJsxNetworkScopes)[number];
+
+export const customJsxRequestParameterTypes = ["string", "number", "boolean"] as const;
+export type CustomJsxRequestParameterType = (typeof customJsxRequestParameterTypes)[number];
+
+const requestIdSchema = z
+  .string()
+  .min(1)
+  .max(64)
+  .regex(
+    /^[a-z][a-z0-9_-]*$/,
+    "Request IDs must start with a letter and contain only lowercase letters, numbers, - or _",
+  );
+
+const requestParametersSchema = z
+  .record(requestIdSchema, z.enum(customJsxRequestParameterTypes))
+  .refine((parameters) => Object.keys(parameters).length <= 32, "A request can declare at most 32 parameters");
+
+const reservedRequestHeaders = new Set([
+  "authorization",
+  "connection",
+  "content-length",
+  "cookie",
+  "expect",
+  "forwarded",
+  "host",
+  "keep-alive",
+  "proxy-authenticate",
+  "proxy-authorization",
+  "te",
+  "trailer",
+  "transfer-encoding",
+  "upgrade",
+  "via",
+]);
+
+const staticHeadersSchema = z
+  .record(z.string().min(1).max(128), z.string().max(8192))
+  .refine((headers) => Object.keys(headers).length <= 32, "A request can declare at most 32 static headers")
+  .refine(
+    (headers) =>
+      Object.keys(headers).every((name) => {
+        const normalized = name.trim().toLowerCase();
+        return (
+          !reservedRequestHeaders.has(normalized) &&
+          !normalized.startsWith("proxy-") &&
+          !normalized.startsWith("sec-") &&
+          !normalized.startsWith("x-forwarded-")
+        );
+      }),
+    "Static headers cannot override authentication, cookies, routing, forwarding, proxy, or hop-by-hop headers",
+  );
+
+const collectBodyParameterNames = (value: unknown, result = new Set<string>()): Set<string> => {
+  if (Array.isArray(value)) {
+    value.forEach((entry) => collectBodyParameterNames(entry, result));
+    return result;
+  }
+  if (value === null || typeof value !== "object") return result;
+  const entries = Object.entries(value);
+  if (entries.length === 1 && entries[0]?.[0] === "$param" && typeof entries[0][1] === "string") {
+    result.add(entries[0][1]);
+    return result;
+  }
+  entries.forEach(([, entry]) => collectBodyParameterNames(entry, result));
+  return result;
+};
+
+export const customJsxRequestSchema = z
+  .object({
+    id: requestIdSchema,
+    kind: z.enum(["query", "action"]),
+    method: z.enum(customWidgetMethods),
+    pathTemplate: z
+      .string()
+      .min(1)
+      .max(2048)
+      .startsWith("/")
+      .refine((path) => !path.startsWith("//"), "Path templates must be same-origin paths")
+      .refine((path) => !path.includes("\\"), "Path templates cannot contain backslashes")
+      .refine((path) => !path.includes("#"), "Path templates cannot contain URL fragments"),
+    parameters: requestParametersSchema,
+    bodyTemplate: z.json().optional(),
+    staticHeaders: staticHeadersSchema.optional(),
+    auth: z.enum(["inherit", "none"]),
+    minimumBoardPermission: z.enum(["view", "modify", "full"]),
+    cacheTtlSeconds: z.number().int().min(0).max(3600).optional(),
+    allowViewerExecution: z.literal(true).optional(),
+  })
+  .superRefine((request, ctx) => {
+    if (request.kind === "query" && request.method !== "GET") {
+      ctx.addIssue({
+        code: "custom",
+        path: ["method"],
+        message: "Query requests must use GET",
+      });
+    }
+
+    if (request.kind === "action" && request.method === "GET") {
+      ctx.addIssue({
+        code: "custom",
+        path: ["method"],
+        message: "Action requests must use POST, PUT, PATCH, or DELETE",
+      });
+    }
+
+    if (request.kind === "query" && request.minimumBoardPermission !== "view") {
+      ctx.addIssue({
+        code: "custom",
+        path: ["minimumBoardPermission"],
+        message: "Query requests use view permission",
+      });
+    }
+
+    if (request.method === "DELETE" && request.minimumBoardPermission !== "full") {
+      ctx.addIssue({
+        code: "custom",
+        path: ["minimumBoardPermission"],
+        message: "DELETE actions require full board permission",
+      });
+    }
+
+    if (
+      request.kind === "action" &&
+      request.method !== "DELETE" &&
+      request.minimumBoardPermission === "view" &&
+      request.allowViewerExecution !== true
+    ) {
+      ctx.addIssue({
+        code: "custom",
+        path: ["allowViewerExecution"],
+        message: "Viewer actions require explicit allowViewerExecution approval",
+      });
+    }
+
+    if (request.kind === "query" && request.bodyTemplate !== undefined) {
+      ctx.addIssue({
+        code: "custom",
+        path: ["bodyTemplate"],
+        message: "GET query requests cannot define a request body",
+      });
+    }
+
+    if (request.kind === "action" && request.cacheTtlSeconds !== undefined && request.cacheTtlSeconds !== 0) {
+      ctx.addIssue({
+        code: "custom",
+        path: ["cacheTtlSeconds"],
+        message: "Actions cannot be cached",
+      });
+    }
+
+    const declaredParameters = new Set(Object.keys(request.parameters));
+    const pathParameters = [...request.pathTemplate.matchAll(/\{([^{}]+)\}/g)].map((match) => match[1] ?? "");
+    for (const parameter of [...pathParameters, ...collectBodyParameterNames(request.bodyTemplate)]) {
+      if (!declaredParameters.has(parameter)) {
+        ctx.addIssue({
+          code: "custom",
+          path: [request.bodyTemplate === undefined ? "pathTemplate" : "parameters"],
+          message: `Placeholder '${parameter}' is not declared in request parameters`,
+        });
+      }
+    }
+  });
+
+export type CustomJsxRequest = z.infer<typeof customJsxRequestSchema>;
+
+const customJsxTemplateSchema = z
+  .string()
+  .min(1)
+  .max(50000)
+  .superRefine((template, ctx) => {
+    for (const diagnostic of validateCustomJsxTemplate(template)) {
+      if (diagnostic.severity === "error") {
+        ctx.addIssue({
+          code: "custom",
+          message: `${diagnostic.message} (line ${diagnostic.line}, column ${diagnostic.column})`,
+        });
+      }
+    }
+  })
+  .describe(
+    "JSX template string using whitelisted Mantine components. Access API data via {data.fieldName}. Direct fetch and XMLHttpRequest access are unavailable; v2 templates reference named requests.",
+  );
+
+export const customJsxDisplayConfigV1Schema = z.object({
+  type: z
+    .literal("customJsx")
+    .describe("Display type discriminator — must be 'customJsx' when displayType is customJsx"),
+  template: customJsxTemplateSchema,
+  jsxApiVersion: z.never().optional(),
+  networkScope: z.never().optional(),
+  requests: z.never().optional(),
+});
+
+export const customJsxDisplayConfigV2Schema = z
+  .object({
+    type: z.literal("customJsx"),
+    jsxApiVersion: z.literal(2),
+    template: customJsxTemplateSchema,
+    networkScope: z.enum(customJsxNetworkScopes),
+    requests: z.array(customJsxRequestSchema).max(64),
+  })
+  .superRefine((config, ctx) => {
+    const requestsById = new Map<string, CustomJsxRequest>();
+    for (const [index, request] of config.requests.entries()) {
+      if (requestsById.has(request.id)) {
+        ctx.addIssue({
+          code: "custom",
+          path: ["requests", index, "id"],
+          message: `Duplicate request ID: ${request.id}`,
+        });
+      }
+      requestsById.set(request.id, request);
+    }
+
+    const networkComponentPattern = /<(SubFetch|ActionButton|ToggleSwitch)\b([^>]*)>/g;
+    for (const match of config.template.matchAll(networkComponentPattern)) {
+      const component = match[1] as "SubFetch" | "ActionButton" | "ToggleSwitch";
+      const attributes = match[2] ?? "";
+      const idMatch = attributes.match(/\brequestId\s*=\s*(?:"([^"]+)"|'([^']+)')/);
+      const requestId = idMatch?.[1] ?? idMatch?.[2];
+      if (!requestId) {
+        ctx.addIssue({
+          code: "custom",
+          path: ["template"],
+          message: `${component} must use a literal requestId`,
+        });
+        continue;
+      }
+
+      const request = requestsById.get(requestId);
+      const expectedKind = component === "SubFetch" ? "query" : "action";
+      if (!request) {
+        ctx.addIssue({
+          code: "custom",
+          path: ["template"],
+          message: `${component} references unknown request '${requestId}'`,
+        });
+      } else if (request.kind !== expectedKind) {
+        ctx.addIssue({
+          code: "custom",
+          path: ["template"],
+          message: `${component} requires a ${expectedKind} request, but '${requestId}' is ${request.kind}`,
+        });
+      }
+
+      if (/\b(?:url|method|headers|body)\s*=/.test(attributes)) {
+        ctx.addIssue({
+          code: "custom",
+          path: ["template"],
+          message: `${component} cannot declare inline network settings`,
+        });
+      }
+    }
+  });
+
+export type CustomJsxDisplayConfigV2 = z.infer<typeof customJsxDisplayConfigV2Schema>;

packages/custom-widgets/src/core/definition-schemas.ts

@@ -0,0 +1,184 @@
+import { z } from "zod/v4";
+
+import type { CustomJsxDisplayConfigV2 } from "./custom-jsx-schema";
+import { displayConfigSchema } from "./display-config-schema";
+import type { DisplayConfig } from "./display-config-schema";
+import {
+  customWidgetAuthTypes,
+  customWidgetDisplayTypes,
+  customWidgetMethods,
+  customWidgetSecretKinds,
+} from "./schema-types";
+import type { CustomWidgetMethod } from "./schema-types";
+
+const displayTypesMatch = (displayType?: string, configType?: string): boolean => {
+  if (!displayType) return true;
+  if (!configType) return true;
+  return displayType === configType;
+};
+
+const displayTypeMatchMessage = {
+  message: "displayType must match displayConfig.type",
+  path: ["displayConfig", "type"],
+};
+
+const isCustomJsxV2 = (config: DisplayConfig | undefined): config is CustomJsxDisplayConfigV2 =>
+  config?.type === "customJsx" && "jsxApiVersion" in config && config.jsxApiVersion === 2;
+
+const validateDefinitionDisplay = (
+  definition: { method?: CustomWidgetMethod; displayType?: string; displayConfig?: DisplayConfig },
+  ctx: z.RefinementCtx,
+) => {
+  if (!displayTypesMatch(definition.displayType, definition.displayConfig?.type)) {
+    ctx.addIssue({
+      code: "custom",
+      message: displayTypeMatchMessage.message,
+      path: displayTypeMatchMessage.path,
+    });
+  }
+
+  if (isCustomJsxV2(definition.displayConfig) && definition.method !== undefined && definition.method !== "GET") {
+    ctx.addIssue({
+      code: "custom",
+      message: "Custom JSX v2 base data requests must use GET; mutations belong in named actions",
+      path: ["method"],
+    });
+  }
+};
+
+const baseDefinitionSchema = z.object({
+  name: z
+    .string()
+    .min(1)
+    .max(128)
+    .describe("Human-readable name for the widget, displayed in the dashboard and management UI"),
+  description: z
+    .string()
+    .max(512)
+    .optional()
+    .describe("Optional longer description of what this widget shows, shown in tooltips and management UI"),
+  iconUrl: z
+    .string()
+    .url()
+    .optional()
+    .describe(
+      "Optional URL to an icon image for the widget (e.g. https://example.com/icon.png). Shown in widget picker.",
+    ),
+  url: z
+    .string()
+    .min(1)
+    .describe(
+      "Full URL to the API endpoint to fetch data from (e.g. https://myapp.local/api/stats). Must include protocol.",
+    ),
+  authType: z
+    .enum(customWidgetAuthTypes)
+    .describe(
+      "Authentication method: 'none' for public APIs, 'bearer' for Bearer token, 'basic' for Basic auth, 'apiKeyHeader' for API key sent as a custom header, 'apiKeyQuery' for API key as query parameter. Secrets are configured separately in the UI.",
+    ),
+  headerName: z
+    .string()
+    .max(256)
+    .optional()
+    .describe(
+      "Custom header or query parameter name for API key auth. For apiKeyHeader: the HTTP header name (default: X-API-Key). For apiKeyQuery: the query param name (default: api_key). Ignored for other auth types.",
+    ),
+  method: z
+    .enum(customWidgetMethods)
+    .describe(
+      "HTTP method for the API request: 'GET' (fetch data, most common), 'POST'/'PUT'/'PATCH' (with optional requestBody), 'DELETE' (destructive actions)",
+    ),
+  requestBody: z
+    .string()
+    .optional()
+    .describe(
+      'JSON string body sent with POST/PUT/PATCH requests. Must be valid JSON as a string (e.g. \'{"action":"restart"}\'). Omit for GET requests.',
+    ),
+  displayType: z
+    .enum(customWidgetDisplayTypes)
+    .describe(
+      "How to render the API response: 'singleValue' (one big number/text), 'keyValue' (labeled pairs), 'table' (rows/columns), 'statGrid' (colored stat cards), 'progressBars' (usage bars), 'statusIndicator' (health dots), 'countGrid' (simple counts), 'raw' (JSON debug view), 'actionButton' (clickable action), 'customJsx' (custom JSX template with Mantine components)",
+    ),
+  displayConfig: displayConfigSchema,
+});
+
+const secretsInputSchema = z.array(
+  z.object({
+    kind: z
+      .enum(customWidgetSecretKinds)
+      .describe(
+        "Secret type: 'apiKey' (token/key for bearer/apiKey auth), 'username' (for basic auth), 'password' (for basic auth)",
+      ),
+    value: z
+      .string()
+      .min(1)
+      .describe("The secret value. Never include in exported JSON — configure in the UI after import."),
+  }),
+);
+
+export const customWidgetCreateSchema = baseDefinitionSchema
+  .extend({ secrets: secretsInputSchema })
+  .superRefine(validateDefinitionDisplay);
+
+export const customWidgetUpdateSchema = baseDefinitionSchema
+  .partial()
+  .extend({ id: z.string(), secrets: secretsInputSchema.optional() })
+  .superRefine(validateDefinitionDisplay);
+
+const customWidgetImportFieldsSchema = z.object({
+  name: z
+    .string()
+    .min(1)
+    .max(128)
+    .describe("Human-readable name for the widget, displayed in the dashboard and management UI"),
+  description: z
+    .string()
+    .max(512)
+    .nullish()
+    .describe("Optional longer description of what this widget shows. Use null or omit if not needed."),
+  iconUrl: z
+    .string()
+    .url()
+    .nullish()
+    .describe("Optional URL to an icon image for the widget. Use null or omit if not needed."),
+  authType: z
+    .enum(customWidgetAuthTypes)
+    .describe(
+      "Authentication method: 'none' for public APIs, 'bearer' for Bearer token, 'basic' for Basic auth, 'apiKeyHeader' for API key sent as a custom header, 'apiKeyQuery' for API key as query parameter",
+    ),
+  headerName: z
+    .string()
+    .max(256)
+    .nullish()
+    .describe(
+      "Custom header or query parameter name for API key auth. For apiKeyHeader: HTTP header name (default: X-API-Key). For apiKeyQuery: query param name (default: api_key).",
+    ),
+  method: z
+    .enum(customWidgetMethods)
+    .describe(
+      "HTTP method: 'GET' (fetch data), 'POST'/'PUT'/'PATCH' (with requestBody), 'DELETE' (destructive). Use GET unless the API requires otherwise.",
+    ),
+  requestBody: z.string().nullish().describe("JSON string body for POST/PUT/PATCH. Use null or omit for GET requests."),
+  displayType: z
+    .enum(customWidgetDisplayTypes)
+    .describe(
+      "How to render the API response: 'singleValue', 'keyValue', 'table', 'statGrid', 'progressBars', 'statusIndicator', 'countGrid', 'raw', 'actionButton', or 'customJsx'",
+    ),
+  displayConfig: displayConfigSchema,
+});
+
+export const customWidgetImportSchema = customWidgetImportFieldsSchema
+  .extend({
+    $schema: z
+      .enum(["homarr-custom-widget-v2", "homarr-custom-widget-v3"])
+      .optional()
+      .describe("Schema version identifier. New exports use 'homarr-custom-widget-v3'; v2 remains importable."),
+    url: z
+      .string()
+      .min(1)
+      .describe(
+        "Full URL to the API endpoint to fetch data from (e.g. https://myapp.local/api/stats). Must include protocol.",
+      ),
+  })
+  .superRefine(validateDefinitionDisplay);
+
+export type CustomWidgetImport = z.infer<typeof customWidgetImportSchema>;

packages/custom-widgets/src/core/display-config-schema.ts

@@ -0,0 +1,57 @@
+import { z } from "zod/v4";
+
+import {
+  countGridDisplayConfigSchema,
+  keyValueDisplayConfigSchema,
+  progressBarsDisplayConfigSchema,
+  rawDisplayConfigSchema,
+  singleValueDisplayConfigSchema,
+  statGridDisplayConfigSchema,
+  statusIndicatorDisplayConfigSchema,
+  tableDisplayConfigSchema,
+} from "./built-in-display-schemas";
+import { customJsxDisplayConfigV1Schema, customJsxDisplayConfigV2Schema } from "./custom-jsx-schema";
+
+const actionButtonDisplayConfigSchema = z.object({
+  type: z
+    .literal("actionButton")
+    .describe("Display type discriminator — must be 'actionButton' when displayType is actionButton"),
+  buttonLabel: z
+    .string()
+    .min(1)
+    .describe("Text shown on the action button (e.g. 'Restart Service', 'Clear Cache', 'Run Backup')"),
+  buttonColor: z
+    .string()
+    .optional()
+    .describe("Mantine color name for the button (e.g. 'blue', 'red', 'green'). Default: blue"),
+  confirmText: z
+    .string()
+    .optional()
+    .describe(
+      "If set, shows a confirmation dialog with this message before executing the API request. Omit for immediate execution.",
+    ),
+  successMessage: z
+    .string()
+    .optional()
+    .describe("Notification message shown after successful API execution. Omit for a generic success message."),
+});
+
+export const displayConfigSchema = z
+  .union([
+    singleValueDisplayConfigSchema,
+    keyValueDisplayConfigSchema,
+    tableDisplayConfigSchema,
+    statGridDisplayConfigSchema,
+    progressBarsDisplayConfigSchema,
+    statusIndicatorDisplayConfigSchema,
+    countGridDisplayConfigSchema,
+    rawDisplayConfigSchema,
+    actionButtonDisplayConfigSchema,
+    customJsxDisplayConfigV2Schema,
+    customJsxDisplayConfigV1Schema,
+  ])
+  .describe(
+    "Configuration for how API response data is displayed. The 'type' field MUST match the top-level 'displayType' field exactly. Choose the variant that matches your displayType.",
+  );
+
+export type DisplayConfig = z.infer<typeof displayConfigSchema>;

packages/custom-widgets/src/core/display-data.ts

@@ -0,0 +1,123 @@
+import { JSONPath } from "jsonpath-plus";
+
+import type { DisplayConfig } from "./display-config-schema";
+import type { CustomWidgetDisplayType } from "./schema-types";
+
+export type ExtractedDisplayData = Record<string, unknown>;
+
+const query = (json: unknown, path: string) => JSONPath({ path, json: json as object, wrap: false }) as unknown;
+
+const queryRows = (json: unknown, path: string): unknown[] => {
+  const rows = JSONPath({ path, json: json as object, wrap: true }) as unknown[];
+  return Array.isArray(rows[0]) ? (rows[0] as unknown[]) : rows;
+};
+
+const toNumber = (value: unknown, fallback: number): number => Number(value) || fallback;
+
+export function extractDisplayData(
+  json: unknown,
+  _displayType: CustomWidgetDisplayType,
+  config: DisplayConfig,
+): ExtractedDisplayData {
+  switch (config.type) {
+    case "singleValue":
+      return {
+        ...config,
+        value: query(json, config.jsonPath),
+        valueSize: config.valueSize ?? "lg",
+        labelPosition: config.labelPosition ?? "below",
+      };
+    case "keyValue":
+      return {
+        type: config.type,
+        entries: config.mappings.map((mapping) => ({ ...mapping, value: query(json, mapping.jsonPath) })),
+        layout: config.layout ?? "list",
+        columns: config.columns ?? 2,
+      };
+    case "table": {
+      const rows = queryRows(json, config.tablePath);
+      return {
+        type: config.type,
+        columns: config.columns.map((column) => column.header),
+        rows: rows.map((row) => config.columns.map((column) => query(row, column.jsonPath))),
+        striped: config.striped ?? true,
+        compact: config.compact ?? false,
+      };
+    }
+    case "statGrid":
+      return {
+        type: config.type,
+        items: config.items.map((item) => ({
+          ...item,
+          color: item.color ?? "blue",
+          value: query(json, item.jsonPath),
+        })),
+        columns: config.columns ?? 2,
+        cardStyle: config.cardStyle ?? "filled",
+      };
+    case "progressBars":
+      return {
+        type: config.type,
+        bars: config.bars.map((bar) => ({
+          ...bar,
+          color: bar.color ?? "blue",
+          value: toNumber(query(json, bar.valuePath), 0),
+          max: bar.maxPath ? toNumber(query(json, bar.maxPath), 100) : undefined,
+        })),
+        showPercentage: config.showPercentage ?? true,
+        barSize: config.barSize ?? "md",
+      };
+    case "statusIndicator":
+      return {
+        type: config.type,
+        items: config.items.map((item) => {
+          const value = query(json, item.jsonPath);
+          return {
+            label: item.label,
+            value: String(value ?? "unknown"),
+            isGood: item.goodValues.some((good) => String(value).toLowerCase() === good.toLowerCase()),
+          };
+        }),
+        layout: config.layout ?? "list",
+        dotSize: config.dotSize ?? "md",
+      };
+    case "countGrid":
+      return {
+        type: config.type,
+        items: config.items.map((item) => ({ ...item, value: query(json, item.jsonPath) })),
+        columns: config.columns ?? 2,
+        valueSize: config.valueSize ?? "md",
+      };
+    case "raw":
+      return { type: config.type, data: query(json, config.jsonPath), maxHeight: config.maxHeight ?? 300 };
+    case "actionButton":
+      return {
+        ...config,
+        buttonColor: config.buttonColor ?? "blue",
+        confirmText: config.confirmText ?? "",
+        successMessage: config.successMessage ?? "",
+      };
+    case "customJsx":
+      return {
+        type: config.type,
+        template: config.template,
+        data: json,
+        jsxApiVersion: "jsxApiVersion" in config ? config.jsxApiVersion : 1,
+        requestCapabilities: Array.isArray(config.requests)
+          ? config.requests.map(({ id, kind, method, minimumBoardPermission }) => ({
+              id,
+              kind,
+              method,
+              minimumBoardPermission,
+            }))
+          : [],
+      };
+  }
+}
+
+export const extractDisplayDataWithFallback = extractDisplayData;
+
+export function extractActionButtonDisplay(config: DisplayConfig): ExtractedDisplayData {
+  if (config.type !== "actionButton") throw new Error("Display configuration is not an action button");
+  return extractDisplayData(null, "actionButton", config);
+}

packages/custom-widgets/src/core/display-form.ts

@@ -0,0 +1,258 @@
+import { customJsxExamples } from "./examples";
+import { customJsxRequestSchema, displayConfigSchema } from "./schema";
+import type { DisplayConfig } from "./schema";
+import type { CustomWidgetDisplayType } from "./schema";
+
+function hydrateDisplayFormValues(displayType: string, config: Record<string, unknown>) {
+  const base = {
+    displayType,
+    jsonPath: "$",
+    label: "",
+    unit: "",
+    valueSize: "lg",
+    labelPosition: "below",
+    mappings: [{ label: "", jsonPath: "$", unit: "" }],
+    kvLayout: "list",
+    kvColumns: 2,
+    tablePath: "$",
+    columns: [{ header: "", jsonPath: "$" }],
+    striped: true,
+    compact: false,
+    statGridItems: [{ label: "", jsonPath: "$", unit: "", color: "blue" }],
+    statGridColumns: 2,
+    cardStyle: "filled",
+    progressBars: [{ label: "", valuePath: "$", maxPath: "", unit: "", color: "blue" }],
+    showPercentage: true,
+    barSize: "md",
+    statusItems: [{ label: "", jsonPath: "$", goodValues: "online,true" }],
+    statusLayout: "list",
+    dotSize: "md",
+    countGridItems: [{ label: "", jsonPath: "$", unit: "" }],
+    countGridColumns: 2,
+    countValueSize: "md",
+    rawJsonPath: "$",
+    rawMaxHeight: 300,
+    buttonLabel: "Execute",
+    buttonColor: "blue",
+    confirmText: "",
+    successMessage: "",
+    template: CUSTOM_JSX_STARTER,
+    jsxApiVersion: "2",
+    networkScope: "public",
+    requestManifest: "[]",
+  };
+
+  const typeOverrides: Record<string, () => Record<string, unknown>> = {
+    singleValue: () => ({
+      jsonPath: (config.jsonPath as string) ?? "$",
+      label: (config.label as string) ?? "",
+      unit: (config.unit as string) ?? "",
+      valueSize: (config.valueSize as string) ?? "lg",
+      labelPosition: (config.labelPosition as string) ?? "below",
+    }),
+    keyValue: () => ({
+      mappings: (config.mappings as typeof base.mappings) ?? base.mappings,
+      kvLayout: (config.layout as string) ?? "list",
+      kvColumns: (config.columns as number) ?? 2,
+    }),
+    table: () => ({
+      tablePath: (config.tablePath as string) ?? "$",
+      columns: (config.columns as typeof base.columns) ?? base.columns,
+      striped: (config.striped as boolean) ?? true,
+      compact: (config.compact as boolean) ?? false,
+    }),
+    statGrid: () => ({
+      statGridItems: (config.items as typeof base.statGridItems) ?? base.statGridItems,
+      statGridColumns: (config.columns as number) ?? 2,
+      cardStyle: (config.cardStyle as string) ?? "filled",
+    }),
+    progressBars: () => ({
+      progressBars: (
+        (config.bars as Array<{ label: string; valuePath: string; maxPath?: string; unit: string; color?: string }>) ??
+        []
+      ).map((bar) => ({ ...bar, maxPath: bar.maxPath ?? "", color: bar.color ?? "blue" })),
+      showPercentage: (config.showPercentage as boolean) ?? true,
+      barSize: (config.barSize as string) ?? "md",
+    }),
+    statusIndicator: () => ({
+      statusItems: ((config.items as Array<{ label: string; jsonPath: string; goodValues: string[] }>) ?? []).map(
+        (item) => ({ ...item, goodValues: item.goodValues.join(", ") }),
+      ),
+      statusLayout: (config.layout as string) ?? "list",
+      dotSize: (config.dotSize as string) ?? "md",
+    }),
+    countGrid: () => ({
+      countGridItems: (config.items as typeof base.countGridItems) ?? base.countGridItems,
+      countGridColumns: (config.columns as number) ?? 2,
+      countValueSize: (config.valueSize as string) ?? "md",
+    }),
+    raw: () => ({
+      rawJsonPath: (config.jsonPath as string) ?? "$",
+      rawMaxHeight: (config.maxHeight as number) ?? 300,
+    }),
+    actionButton: () => ({
+      buttonLabel: (config.buttonLabel as string) ?? "Execute",
+      buttonColor: (config.buttonColor as string) ?? "blue",
+      confirmText: (config.confirmText as string) ?? "",
+      successMessage: (config.successMessage as string) ?? "",
+    }),
+    customJsx: () => ({
+      template:
+        typeof config.template === "string" && config.template.trim().length > 0 ? config.template : CUSTOM_JSX_STARTER,
+      jsxApiVersion: String((config.jsxApiVersion as number | undefined) ?? 1),
+      networkScope: (config.networkScope as string) ?? "public",
+      requestManifest: JSON.stringify((config.requests as unknown[] | undefined) ?? [], null, 2),
+    }),
+  };
+
+  return { ...base, ...typeOverrides[displayType]?.() };
+}
+const starterExample = customJsxExamples.find((example) => example.id === "simple-metric");
+if (!starterExample) throw new Error("The simple-metric Custom JSX fixture is required");
+export const CUSTOM_JSX_STARTER = starterExample.template;
+
+export type CustomWidgetDisplayFormValues = ReturnType<typeof hydrateDisplayFormValues>;
+
+const displayConfigBuilders: Record<string, (values: CustomWidgetDisplayFormValues) => Record<string, unknown>> = {
+  singleValue: (values) => ({
+    type: "singleValue",
+    jsonPath: values.jsonPath,
+    label: values.label,
+    unit: values.unit,
+    valueSize: values.valueSize,
+    labelPosition: values.labelPosition,
+  }),
+  keyValue: (values) => ({
+    type: "keyValue",
+    mappings: values.mappings,
+    layout: values.kvLayout,
+    columns: values.kvColumns,
+  }),
+  table: (values) => ({
+    type: "table",
+    tablePath: values.tablePath,
+    columns: values.columns,
+    striped: values.striped,
+    compact: values.compact,
+  }),
+  statGrid: (values) => ({
+    type: "statGrid",
+    items: values.statGridItems,
+    columns: values.statGridColumns,
+    cardStyle: values.cardStyle,
+  }),
+  progressBars: (values) => ({
+    type: "progressBars",
+    bars: values.progressBars.map((bar) => ({ ...bar, maxPath: bar.maxPath || undefined })),
+    showPercentage: values.showPercentage,
+    barSize: values.barSize,
+  }),
+  statusIndicator: (values) => ({
+    type: "statusIndicator",
+    items: values.statusItems.map((item) => ({
+      ...item,
+      goodValues: item.goodValues
+        .split(",")
+        .map((value) => value.trim())
+        .filter(Boolean),
+    })),
+    layout: values.statusLayout,
+    dotSize: values.dotSize,
+  }),
+  countGrid: (values) => ({
+    type: "countGrid",
+    items: values.countGridItems,
+    columns: values.countGridColumns,
+    valueSize: values.countValueSize,
+  }),
+  raw: (values) => ({ type: "raw", jsonPath: values.rawJsonPath, maxHeight: values.rawMaxHeight }),
+  actionButton: (values) => ({
+    type: "actionButton",
+    buttonLabel: values.buttonLabel,
+    buttonColor: values.buttonColor,
+    confirmText: values.confirmText || undefined,
+    successMessage: values.successMessage || undefined,
+  }),
+  customJsx: (values) =>
+    values.jsxApiVersion === "2"
+      ? {
+          type: "customJsx",
+          jsxApiVersion: 2,
+          template: values.template.trim() || CUSTOM_JSX_STARTER,
+          networkScope: values.networkScope,
+          requests: parseRequestManifest(values.requestManifest),
+        }
+      : { type: "customJsx", template: values.template.trim() || CUSTOM_JSX_STARTER },
+};
+
+export type CustomWidgetDisplayIcon =
+  | "action"
+  | "code"
+  | "count"
+  | "grid"
+  | "json"
+  | "keyValue"
+  | "number"
+  | "progress"
+  | "status"
+  | "table";
+
+export interface CustomWidgetDisplayDescriptor {
+  type: CustomWidgetDisplayType;
+  icon: CustomWidgetDisplayIcon;
+  supportsActions: boolean;
+  supportsNamedRequests: boolean;
+  defaults(): CustomWidgetDisplayFormValues;
+  hydrate(config: Record<string, unknown>): CustomWidgetDisplayFormValues;
+  serialize(values: CustomWidgetDisplayFormValues): DisplayConfig;
+  validate(config: unknown): DisplayConfig;
+}
+
+const descriptorMetadata = [
+  ["singleValue", "number", false, false],
+  ["keyValue", "keyValue", false, false],
+  ["table", "table", false, false],
+  ["statGrid", "grid", false, false],
+  ["progressBars", "progress", false, false],
+  ["statusIndicator", "status", false, false],
+  ["countGrid", "count", false, false],
+  ["raw", "json", false, false],
+  ["actionButton", "action", true, false],
+  ["customJsx", "code", true, true],
+] as const satisfies readonly [CustomWidgetDisplayType, CustomWidgetDisplayIcon, boolean, boolean][];
+
+export const customWidgetDisplayDescriptors: readonly CustomWidgetDisplayDescriptor[] = descriptorMetadata.map(
+  ([type, icon, supportsActions, supportsNamedRequests]) => ({
+    type,
+    icon,
+    supportsActions,
+    supportsNamedRequests,
+    defaults: () => hydrateDisplayFormValues(type, {}),
+    hydrate: (config) => hydrateDisplayFormValues(type, config),
+    serialize: (values) => {
+      const build = displayConfigBuilders[type];
+      if (!build) throw new Error(`Unsupported custom-widget display type: ${type}`);
+      return displayConfigSchema.parse(build(values));
+    },
+    validate: (config) => displayConfigSchema.parse(config),
+  }),
+);
+
+export function getCustomWidgetDisplayDescriptor(type: string): CustomWidgetDisplayDescriptor {
+  const descriptor = customWidgetDisplayDescriptors.find((candidate) => candidate.type === type);
+  if (!descriptor) throw new Error(`Unsupported custom-widget display type: ${type}`);
+  return descriptor;
+}
+
+export function buildDisplayFormValues(displayType: string, config: Record<string, unknown>) {
+  return getCustomWidgetDisplayDescriptor(displayType).hydrate(config);
+}
+
+export function buildDisplayConfigFromFormValues(values: CustomWidgetDisplayFormValues): DisplayConfig {
+  return getCustomWidgetDisplayDescriptor(values.displayType).serialize(values);
+}
+
+function parseRequestManifest(value: string) {
+  const parsed: unknown = JSON.parse(value);
+  return customJsxRequestSchema.array().parse(parsed);
+}