From fc2cce87328093012aeb201c9896afc7ca625ab9 Mon Sep 17 00:00:00 2001
From: ValueOn AG <p.motsch@valueon.ch>
Date: Thu, 23 Apr 2026 23:09:54 +0200
Subject: [PATCH 1/6] fixes

---
 src/api.ts                                    |   9 +-
 src/api/trusteeApi.ts                         |  36 +++++-
 .../FormGeneratorReport.module.css            |  47 ++++++++
 .../FormGeneratorReport.tsx                   |  73 ++++++++++++
 src/components/PeriodPicker/PeriodPicker.tsx  |   3 +
 .../PeriodPicker/PeriodPickerLogic.ts         |  25 ++++
 .../PeriodPicker/PeriodPickerPopover.tsx      |  50 ++++++--
 .../PeriodPicker/PeriodPickerTypes.ts         |   2 +
 .../admin/AdminDemoConfigPage.module.css      | 107 ++++++++++++++++++
 src/pages/admin/AdminDemoConfigPage.tsx       | 105 ++++++++++++++++-
 src/pages/admin/AdminLanguagesPage.tsx        |  87 ++++++--------
 src/pages/views/redmine/RedmineStatsView.tsx  |  12 +-
 .../views/trustee/TrusteeDocumentsView.tsx    |   9 +-
 .../views/trustee/TrusteePositionsView.tsx    |   9 +-
 src/pages/views/trustee/index.ts              |   9 +-
 15 files changed, 506 insertions(+), 77 deletions(-)

diff --git a/src/api.ts b/src/api.ts
index 8771019..ac02d60 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -46,7 +46,14 @@ import { getApiBaseUrl } from '../config/config';
 
 const api = axios.create({
     baseURL: getApiBaseUrl(),
-    withCredentials: true
+    withCredentials: true,
+    // FastAPI expects repeat-style array query params (``?ids=1&ids=2``).
+    // Axios v1.x default would render ``?ids[]=1&ids[]=2``, which FastAPI
+    // silently drops -- e.g. ``trackerIds`` filters on the Redmine stats
+    // endpoint never reach the route. Setting ``indexes: null`` switches
+    // the URLSearchParams visitor to repeat format. Applies globally so
+    // every endpoint with array query params gets it for free.
+    paramsSerializer: { indexes: null },
 });
 
 // Add a request interceptor to add the auth token, context headers, and log backend IP
diff --git a/src/api/trusteeApi.ts b/src/api/trusteeApi.ts
index c3eb5da..f21a369 100644
--- a/src/api/trusteeApi.ts
+++ b/src/api/trusteeApi.ts
@@ -853,16 +853,46 @@ export async function fetchChartOfAccounts(
   });
 }
 
+/**
+ * Submits a background job that pushes positions to the accounting system and
+ * polls `/api/jobs/{jobId}` until the job reaches a terminal status. Returns
+ * the same `{ total, success, skipped, errors, results }` payload that the
+ * legacy synchronous endpoint used to return -- but does NOT block the user
+ * while the (potentially long) external accounting calls run in the worker.
+ */
 export async function syncPositionsToAccounting(
   request: ApiRequestFunction,
   instanceId: string,
-  positionIds: string[]
-): Promise<{ total: number; success: number; errors: number; results: any[] }> {
-  return await request({
+  positionIds: string[],
+  opts?: { pollMs?: number; onProgress?: (progress: number, message?: string | null) => void }
+): Promise<{ total: number; success: number; skipped?: number; errors: number; results: any[] }> {
+  const submission = await request({
     url: `${_getTrusteeBaseUrl(instanceId)}/accounting/sync`,
     method: 'post',
     data: { positionIds }
   });
+
+  const jobId: string | undefined = submission?.jobId;
+  if (!jobId) {
+    throw new Error('Background job could not be started (missing jobId).');
+  }
+
+  const pollMs = opts?.pollMs ?? 1500;
+  const TERMINAL = new Set(['SUCCESS', 'ERROR', 'CANCELLED']);
+
+  while (true) {
+    const job = await request({ url: `/api/jobs/${jobId}`, method: 'get' });
+    if (opts?.onProgress) {
+      opts.onProgress(Number(job?.progress ?? 0), job?.progressMessage ?? null);
+    }
+    if (job?.status && TERMINAL.has(job.status)) {
+      if (job.status === 'SUCCESS' && job.result) {
+        return job.result;
+      }
+      throw new Error(job?.errorMessage || 'Sync-Job fehlgeschlagen');
+    }
+    await new Promise((resolve) => setTimeout(resolve, pollMs));
+  }
 }
 
 export async function fetchSyncStatus(
diff --git a/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReport.module.css b/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReport.module.css
index 10a5d63..f516be0 100644
--- a/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReport.module.css
+++ b/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReport.module.css
@@ -109,6 +109,53 @@
   border-color: var(--primary-color, #f25843);
 }
 
+/* --- Multiselect chip group --- */
+
+.chipGroup {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.375rem;
+  flex-wrap: wrap;
+}
+
+.chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.25rem;
+  padding: 0.25rem 0.625rem;
+  border: 1px solid var(--border-color, #333);
+  border-radius: 999px;
+  background: var(--bg-secondary, #2a2a2a);
+  color: var(--text-secondary, #888);
+  font-size: 0.75rem;
+  font-weight: 500;
+  cursor: pointer;
+  user-select: none;
+  transition: background 120ms ease, color 120ms ease, border-color 120ms ease;
+}
+
+.chip:hover {
+  border-color: var(--primary-color, #f25843);
+  color: var(--text-primary, #e0e0e0);
+}
+
+.chipActive {
+  background: var(--primary-color, #4A6FA5);
+  border-color: var(--primary-color, #4A6FA5);
+  color: #fff;
+}
+
+.chipActive:hover {
+  color: #fff;
+  filter: brightness(0.95);
+}
+
+.chipMeta {
+  font-size: 0.7rem;
+  color: var(--text-secondary, #888);
+  margin-left: 0.25rem;
+}
+
 /* --- Sections Grid --- */
 
 .sectionsGrid {
diff --git a/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReport.tsx b/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReport.tsx
index 8f3ff5f..81513fb 100644
--- a/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReport.tsx
+++ b/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReport.tsx
@@ -667,6 +667,12 @@ const _Toolbar: React.FC<ToolbarProps> = ({
               value={(filterState.filters[filter.key] as string) || ''}
               onChange={(e) => _handleFilterChange(filter.key, e.target.value)}
             />
+          ) : filter.type === 'multiselect' ? (
+            <_MultiselectChips
+              filter={filter}
+              value={filterState.filters[filter.key]}
+              onChange={(next) => _handleFilterChange(filter.key, next)}
+            />
           ) : (
             <select
               className={styles.select}
@@ -685,6 +691,73 @@ const _Toolbar: React.FC<ToolbarProps> = ({
   );
 };
 
+// =============================================================================
+// MULTISELECT CHIPS
+// Renders ``multiselect`` filters as inline toggle chips so the user can:
+// - see at a glance which values are active
+// - toggle individual values on/off
+// - reset to "all" with the leading "Alle"-chip
+// Emits the selection upstream as a ``string[]`` matching ``ReportFilterState``.
+// =============================================================================
+
+interface _MultiselectChipsProps {
+  filter: ReportFilterConfig;
+  value: string | string[] | undefined;
+  onChange: (next: string[]) => void;
+}
+
+const _MultiselectChips: React.FC<_MultiselectChipsProps> = ({ filter, value, onChange }) => {
+  const { t } = useLanguage();
+  const selected: Set<string> = useMemo(() => {
+    if (Array.isArray(value)) return new Set(value.map(String));
+    if (typeof value === 'string' && value !== '') return new Set([value]);
+    return new Set<string>();
+  }, [value]);
+
+  const _toggle = (optValue: string) => {
+    const next = new Set(selected);
+    if (next.has(optValue)) next.delete(optValue); else next.add(optValue);
+    onChange(Array.from(next));
+  };
+
+  const _reset = () => onChange([]);
+
+  const allLabel = filter.placeholder || t('Alle');
+  const totalActive = selected.size;
+
+  return (
+    <div className={styles.chipGroup}>
+      <button
+        type="button"
+        className={`${styles.chip} ${totalActive === 0 ? styles.chipActive : ''}`}
+        onClick={_reset}
+        title={allLabel}
+      >
+        {allLabel}
+      </button>
+      {filter.options?.map(opt => {
+        const active = selected.has(opt.value);
+        return (
+          <button
+            key={opt.value}
+            type="button"
+            className={`${styles.chip} ${active ? styles.chipActive : ''}`}
+            onClick={() => _toggle(opt.value)}
+            title={opt.label}
+          >
+            {opt.label}
+          </button>
+        );
+      })}
+      {totalActive > 0 && (
+        <span className={styles.chipMeta}>
+          {t('{n} aktiv', { n: String(totalActive) })}
+        </span>
+      )}
+    </div>
+  );
+};
+
 // =============================================================================
 // MAIN COMPONENT
 // =============================================================================
diff --git a/src/components/PeriodPicker/PeriodPicker.tsx b/src/components/PeriodPicker/PeriodPicker.tsx
index 1b15a4e..00e7eb3 100644
--- a/src/components/PeriodPicker/PeriodPicker.tsx
+++ b/src/components/PeriodPicker/PeriodPicker.tsx
@@ -34,6 +34,9 @@ const _DEFAULT_PRESET: PeriodPreset = { kind: 'ytd' };
 
 function _formatTriggerLabel(value: PeriodValue | null, t: (k: string) => string, placeholder: string): string {
   if (!value) return placeholder;
+  // "Alle" intentionally skips the range suffix: the sentinel dates
+  // (1970-2999) would be noise in the trigger.
+  if (value.preset.kind === 'allTime') return t('Alle');
   const range = `${formatIsoDateDe(value.fromDate)} – ${formatIsoDateDe(value.toDate)}`;
   switch (value.preset.kind) {
     case 'ytd':           return `${t('Laufendes Jahr')} · ${range}`;
diff --git a/src/components/PeriodPicker/PeriodPickerLogic.ts b/src/components/PeriodPicker/PeriodPickerLogic.ts
index 627de6a..da53817 100644
--- a/src/components/PeriodPicker/PeriodPickerLogic.ts
+++ b/src/components/PeriodPicker/PeriodPickerLogic.ts
@@ -84,9 +84,19 @@ function _shiftBy(d: Date, amount: number, unit: PeriodUnit): Date {
 // Preset resolver
 // ---------------------------------------------------------------------------
 
+// Sentinel bounds used when the user picked ``Alle`` (no date filter). We keep
+// the values *inside* ``PeriodValue`` so downstream code that reads
+// ``fromDate``/``toDate`` doesn't break; callers that want to forward "no
+// filter" to the backend should check ``preset.kind === 'allTime'`` and drop
+// the dates explicitly before building the request.
+export const ALL_TIME_FROM = '1970-01-01';
+export const ALL_TIME_TO = '2999-12-31';
+
 export function resolvePeriod(preset: PeriodPreset, prevValue?: PeriodValue | null): { fromDate: string; toDate: string } {
   const today = todayDate();
   switch (preset.kind) {
+    case 'allTime':
+      return { fromDate: ALL_TIME_FROM, toDate: ALL_TIME_TO };
     case 'ytd':
       return { fromDate: toIsoDate(_startOfYear(today)), toDate: toIsoDate(today) };
     case 'lastYear': {
@@ -164,6 +174,20 @@ export function isValueAllowed(value: PeriodValue | null, cfg: PeriodConstraints
   return true;
 }
 
+// Clamp an ISO date to the direction/min/max window defined by ``cfg``. Used
+// for ``<input type="date">`` ``min``/``max`` attributes so the browser
+// refuses invalid years instead of us silently falling back to the default
+// preset afterwards.
+export function clampIsoDate(iso: string | undefined, cfg: PeriodConstraints, side: 'min' | 'max'): string | undefined {
+  const today = toIsoDate(todayDate());
+  let lo: string | undefined = cfg.minDate;
+  let hi: string | undefined = cfg.maxDate;
+  if (cfg.direction === 'past')   hi = hi && hi < today ? hi : today;
+  if (cfg.direction === 'future') lo = lo && lo > today ? lo : today;
+  if (side === 'min') return lo;
+  return hi;
+}
+
 // ---------------------------------------------------------------------------
 // Label formatting
 // ---------------------------------------------------------------------------
@@ -174,6 +198,7 @@ export function isValueAllowed(value: PeriodValue | null, cfg: PeriodConstraints
  */
 export function presetLiteralKey(kind: PeriodPresetKind): string {
   switch (kind) {
+    case 'allTime':       return 'Alle';
     case 'ytd':           return 'Laufendes Jahr';
     case 'lastYear':      return 'Letztes Jahr';
     case 'nextYear':      return 'Nächstes Jahr';
diff --git a/src/components/PeriodPicker/PeriodPickerPopover.tsx b/src/components/PeriodPicker/PeriodPickerPopover.tsx
index a1c521a..f21dd67 100644
--- a/src/components/PeriodPicker/PeriodPickerPopover.tsx
+++ b/src/components/PeriodPicker/PeriodPickerPopover.tsx
@@ -9,6 +9,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useLanguage } from '../../providers/language/LanguageContext';
 import PeriodPickerCalendar from './PeriodPickerCalendar';
 import {
+  clampIsoDate,
   fromIsoDate,
   isPresetDisabled,
   presetLiteralKey,
@@ -27,6 +28,7 @@ import type {
 import styles from './PeriodPicker.module.css';
 
 const PRESETS_ORDER: PeriodPresetKind[] = [
+  'allTime',
   'ytd',
   'lastYear',
   'nextYear',
@@ -41,6 +43,7 @@ const PRESETS_ORDER: PeriodPresetKind[] = [
 
 function _presetLabel(kind: PeriodPresetKind, t: (k: string) => string): string {
   switch (kind) {
+    case 'allTime':       return t('Alle');
     case 'ytd':           return t('Laufendes Jahr');
     case 'lastYear':      return t('Letztes Jahr');
     case 'nextYear':      return t('Nächstes Jahr');
@@ -107,13 +110,21 @@ const PeriodPickerPopover: React.FC<PeriodPickerPopoverProps> = (props) => {
   const _selectPreset = useCallback((kind: PeriodPresetKind) => {
     if (isPresetDisabled(kind, constraints)) return;
     if (kind === 'custom') {
+      // Switching from ``allTime`` back to custom: don't carry the 1970-2999
+      // sentinel. Seed with today/today so the user gets a sensible starting
+      // point and the calendar has a real anchor.
+      const isFromAllTime = draft.preset.kind === 'allTime';
+      const seedFrom = isFromAllTime ? toIsoDate(todayDate()) : draft.fromDate;
+      const seedTo = isFromAllTime ? toIsoDate(todayDate()) : draft.toDate;
       const next: PeriodValue = {
         preset: { kind: 'custom' },
-        fromDate: draft.fromDate,
-        toDate: draft.toDate,
+        fromDate: seedFrom,
+        toDate: seedTo,
       };
       setDraft(next);
       setRangePick({ from: fromIsoDate(next.fromDate), to: fromIsoDate(next.toDate) });
+      const anchor = fromIsoDate(seedFrom);
+      if (anchor) setCalAnchor(startOfMonth(anchor));
       return;
     }
     const preset: PeriodPreset = { kind } as PeriodPreset;
@@ -152,15 +163,32 @@ const PeriodPickerPopover: React.FC<PeriodPickerPopoverProps> = (props) => {
   }, [rangePick]);
 
   const _onFooterFromChange = useCallback((iso: string) => {
+    // Empty string = user cleared the input; ignore so ``draft`` keeps a valid ISO.
+    if (!iso) return;
+    const d = fromIsoDate(iso);
     setDraft((prev) => ({ ...prev, preset: { kind: 'custom' }, fromDate: iso }));
-    setRangePick((prev) => ({ from: fromIsoDate(iso), to: prev.to }));
+    setRangePick((prev) => ({ from: d, to: prev.to }));
+    // Jump the calendar to the typed month so the user immediately sees the
+    // selection move. Without this, the calendar stays on the current month
+    // and it *looks* like the input was ignored.
+    if (d) setCalAnchor(startOfMonth(d));
   }, []);
 
   const _onFooterToChange = useCallback((iso: string) => {
+    if (!iso) return;
+    const d = fromIsoDate(iso);
     setDraft((prev) => ({ ...prev, preset: { kind: 'custom' }, toDate: iso }));
-    setRangePick((prev) => ({ from: prev.from, to: fromIsoDate(iso) }));
+    setRangePick((prev) => ({ from: prev.from, to: d }));
+    if (d) setCalAnchor(startOfMonth(d));
   }, []);
 
+  // ``min``/``max`` on the native date inputs — prevents the user from typing
+  // a date that would be silently reverted by the parent's
+  // ``isValueAllowed`` fallback (which would replace it with ``defaultPreset``
+  // and lose the custom year).
+  const footerMin = clampIsoDate(undefined, constraints, 'min');
+  const footerMax = clampIsoDate(undefined, constraints, 'max');
+
   // Keyboard: Esc cancels, Enter applies
   const popRef = useRef<HTMLDivElement>(null);
   useEffect(() => {
@@ -269,18 +297,20 @@ const PeriodPickerPopover: React.FC<PeriodPickerPopoverProps> = (props) => {
         <input
           type="date"
           className={styles.footerInput}
-          value={draft.fromDate}
-          min={constraints.minDate}
-          max={constraints.maxDate}
+          value={draft.preset.kind === 'allTime' ? '' : draft.fromDate}
+          min={footerMin}
+          max={footerMax}
+          disabled={draft.preset.kind === 'allTime'}
           onChange={(e) => _onFooterFromChange(e.target.value)}
         />
         <span className={styles.footerLabel}>{t('Bis')}</span>
         <input
           type="date"
           className={styles.footerInput}
-          value={draft.toDate}
-          min={constraints.minDate}
-          max={constraints.maxDate}
+          value={draft.preset.kind === 'allTime' ? '' : draft.toDate}
+          min={footerMin}
+          max={footerMax}
+          disabled={draft.preset.kind === 'allTime'}
           onChange={(e) => _onFooterToChange(e.target.value)}
         />
         <span className={styles.spacer} />
diff --git a/src/components/PeriodPicker/PeriodPickerTypes.ts b/src/components/PeriodPicker/PeriodPickerTypes.ts
index e4fd4fe..48d9a17 100644
--- a/src/components/PeriodPicker/PeriodPickerTypes.ts
+++ b/src/components/PeriodPicker/PeriodPickerTypes.ts
@@ -9,6 +9,7 @@
 export type PeriodUnit = 'day' | 'week' | 'month' | 'year';
 
 export type PeriodPresetKind =
+  | 'allTime'
   | 'ytd'
   | 'lastYear'
   | 'nextYear'
@@ -23,6 +24,7 @@ export type PeriodPresetKind =
   | 'custom';
 
 export type PeriodPreset =
+  | { kind: 'allTime' }
   | { kind: 'ytd' }
   | { kind: 'lastYear' }
   | { kind: 'nextYear' }
diff --git a/src/pages/admin/AdminDemoConfigPage.module.css b/src/pages/admin/AdminDemoConfigPage.module.css
index d11aa0f..65a291f 100644
--- a/src/pages/admin/AdminDemoConfigPage.module.css
+++ b/src/pages/admin/AdminDemoConfigPage.module.css
@@ -156,3 +156,110 @@
 .spin {
   animation: spin 1s linear infinite;
 }
+
+.credentialsBox {
+  margin-top: 0.75rem;
+  padding: 0.75rem 0.85rem;
+  border-radius: var(--object-radius-small, 6px);
+  background: var(--bg-secondary, #fff);
+  border: 1px dashed var(--border-color, #cbd5e1);
+  color: var(--text-primary);
+}
+
+.credentialsBoxCompact {
+  margin-top: 0.6rem;
+  padding: 0.5rem 0.65rem;
+  border-radius: var(--object-radius-small, 6px);
+  background: var(--bg-tertiary, #f7f7f8);
+  border: 1px dashed var(--border-color, #cbd5e1);
+  color: var(--text-primary);
+  font-size: 0.78rem;
+}
+
+:global(.dark-theme) .credentialsBox,
+:global(.dark-theme) .credentialsBoxCompact {
+  background: var(--bg-tertiary, #2a2a3a);
+  border-color: var(--border-color, #3d3d4d);
+}
+
+.credentialsHeader {
+  display: flex;
+  align-items: center;
+  gap: 0.4rem;
+  font-weight: 600;
+  font-size: 0.78rem;
+  color: var(--text-secondary);
+  margin-bottom: 0.4rem;
+  text-transform: uppercase;
+  letter-spacing: 0.03em;
+}
+
+.credentialsRow {
+  display: flex;
+  flex-direction: column;
+  gap: 0.25rem;
+}
+
+.credentialsRow + .credentialsRow {
+  margin-top: 0.5rem;
+  padding-top: 0.5rem;
+  border-top: 1px solid var(--border-color, #e2e8f0);
+}
+
+.credentialsRole {
+  font-size: 0.72rem;
+  font-weight: 600;
+  color: var(--text-secondary);
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+}
+
+.credentialsField {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  font-size: 0.82rem;
+}
+
+.credentialsField code {
+  font-family: var(--font-mono, monospace);
+  background: var(--bg-tertiary, #f7f7f8);
+  padding: 1px 6px;
+  border-radius: 4px;
+  font-size: 0.8rem;
+  color: var(--text-primary);
+  word-break: break-all;
+}
+
+:global(.dark-theme) .credentialsField code {
+  background: var(--bg-secondary, #1e1e2e);
+}
+
+.credentialsLabel {
+  min-width: 60px;
+  color: var(--text-secondary);
+  font-size: 0.75rem;
+}
+
+.copyButton {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.25rem;
+  padding: 2px 6px;
+  border-radius: 4px;
+  border: 1px solid var(--border-color, #cbd5e1);
+  background: transparent;
+  color: var(--text-secondary);
+  cursor: pointer;
+  font-size: 0.7rem;
+}
+
+.copyButton:hover:not(:disabled) {
+  background: var(--bg-secondary, #f7f7f8);
+  color: var(--text-primary);
+}
+
+.copyButton:disabled {
+  opacity: 0.4;
+  cursor: not-allowed;
+}
diff --git a/src/pages/admin/AdminDemoConfigPage.tsx b/src/pages/admin/AdminDemoConfigPage.tsx
index dcbac8d..0c683c8 100644
--- a/src/pages/admin/AdminDemoConfigPage.tsx
+++ b/src/pages/admin/AdminDemoConfigPage.tsx
@@ -6,17 +6,25 @@
  */
 
 import React, { useState, useEffect, useCallback } from 'react';
-import { FaPlay, FaTrash, FaSync, FaCubes } from 'react-icons/fa';
+import { FaPlay, FaTrash, FaSync, FaCubes, FaCopy, FaKey } from 'react-icons/fa';
 import api from '../../api';
 import styles from './Admin.module.css';
 import demoStyles from './AdminDemoConfigPage.module.css';
 import { useLanguage } from '../../providers/language/LanguageContext';
 import { useConfirm } from '../../hooks/useConfirm';
 
+interface _DemoCredential {
+  role?: string;
+  username?: string;
+  email?: string;
+  password?: string;
+}
+
 interface _DemoConfig {
   code: string;
   label: string;
   description: string;
+  credentials?: _DemoCredential[];
 }
 
 interface _ActionResult {
@@ -24,6 +32,7 @@ interface _ActionResult {
   action: 'load' | 'remove';
   status: 'ok' | 'error';
   summary?: Record<string, unknown>;
+  credentials?: _DemoCredential[];
   error?: string;
 }
 
@@ -59,7 +68,18 @@ export const AdminDemoConfigPage: React.FC = () => {
     setLastResult(null);
     try {
       const response = await api.post(`/api/admin/demo-config/${code}/load`);
-      setLastResult({ code, action: 'load', status: 'ok', summary: response.data.summary });
+      const summary = (response.data?.summary || {}) as Record<string, unknown>;
+      const credsFromSummary = Array.isArray(summary.credentials)
+        ? (summary.credentials as _DemoCredential[])
+        : undefined;
+      const credsFromConfig = configs.find((c) => c.code === code)?.credentials;
+      setLastResult({
+        code,
+        action: 'load',
+        status: 'ok',
+        summary,
+        credentials: credsFromSummary ?? credsFromConfig,
+      });
     } catch (err: any) {
       setLastResult({ code, action: 'load', status: 'error', error: err.response?.data?.detail || String(err) });
     } finally {
@@ -110,6 +130,9 @@ export const AdminDemoConfigPage: React.FC = () => {
           ) : (
             <span>{lastResult.error}</span>
           )}
+          {lastResult.status === 'ok' && lastResult.action === 'load' && lastResult.credentials && lastResult.credentials.length > 0 && (
+            <_CredentialsBox credentials={lastResult.credentials} />
+          )}
         </div>
       )}
 
@@ -126,6 +149,9 @@ export const AdminDemoConfigPage: React.FC = () => {
                 <h3 className={demoStyles.cardTitle}>{cfg.label}</h3>
                 <p className={demoStyles.cardDescription}>{cfg.description}</p>
                 <span className={demoStyles.cardCode}>{cfg.code}</span>
+                {cfg.credentials && cfg.credentials.length > 0 && (
+                  <_CredentialsBox credentials={cfg.credentials} compact />
+                )}
               </div>
               <div className={demoStyles.cardActions}>
                 <button
@@ -158,7 +184,10 @@ export const AdminDemoConfigPage: React.FC = () => {
 const _SummaryDisplay: React.FC<{ summary?: Record<string, unknown> }> = ({ summary }) => {
   const { t } = useLanguage();
   if (!summary) return null;
-  const sections = Object.entries(summary).filter(([, v]) => Array.isArray(v) && (v as unknown[]).length > 0);
+  // Skip the credentials block here -- it gets its own copyable widget below.
+  const sections = Object.entries(summary)
+    .filter(([key]) => key !== 'credentials')
+    .filter(([, v]) => Array.isArray(v) && (v as unknown[]).length > 0);
   if (sections.length === 0) return <span>{t('Abgeschlossen (keine Änderungen)')}</span>;
   return (
     <span>
@@ -170,3 +199,73 @@ const _SummaryDisplay: React.FC<{ summary?: Record<string, unknown> }> = ({ summ
     </span>
   );
 };
+
+const _CredentialsBox: React.FC<{ credentials: _DemoCredential[]; compact?: boolean }> = ({ credentials, compact }) => {
+  const { t } = useLanguage();
+  const [copiedKey, setCopiedKey] = useState<string | null>(null);
+
+  const _copy = async (key: string, value: string) => {
+    try {
+      await navigator.clipboard.writeText(value);
+      setCopiedKey(key);
+      window.setTimeout(() => setCopiedKey((prev) => (prev === key ? null : prev)), 1500);
+    } catch {
+      // ignore clipboard failures (no permission, http, ...)
+    }
+  };
+
+  return (
+    <div className={compact ? demoStyles.credentialsBoxCompact : demoStyles.credentialsBox}>
+      <div className={demoStyles.credentialsHeader}>
+        <FaKey />
+        <span>{t('Login-Daten')}</span>
+      </div>
+      {credentials.map((cred, idx) => {
+        // Login uses the USERNAME (the email is just informational metadata
+        // about the demo user -- the auth flow keys off `username`).
+        const loginValue = cred.username || '';
+        const pwd = cred.password || '';
+        const rowKey = `${idx}-${loginValue}`;
+        return (
+          <div key={rowKey} className={demoStyles.credentialsRow}>
+            {cred.role && <div className={demoStyles.credentialsRole}>{cred.role}</div>}
+            <div className={demoStyles.credentialsField}>
+              <span className={demoStyles.credentialsLabel}>{t('Login')}:</span>
+              <code>{loginValue}</code>
+              <button
+                type="button"
+                className={demoStyles.copyButton}
+                onClick={() => _copy(`${rowKey}-login`, loginValue)}
+                disabled={!loginValue}
+                title={t('Login kopieren')}
+              >
+                <FaCopy />
+                {copiedKey === `${rowKey}-login` ? ` ${t('kopiert')}` : ''}
+              </button>
+            </div>
+            <div className={demoStyles.credentialsField}>
+              <span className={demoStyles.credentialsLabel}>{t('Passwort')}:</span>
+              <code>{pwd}</code>
+              <button
+                type="button"
+                className={demoStyles.copyButton}
+                onClick={() => _copy(`${rowKey}-pwd`, pwd)}
+                disabled={!pwd}
+                title={t('Passwort kopieren')}
+              >
+                <FaCopy />
+                {copiedKey === `${rowKey}-pwd` ? ` ${t('kopiert')}` : ''}
+              </button>
+            </div>
+            {cred.email && (
+              <div className={demoStyles.credentialsField}>
+                <span className={demoStyles.credentialsLabel}>{t('E-Mail')}:</span>
+                <code>{cred.email}</code>
+              </div>
+            )}
+          </div>
+        );
+      })}
+    </div>
+  );
+};
diff --git a/src/pages/admin/AdminLanguagesPage.tsx b/src/pages/admin/AdminLanguagesPage.tsx
index beb771d..5e74919 100644
--- a/src/pages/admin/AdminLanguagesPage.tsx
+++ b/src/pages/admin/AdminLanguagesPage.tsx
@@ -77,7 +77,13 @@ function _getColumns(t: (key: string) => string): ColumnConfig[] {
   ];
 }
 
-const _PRIORITY_CODES = ['de', 'gsw', 'en', 'fr', 'it'];
+// ISO 639 catalog (codes + native labels + priority order) is provided by the
+// gateway via GET /api/i18n/iso-choices. We must NOT keep a local copy here --
+// any divergence between frontend and backend caused subtle bugs (e.g. user
+// could create a language code that the AI translation prompt did not know how
+// to label). The catalog is fetched once on mount and held in component state.
+type IsoChoice = { value: string; label: string };
+type IsoCatalogResponse = { priorityCodes: string[]; choices: IsoChoice[] };
 
 function _isAbortError(e: unknown): boolean {
   if (axios.isCancel(e)) return true;
@@ -88,55 +94,6 @@ function _isAbortError(e: unknown): boolean {
   return false;
 }
 
-const _isoChoices: { value: string; label: string }[] = [
-  { value: 'de', label: 'de — Deutsch' },
-  { value: 'gsw', label: 'gsw — Schweizerdeutsch' },
-  { value: 'en', label: 'en — English' },
-  { value: 'fr', label: 'fr — Français' }, { value: 'it', label: 'it — Italiano' },
-  { value: 'es', label: 'es — Español' }, { value: 'pt', label: 'pt — Português' },
-  { value: 'nl', label: 'nl — Nederlands' }, { value: 'pl', label: 'pl — Polski' },
-  { value: 'cs', label: 'cs — Čeština' }, { value: 'sk', label: 'sk — Slovenčina' },
-  { value: 'sv', label: 'sv — Svenska' }, { value: 'no', label: 'no — Norsk' },
-  { value: 'da', label: 'da — Dansk' }, { value: 'fi', label: 'fi — Suomi' },
-  { value: 'hu', label: 'hu — Magyar' }, { value: 'ro', label: 'ro — Română' },
-  { value: 'bg', label: 'bg — Български' }, { value: 'hr', label: 'hr — Hrvatski' },
-  { value: 'sl', label: 'sl — Slovenščina' }, { value: 'et', label: 'et — Eesti' },
-  { value: 'lv', label: 'lv — Latviešu' }, { value: 'lt', label: 'lt — Lietuvių' },
-  { value: 'el', label: 'el — Ελληνικά' }, { value: 'tr', label: 'tr — Türkçe' },
-  { value: 'ru', label: 'ru — Русский' }, { value: 'uk', label: 'uk — Українська' },
-  { value: 'ar', label: 'ar — العربية' }, { value: 'he', label: 'he — עברית' },
-  { value: 'zh', label: 'zh — 中文' }, { value: 'ja', label: 'ja — 日本語' },
-  { value: 'ko', label: 'ko — 한국어' }, { value: 'hi', label: 'hi — हिन्दी' },
-  { value: 'th', label: 'th — ไทย' }, { value: 'vi', label: 'vi — Tiếng Việt' },
-  { value: 'id', label: 'id — Bahasa Indonesia' }, { value: 'ms', label: 'ms — Bahasa Melayu' },
-  { value: 'tl', label: 'tl — Filipino' }, { value: 'sw', label: 'sw — Kiswahili' },
-  { value: 'af', label: 'af — Afrikaans' }, { value: 'sq', label: 'sq — Shqip' },
-  { value: 'am', label: 'am — አማርኛ' }, { value: 'hy', label: 'hy — Հայերեն' },
-  { value: 'az', label: 'az — Azərbaycan' }, { value: 'eu', label: 'eu — Euskara' },
-  { value: 'be', label: 'be — Беларуская' }, { value: 'bn', label: 'bn — বাংলা' },
-  { value: 'bs', label: 'bs — Bosanski' }, { value: 'ca', label: 'ca — Català' },
-  { value: 'cy', label: 'cy — Cymraeg' }, { value: 'eo', label: 'eo — Esperanto' },
-  { value: 'fa', label: 'fa — فارسی' }, { value: 'ga', label: 'ga — Gaeilge' },
-  { value: 'gl', label: 'gl — Galego' }, { value: 'gu', label: 'gu — ગુજરાતી' },
-  { value: 'ha', label: 'ha — Hausa' }, { value: 'is', label: 'is — Íslenska' },
-  { value: 'jv', label: 'jv — Basa Jawa' }, { value: 'ka', label: 'ka — ქართული' },
-  { value: 'kk', label: 'kk — Қазақ' }, { value: 'km', label: 'km — ខ្មែរ' },
-  { value: 'kn', label: 'kn — ಕನ್ನಡ' }, { value: 'ku', label: 'ku — Kurdî' },
-  { value: 'ky', label: 'ky — Кыргызча' }, { value: 'la', label: 'la — Latina' },
-  { value: 'lb', label: 'lb — Lëtzebuergesch' }, { value: 'lo', label: 'lo — ລາວ' },
-  { value: 'mk', label: 'mk — Македонски' }, { value: 'ml', label: 'ml — മലയാളം' },
-  { value: 'mn', label: 'mn — Монгол' }, { value: 'mr', label: 'mr — मराठी' },
-  { value: 'mt', label: 'mt — Malti' }, { value: 'my', label: 'my — မြန်မာ' },
-  { value: 'ne', label: 'ne — नेपाली' }, { value: 'or', label: 'or — ଓଡ଼ିଆ' },
-  { value: 'pa', label: 'pa — ਪੰਜਾਬੀ' }, { value: 'ps', label: 'ps — پښتو' },
-  { value: 'si', label: 'si — සිංහල' }, { value: 'so', label: 'so — Soomaali' },
-  { value: 'sr', label: 'sr — Српски' }, { value: 'su', label: 'su — Basa Sunda' },
-  { value: 'ta', label: 'ta — தமிழ்' }, { value: 'te', label: 'te — తెలుగు' },
-  { value: 'tg', label: 'tg — Тоҷикӣ' }, { value: 'tk', label: 'tk — Türkmen' },
-  { value: 'ur', label: 'ur — اردو' }, { value: 'uz', label: 'uz — Oʻzbek' },
-  { value: 'yo', label: 'yo — Yorùbá' }, { value: 'zu', label: 'zu — isiZulu' },
-];
-
 // ---------------------------------------------------------------------------
 // Progress overlay component
 // ---------------------------------------------------------------------------
@@ -327,9 +284,30 @@ export const AdminLanguagesPage: React.FC = () => {
   const [addCode, setAddCode] = useState('');
   const [progress, setProgress] = useState<ProgressInfo | null>(null);
   const [search, setSearch] = useState('');
+  const [isoCatalog, setIsoCatalog] = useState<IsoCatalogResponse>({ priorityCodes: [], choices: [] });
   const busyRef = useRef(false);
   const abortRef = useRef<AbortController | null>(null);
 
+  useEffect(() => {
+    let cancelled = false;
+    (async () => {
+      try {
+        const res = await api.get('/api/i18n/iso-choices');
+        if (cancelled) return;
+        const data = res.data as IsoCatalogResponse;
+        setIsoCatalog({
+          priorityCodes: Array.isArray(data?.priorityCodes) ? data.priorityCodes : [],
+          choices: Array.isArray(data?.choices) ? data.choices : [],
+        });
+      } catch (e) {
+        console.error('Failed to load ISO language catalog from /api/i18n/iso-choices:', e);
+      }
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, []);
+
   const _endProgressSoon = useCallback((ms: number) => {
     window.setTimeout(() => {
       setProgress(null);
@@ -418,17 +396,18 @@ export const AdminLanguagesPage: React.FC = () => {
   const existingCodes = useMemo(() => new Set(rows.map((r) => r.id)), [rows]);
 
   const addChoices = useMemo(() => {
-    const available = _isoChoices.filter((c) => !existingCodes.has(c.value));
+    const available = isoCatalog.choices.filter((c) => !existingCodes.has(c.value));
+    const priority = isoCatalog.priorityCodes;
     available.sort((a, b) => {
-      const aPrio = _PRIORITY_CODES.indexOf(a.value);
-      const bPrio = _PRIORITY_CODES.indexOf(b.value);
+      const aPrio = priority.indexOf(a.value);
+      const bPrio = priority.indexOf(b.value);
       if (aPrio !== -1 && bPrio !== -1) return aPrio - bPrio;
       if (aPrio !== -1) return -1;
       if (bPrio !== -1) return 1;
       return a.label.localeCompare(b.label);
     });
     return available;
-  }, [existingCodes]);
+  }, [existingCodes, isoCatalog]);
 
   useEffect(() => {
     if (addChoices.length > 0 && (!addCode || !addChoices.find((c) => c.value === addCode))) {
diff --git a/src/pages/views/redmine/RedmineStatsView.tsx b/src/pages/views/redmine/RedmineStatsView.tsx
index e8cbfb7..d98f1fe 100644
--- a/src/pages/views/redmine/RedmineStatsView.tsx
+++ b/src/pages/views/redmine/RedmineStatsView.tsx
@@ -273,6 +273,7 @@ export const RedmineStatsView: React.FC = () => {
     direction: 'past',
     defaultPresetKind: 'thisQuarter',
     enabledPresets: [
+      'allTime',
       'thisMonth', 'lastMonth', 'thisQuarter', 'lastQuarter',
       'ytd', 'lastYear', 'last12Months', 'lastN', 'custom',
     ],
@@ -332,8 +333,15 @@ export const RedmineStatsView: React.FC = () => {
 
   const _handleFilterChange = useCallback((filterState: ReportFilterState) => {
     if (filterState.periodValue) {
-      setDateFrom(filterState.periodValue.fromDate);
-      setDateTo(filterState.periodValue.toDate);
+      // "Alle" = no date filter. Drop the sentinel range so the backend
+      // aggregates over the full history instead of clamping to 1970--2999.
+      if (filterState.periodValue.preset.kind === 'allTime') {
+        setDateFrom(undefined);
+        setDateTo(undefined);
+      } else {
+        setDateFrom(filterState.periodValue.fromDate);
+        setDateTo(filterState.periodValue.toDate);
+      }
     } else if (filterState.dateRange) {
       setDateFrom(toIsoDate(filterState.dateRange.from));
       setDateTo(toIsoDate(filterState.dateRange.to));
diff --git a/src/pages/views/trustee/TrusteeDocumentsView.tsx b/src/pages/views/trustee/TrusteeDocumentsView.tsx
index bb3b5df..90ca654 100644
--- a/src/pages/views/trustee/TrusteeDocumentsView.tsx
+++ b/src/pages/views/trustee/TrusteeDocumentsView.tsx
@@ -1,8 +1,15 @@
 /**
  * TrusteeDocumentsView
- * 
+ *
  * Dokument-Verwaltung für eine Trustee-Instanz.
  * Verwendet FormGeneratorTable für konsistentes UI.
+ *
+ * NOTE: Mounted only as a tab inside `TrusteeDataTablesView` (Tab `documents`
+ * unter `/mandates/{m}/trustee/{i}/data-tables?tab=documents`). Es gibt keine
+ * eigenständige Top-Level-Route mehr (`/trustee/{i}/documents` wurde entfernt
+ * -- siehe `wiki/c-work/4-done/2026-04-trustee-cleanup-positions-documents.md`).
+ * Direkt-Import durch `TrusteeDataTablesView`; kein Re-Export über
+ * `views/trustee/index.ts`.
  */
 
 import React, { useState, useMemo, useEffect } from 'react';
diff --git a/src/pages/views/trustee/TrusteePositionsView.tsx b/src/pages/views/trustee/TrusteePositionsView.tsx
index 4ee6626..3fedbf7 100644
--- a/src/pages/views/trustee/TrusteePositionsView.tsx
+++ b/src/pages/views/trustee/TrusteePositionsView.tsx
@@ -1,8 +1,15 @@
 /**
  * TrusteePositionsView
- * 
+ *
  * Positions-Verwaltung für eine Trustee-Instanz.
  * Verwendet FormGeneratorTable für konsistentes UI.
+ *
+ * NOTE: Mounted only as a tab inside `TrusteeDataTablesView` (Tab `positions`
+ * unter `/mandates/{m}/trustee/{i}/data-tables?tab=positions`). Es gibt keine
+ * eigenständige Top-Level-Route mehr (`/trustee/{i}/positions` wurde entfernt
+ * -- siehe `wiki/c-work/4-done/2026-04-trustee-cleanup-positions-documents.md`).
+ * Direkt-Import durch `TrusteeDataTablesView`; kein Re-Export über
+ * `views/trustee/index.ts`.
  */
 
 import React, { useState, useMemo, useEffect, useCallback } from 'react';
diff --git a/src/pages/views/trustee/index.ts b/src/pages/views/trustee/index.ts
index 625ce78..2cbeafa 100644
--- a/src/pages/views/trustee/index.ts
+++ b/src/pages/views/trustee/index.ts
@@ -1,10 +1,15 @@
 /**
  * Trustee Views Export
+ *
+ * NOTE: `TrusteePositionsView` und `TrusteeDocumentsView` werden hier
+ * ABSICHTLICH NICHT mehr re-exportiert. Beide Komponenten sind nur noch
+ * Tab-Bodies innerhalb von `TrusteeDataTablesView` und werden dort per
+ * Direkt-Import (`./TrusteePositionsView`, `./TrusteeDocumentsView`) geladen.
+ * Externe Importe ueber dieses Index-File sind nicht mehr unterstuetzt --
+ * siehe `wiki/c-work/4-done/2026-04-trustee-cleanup-positions-documents.md`.
  */
 
 export { TrusteeDashboardView } from './TrusteeDashboardView';
-export { TrusteeDocumentsView } from './TrusteeDocumentsView';
-export { TrusteePositionsView } from './TrusteePositionsView';
 export { TrusteeInstanceRolesView } from './TrusteeInstanceRolesView';
 export { TrusteeExpenseImportView } from './TrusteeExpenseImportView';
 export { TrusteeScanUploadView } from './TrusteeScanUploadView';

From e09ed758ff5a790882fa0a6fb8764490d3dde07f Mon Sep 17 00:00:00 2001
From: ValueOn AG <p.motsch@valueon.ch>
Date: Sat, 25 Apr 2026 01:13:13 +0200
Subject: [PATCH 2/6] teamsbot

---
 package-lock.json                             | 1626 ++++++++++++++++-
 package.json                                  |   14 +-
 src/api/teamsbotApi.ts                        |  124 +-
 src/api/workflowApi.ts                        |   66 +-
 .../context/Automation2DataFlowContext.tsx    |   56 +-
 .../editor/Automation2FlowEditor.tsx          |   69 +-
 .../FlowEditor/editor/CanvasHeader.test.tsx   |   99 +
 .../FlowEditor/editor/CanvasHeader.tsx        |   52 +-
 .../FlowEditor/editor/FlowCanvas.tsx          |   63 +-
 .../FlowEditor/editor/NodeConfigPanel.tsx     |  158 +-
 .../frontendTypeRenderers/DataRefRenderer.tsx |  168 ++
 .../nodes/frontendTypeRenderers/index.tsx     |  161 +-
 .../nodes/shared/DataPicker.test.tsx          |  194 ++
 .../FlowEditor/nodes/shared/DataPicker.tsx    |  315 +++-
 .../shared/RequiredAttributePicker.test.tsx   |  243 +++
 .../nodes/shared/RequiredAttributePicker.tsx  |  228 +++
 .../FlowEditor/nodes/shared/dataRef.ts        |   16 +-
 .../FlowEditor/nodes/shared/graphUtils.ts     |    6 +-
 .../nodes/shared/outputPreviewRegistry.ts     |    4 +
 .../nodes/shared/paramValidation.test.ts      |  304 +++
 .../nodes/shared/paramValidation.ts           |  208 +++
 .../FlowEditor/nodes/shared/scopeHelpers.ts   |   55 +
 .../FormGeneratorReportTypes.ts               |    4 +-
 .../PeriodPicker/PeriodPickerLogic.ts         |    2 +-
 src/pages/views/teamsbot/Teamsbot.module.css  |  389 ++++
 .../views/teamsbot/TeamsbotSessionView.tsx    |  520 +++++-
 .../views/teamsbot/TeamsbotSettingsView.tsx   |  301 ++-
 .../trustee/TrusteeAccountingSettingsView.tsx |   62 +-
 .../views/trustee/trusteePipelineGraph.ts     |   35 +-
 src/test/setup.ts                             |   45 +
 src/test/smoke.test.ts                        |   23 +
 tsconfig.app.json                             |    5 +
 tsconfig.json                                 |    3 +-
 tsconfig.test.json                            |   15 +
 vitest.config.ts                              |   26 +
 35 files changed, 5522 insertions(+), 137 deletions(-)
 create mode 100644 src/components/FlowEditor/editor/CanvasHeader.test.tsx
 create mode 100644 src/components/FlowEditor/nodes/frontendTypeRenderers/DataRefRenderer.tsx
 create mode 100644 src/components/FlowEditor/nodes/shared/DataPicker.test.tsx
 create mode 100644 src/components/FlowEditor/nodes/shared/RequiredAttributePicker.test.tsx
 create mode 100644 src/components/FlowEditor/nodes/shared/RequiredAttributePicker.tsx
 create mode 100644 src/components/FlowEditor/nodes/shared/paramValidation.test.ts
 create mode 100644 src/components/FlowEditor/nodes/shared/paramValidation.ts
 create mode 100644 src/components/FlowEditor/nodes/shared/scopeHelpers.ts
 create mode 100644 src/test/setup.ts
 create mode 100644 src/test/smoke.test.ts
 create mode 100644 tsconfig.test.json
 create mode 100644 vitest.config.ts

diff --git a/package-lock.json b/package-lock.json
index 4f48a98..60224ca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,21 +41,33 @@
       },
       "devDependencies": {
         "@eslint/js": "^9.30.1",
+        "@testing-library/jest-dom": "^6.9.1",
+        "@testing-library/react": "^16.3.2",
+        "@testing-library/user-event": "^14.6.1",
         "@types/node": "^24.7.2",
         "@types/proj4": "^2.5.6",
         "@types/react": "^19.1.8",
         "@types/react-dom": "^19.1.6",
         "@vitejs/plugin-react": "^4.6.0",
+        "@vitest/coverage-v8": "^2.1.9",
         "eslint": "^9.30.1",
         "eslint-plugin-react-hooks": "^5.2.0",
         "eslint-plugin-react-refresh": "^0.4.20",
         "globals": "^16.3.0",
+        "jsdom": "^25.0.1",
         "typescript": "~5.8.3",
         "typescript-eslint": "^8.35.1",
         "vite": "^5.4.10",
-        "vite-plugin-html": "^3.2.2"
+        "vite-plugin-html": "^3.2.2",
+        "vitest": "^2.1.9"
       }
     },
+    "node_modules/@adobe/css-tools": {
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.4.tgz",
+      "integrity": "sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==",
+      "dev": true
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -70,6 +82,25 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@asamuzakjp/css-color": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz",
+      "integrity": "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==",
+      "dev": true,
+      "dependencies": {
+        "@csstools/css-calc": "^2.1.3",
+        "@csstools/css-color-parser": "^3.0.9",
+        "@csstools/css-parser-algorithms": "^3.0.4",
+        "@csstools/css-tokenizer": "^3.0.3",
+        "lru-cache": "^10.4.3"
+      }
+    },
+    "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
     "node_modules/@azure/msal-browser": {
       "version": "4.16.0",
       "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-4.16.0.tgz",
@@ -338,6 +369,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/runtime": {
+      "version": "7.29.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz",
+      "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/template": {
       "version": "7.27.2",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
@@ -386,6 +426,122 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "node_modules/@csstools/color-helpers": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
+      "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@csstools/css-calc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
+      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-color-parser": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
+      "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "dependencies": {
+        "@csstools/color-helpers": "^5.1.0",
+        "@csstools/css-calc": "^2.1.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-parser-algorithms": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@csstools/css-tokenizer": "^3.0.4"
+      }
+    },
+    "node_modules/@csstools/css-tokenizer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.21.5",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
@@ -997,6 +1153,32 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.6.tgz",
+      "integrity": "sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.12",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
@@ -1030,11 +1212,10 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
-      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
-      "dev": true,
-      "license": "MIT"
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.29",
@@ -1106,6 +1287,16 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@react-leaflet/core": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@react-leaflet/core/-/core-3.0.0.tgz",
@@ -1462,6 +1653,98 @@
       "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
       "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g=="
     },
+    "node_modules/@testing-library/dom": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
+      "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/runtime": "^7.12.5",
+        "@types/aria-query": "^5.0.1",
+        "aria-query": "5.3.0",
+        "dom-accessibility-api": "^0.5.9",
+        "lz-string": "^1.5.0",
+        "picocolors": "1.1.1",
+        "pretty-format": "^27.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@testing-library/jest-dom": {
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.9.1.tgz",
+      "integrity": "sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA==",
+      "dev": true,
+      "dependencies": {
+        "@adobe/css-tools": "^4.4.0",
+        "aria-query": "^5.0.0",
+        "css.escape": "^1.5.1",
+        "dom-accessibility-api": "^0.6.3",
+        "picocolors": "^1.1.1",
+        "redent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14",
+        "npm": ">=6",
+        "yarn": ">=1"
+      }
+    },
+    "node_modules/@testing-library/jest-dom/node_modules/dom-accessibility-api": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz",
+      "integrity": "sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==",
+      "dev": true
+    },
+    "node_modules/@testing-library/react": {
+      "version": "16.3.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.2.tgz",
+      "integrity": "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.12.5"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@testing-library/dom": "^10.0.0",
+        "@types/react": "^18.0.0 || ^19.0.0",
+        "@types/react-dom": "^18.0.0 || ^19.0.0",
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@testing-library/user-event": {
+      "version": "14.6.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.1.tgz",
+      "integrity": "sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      },
+      "peerDependencies": {
+        "@testing-library/dom": ">=7.21.4"
+      }
+    },
+    "node_modules/@types/aria-query": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
+      "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -1983,6 +2266,165 @@
         "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
       }
     },
+    "node_modules/@vitest/coverage-v8": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.9.tgz",
+      "integrity": "sha512-Z2cOr0ksM00MpEfyVE8KXIYPEcBFxdbLSs56L8PO0QQMxt/6bDj45uQfxoc96v05KW3clk7vvgP0qfDit9DmfQ==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "^2.3.0",
+        "@bcoe/v8-coverage": "^0.2.3",
+        "debug": "^4.3.7",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-lib-source-maps": "^5.0.6",
+        "istanbul-reports": "^3.1.7",
+        "magic-string": "^0.30.12",
+        "magicast": "^0.3.5",
+        "std-env": "^3.8.0",
+        "test-exclude": "^7.0.1",
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@vitest/browser": "2.1.9",
+        "vitest": "2.1.9"
+      },
+      "peerDependenciesMeta": {
+        "@vitest/browser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vitest/expect": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.9.tgz",
+      "integrity": "sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==",
+      "dev": true,
+      "dependencies": {
+        "@vitest/spy": "2.1.9",
+        "@vitest/utils": "2.1.9",
+        "chai": "^5.1.2",
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/mocker": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.9.tgz",
+      "integrity": "sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==",
+      "dev": true,
+      "dependencies": {
+        "@vitest/spy": "2.1.9",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.12"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "msw": "^2.4.9",
+        "vite": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vitest/mocker/node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
+    "node_modules/@vitest/pretty-format": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.9.tgz",
+      "integrity": "sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==",
+      "dev": true,
+      "dependencies": {
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/runner": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.9.tgz",
+      "integrity": "sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==",
+      "dev": true,
+      "dependencies": {
+        "@vitest/utils": "2.1.9",
+        "pathe": "^1.1.2"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/runner/node_modules/pathe": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+      "dev": true
+    },
+    "node_modules/@vitest/snapshot": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.9.tgz",
+      "integrity": "sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==",
+      "dev": true,
+      "dependencies": {
+        "@vitest/pretty-format": "2.1.9",
+        "magic-string": "^0.30.12",
+        "pathe": "^1.1.2"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/snapshot/node_modules/pathe": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+      "dev": true
+    },
+    "node_modules/@vitest/spy": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.9.tgz",
+      "integrity": "sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==",
+      "dev": true,
+      "dependencies": {
+        "tinyspy": "^3.0.2"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/utils": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.9.tgz",
+      "integrity": "sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==",
+      "dev": true,
+      "dependencies": {
+        "@vitest/pretty-format": "2.1.9",
+        "loupe": "^3.1.2",
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
     "node_modules/@xmldom/xmldom": {
       "version": "0.8.12",
       "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.12.tgz",
@@ -2054,6 +2496,15 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -2071,6 +2522,15 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -2094,12 +2554,30 @@
       "dev": true,
       "license": "Python-2.0"
     },
+    "node_modules/aria-query": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+      "dev": true,
+      "dependencies": {
+        "dequal": "^2.0.3"
+      }
+    },
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
       "license": "MIT"
     },
+    "node_modules/assertion-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/async": {
       "version": "3.2.6",
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
@@ -2299,6 +2777,15 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/cac": {
+      "version": "6.7.14",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/call-bind-apply-helpers": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
@@ -2392,6 +2879,22 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/chai": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz",
+      "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==",
+      "dev": true,
+      "dependencies": {
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -2449,6 +2952,15 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/check-error": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.3.tgz",
+      "integrity": "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 16"
+      }
+    },
     "node_modules/clean-css": {
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
@@ -2665,6 +3177,31 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
+    "node_modules/css.escape": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
+      "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.6.0.tgz",
+      "integrity": "sha512-2z+rWdzbbSZv6/rhtvzvqeZQHrBaqgogqt85sqFNbabZOuFbCVFb8kPeEtZjiKkbrm395irpNKiYeFeLiQnFPg==",
+      "dev": true,
+      "dependencies": {
+        "@asamuzakjp/css-color": "^3.2.0",
+        "rrweb-cssom": "^0.8.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/cssstyle/node_modules/rrweb-cssom": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
+      "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==",
+      "dev": true
+    },
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@@ -2781,6 +3318,19 @@
         "node": ">=12"
       }
     },
+    "node_modules/data-urls": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",
+      "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/debug": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
@@ -2798,6 +3348,12 @@
         }
       }
     },
+    "node_modules/decimal.js": {
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
+      "dev": true
+    },
     "node_modules/decimal.js-light": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
@@ -2816,6 +3372,15 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/deep-eql": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -2886,6 +3451,13 @@
         "jszip": ">=3.0.0"
       }
     },
+    "node_modules/dom-accessibility-api": {
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
+      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/dom-serializer": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
@@ -3009,6 +3581,12 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -3047,6 +3625,12 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true
+    },
     "node_modules/encodeurl": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
@@ -3084,6 +3668,12 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-module-lexer": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
+      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
+      "dev": true
+    },
     "node_modules/es-object-atoms": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
@@ -3393,6 +3983,15 @@
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
       "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw=="
     },
+    "node_modules/expect-type": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
+      "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/express": {
       "version": "4.21.2",
       "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
@@ -3683,6 +4282,22 @@
         }
       }
     },
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/form-data": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
@@ -3844,6 +4459,27 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -3857,6 +4493,30 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/globals": {
       "version": "16.3.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz",
@@ -3995,6 +4655,24 @@
         "he": "bin/he"
       }
     },
+    "node_modules/html-encoding-sniffer": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
+      "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-encoding": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
     "node_modules/html-minifier-terser": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
@@ -4043,6 +4721,32 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -4106,6 +4810,15 @@
         "node": ">=0.8.19"
       }
     },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -4179,6 +4892,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -4224,6 +4946,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
+    },
     "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -4236,6 +4964,71 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "node_modules/jake": {
       "version": "10.9.4",
       "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
@@ -4282,6 +5075,46 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsdom": {
+      "version": "25.0.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-25.0.1.tgz",
+      "integrity": "sha512-8i7LzZj7BF8uplX+ZyOlIz86V6TAsSs+np6m1kpW9u0JWi4z/1t+FzcK1aek+ybTnAC4KhBL4uXCNT0wcUIeCw==",
+      "dev": true,
+      "dependencies": {
+        "cssstyle": "^4.1.0",
+        "data-urls": "^5.0.0",
+        "decimal.js": "^10.4.3",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^4.0.0",
+        "http-proxy-agent": "^7.0.2",
+        "https-proxy-agent": "^7.0.5",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.12",
+        "parse5": "^7.1.2",
+        "rrweb-cssom": "^0.7.1",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^5.0.0",
+        "w3c-xmlserializer": "^5.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^3.1.1",
+        "whatwg-mimetype": "^4.0.0",
+        "whatwg-url": "^14.0.0",
+        "ws": "^8.18.0",
+        "xml-name-validator": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "canvas": "^2.11.2"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/jsesc": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
@@ -4552,6 +5385,12 @@
         "underscore": "^1.13.1"
       }
     },
+    "node_modules/loupe": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz",
+      "integrity": "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==",
+      "dev": true
+    },
     "node_modules/lower-case": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
@@ -4572,6 +5411,63 @@
         "yallist": "^3.0.2"
       }
     },
+    "node_modules/lz-string": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
+      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "lz-string": "bin/bin.js"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.5"
+      }
+    },
+    "node_modules/magicast": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz",
+      "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.25.4",
+        "@babel/types": "^7.25.4",
+        "source-map-js": "^1.2.0"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/mammoth": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/mammoth/-/mammoth-1.12.0.tgz",
@@ -5569,6 +6465,15 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -5582,6 +6487,15 @@
         "node": "*"
       }
     },
+    "node_modules/minipass": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/monaco-editor": {
       "version": "0.55.1",
       "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.55.1.tgz",
@@ -5716,6 +6630,12 @@
         "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
+    "node_modules/nwsapi": {
+      "version": "2.2.23",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.23.tgz",
+      "integrity": "sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==",
+      "dev": true
+    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -5804,6 +6724,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true
+    },
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -5858,6 +6784,30 @@
       "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==",
       "license": "MIT"
     },
+    "node_modules/parse5": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
+      "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
+      "dev": true,
+      "dependencies": {
+        "entities": "^6.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parse5/node_modules/entities": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -5906,6 +6856,28 @@
         "node": ">=8"
       }
     },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
     "node_modules/path-to-regexp": {
       "version": "0.1.12",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
@@ -5919,6 +6891,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/pathval": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
+      "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 14.16"
+      }
+    },
     "node_modules/pg": {
       "version": "8.16.3",
       "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
@@ -6106,6 +7087,41 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/pretty-format/node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true,
+      "peer": true
+    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -6452,6 +7468,19 @@
         "react-is": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
+    "node_modules/redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "dependencies": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/redux": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
@@ -6607,6 +7636,12 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/rrweb-cssom": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz",
+      "integrity": "sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==",
+      "dev": true
+    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -6657,6 +7692,18 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "license": "MIT"
     },
+    "node_modules/saxes": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
+      "dev": true,
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=v12.22.7"
+      }
+    },
     "node_modules/scheduler": {
       "version": "0.26.0",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz",
@@ -6848,6 +7895,24 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/siginfo": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+      "dev": true
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -6914,6 +7979,12 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/stackback": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+      "dev": true
+    },
     "node_modules/state-local": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/state-local/-/state-local-1.0.7.tgz",
@@ -6928,6 +7999,12 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/std-env": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz",
+      "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==",
+      "dev": true
+    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -6941,6 +8018,56 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/stringify-entities": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
@@ -6955,6 +8082,58 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -6999,6 +8178,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
     "node_modules/terser": {
       "version": "5.44.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.44.0.tgz",
@@ -7025,11 +8210,118 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/test-exclude": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.2.tgz",
+      "integrity": "sha512-u9E6A+ZDYdp7a4WnarkXPZOx8Ilz46+kby6p1yZ8zsGTz9gYa6FIS7lj2oezzNKmtdyyJNNmmXDppga5GB7kSw==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^10.4.1",
+        "minimatch": "^10.2.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/test-exclude/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/test-exclude/node_modules/minimatch": {
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^5.0.5"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/tiny-invariant": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
       "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg=="
     },
+    "node_modules/tinybench": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
+      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+      "dev": true
+    },
+    "node_modules/tinyexec": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
+      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+      "dev": true
+    },
+    "node_modules/tinypool": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
+      "dev": true,
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      }
+    },
+    "node_modules/tinyrainbow": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+      "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tinyspy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
+      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tldts": {
+      "version": "6.1.86",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
+      "integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
+      "dev": true,
+      "dependencies": {
+        "tldts-core": "^6.1.86"
+      },
+      "bin": {
+        "tldts": "bin/cli.js"
+      }
+    },
+    "node_modules/tldts-core": {
+      "version": "6.1.86",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
+      "integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
+      "dev": true
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -7052,6 +8344,30 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/tough-cookie": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
+      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
+      "dev": true,
+      "dependencies": {
+        "tldts": "^6.1.32"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz",
+      "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/trim-lines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
@@ -7469,6 +8785,34 @@
         }
       }
     },
+    "node_modules/vite-node": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.9.tgz",
+      "integrity": "sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==",
+      "dev": true,
+      "dependencies": {
+        "cac": "^6.7.14",
+        "debug": "^4.3.7",
+        "es-module-lexer": "^1.5.4",
+        "pathe": "^1.1.2",
+        "vite": "^5.0.0"
+      },
+      "bin": {
+        "vite-node": "vite-node.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/vite-node/node_modules/pathe": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+      "dev": true
+    },
     "node_modules/vite-plugin-html": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/vite-plugin-html/-/vite-plugin-html-3.2.2.tgz",
@@ -7493,6 +8837,145 @@
         "vite": ">=2.0.0"
       }
     },
+    "node_modules/vitest": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.9.tgz",
+      "integrity": "sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==",
+      "dev": true,
+      "dependencies": {
+        "@vitest/expect": "2.1.9",
+        "@vitest/mocker": "2.1.9",
+        "@vitest/pretty-format": "^2.1.9",
+        "@vitest/runner": "2.1.9",
+        "@vitest/snapshot": "2.1.9",
+        "@vitest/spy": "2.1.9",
+        "@vitest/utils": "2.1.9",
+        "chai": "^5.1.2",
+        "debug": "^4.3.7",
+        "expect-type": "^1.1.0",
+        "magic-string": "^0.30.12",
+        "pathe": "^1.1.2",
+        "std-env": "^3.8.0",
+        "tinybench": "^2.9.0",
+        "tinyexec": "^0.3.1",
+        "tinypool": "^1.0.1",
+        "tinyrainbow": "^1.2.0",
+        "vite": "^5.0.0",
+        "vite-node": "2.1.9",
+        "why-is-node-running": "^2.3.0"
+      },
+      "bin": {
+        "vitest": "vitest.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@edge-runtime/vm": "*",
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "@vitest/browser": "2.1.9",
+        "@vitest/ui": "2.1.9",
+        "happy-dom": "*",
+        "jsdom": "*"
+      },
+      "peerDependenciesMeta": {
+        "@edge-runtime/vm": {
+          "optional": true
+        },
+        "@types/node": {
+          "optional": true
+        },
+        "@vitest/browser": {
+          "optional": true
+        },
+        "@vitest/ui": {
+          "optional": true
+        },
+        "happy-dom": {
+          "optional": true
+        },
+        "jsdom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vitest/node_modules/pathe": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+      "dev": true
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
+      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
+      "dev": true,
+      "dependencies": {
+        "xml-name-validator": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
+      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
+      "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
+      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
+      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
+      "dev": true,
+      "dependencies": {
+        "tr46": "^5.1.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -7509,6 +8992,22 @@
         "node": ">= 8"
       }
     },
+    "node_modules/why-is-node-running": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
+      "dev": true,
+      "dependencies": {
+        "siginfo": "^2.0.0",
+        "stackback": "0.0.2"
+      },
+      "bin": {
+        "why-is-node-running": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wkt-parser": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.5.2.tgz",
@@ -7541,6 +9040,106 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ws": {
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
+      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/xlsx": {
       "version": "0.18.5",
       "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
@@ -7561,6 +9160,15 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/xml-name-validator": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
+      "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/xmlbuilder": {
       "version": "10.1.1",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-10.1.1.tgz",
@@ -7569,6 +9177,12 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
     "node_modules/xstate": {
       "version": "5.20.1",
       "resolved": "https://registry.npmjs.org/xstate/-/xstate-5.20.1.tgz",
diff --git a/package.json b/package.json
index e94b6ae..2145710 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,11 @@
     "build:prod": "tsc -b && vite build --mode prod",
     "build:int": "tsc -b && vite build --mode int",
     "lint": "eslint .",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:ui": "vitest --ui",
+    "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
     "@azure/msal-browser": "^4.12.0",
@@ -47,18 +51,24 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.30.1",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.2",
+    "@testing-library/user-event": "^14.6.1",
     "@types/node": "^24.7.2",
     "@types/proj4": "^2.5.6",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "^4.6.0",
+    "@vitest/coverage-v8": "^2.1.9",
     "eslint": "^9.30.1",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
     "globals": "^16.3.0",
+    "jsdom": "^25.0.1",
     "typescript": "~5.8.3",
     "typescript-eslint": "^8.35.1",
     "vite": "^5.4.10",
-    "vite-plugin-html": "^3.2.2"
+    "vite-plugin-html": "^3.2.2",
+    "vitest": "^2.1.9"
   }
 }
diff --git a/src/api/teamsbotApi.ts b/src/api/teamsbotApi.ts
index b6387ac..462268d 100644
--- a/src/api/teamsbotApi.ts
+++ b/src/api/teamsbotApi.ts
@@ -169,11 +169,63 @@ export interface MfaChallengeEvent {
 
 // SSE Event Types
 export interface TeamsbotSSEEvent {
-  type: 'transcript' | 'botResponse' | 'analysis' | 'suggestedResponse' | 'statusChange' | 'error' | 'ping' | 'sessionState' | 'ttsDeliveryStatus' | 'mfaChallenge' | 'mfaResolved' | 'chatSendFailed';
+  type:
+    | 'transcript'
+    | 'botResponse'
+    | 'analysis'
+    | 'suggestedResponse'
+    | 'statusChange'
+    | 'error'
+    | 'ping'
+    | 'sessionState'
+    | 'ttsDeliveryStatus'
+    | 'mfaChallenge'
+    | 'mfaResolved'
+    | 'chatSendFailed'
+    | 'directorPrompt'
+    | 'agentRun'
+    | 'botConnectionState';
   data: any;
   timestamp?: string;
 }
 
+// =========================================================================
+// Director Prompts (private operator instructions during a live meeting)
+// =========================================================================
+
+export type DirectorPromptMode = 'oneShot' | 'persistent';
+export type DirectorPromptStatus =
+  | 'queued'
+  | 'running'
+  | 'succeeded'
+  | 'failed'
+  | 'consumed';
+
+export const DIRECTOR_PROMPT_TEXT_LIMIT = 8000;
+export const DIRECTOR_PROMPT_FILE_LIMIT = 10;
+
+export interface DirectorPrompt {
+  id: string;
+  sessionId: string;
+  instanceId: string;
+  operatorUserId: string;
+  text: string;
+  mode: DirectorPromptMode;
+  fileIds: string[];
+  status: DirectorPromptStatus;
+  statusMessage?: string;
+  createdAt: string;
+  consumedAt?: string;
+  agentRunId?: string;
+  responseText?: string;
+}
+
+export interface DirectorPromptCreateRequest {
+  text: string;
+  mode: DirectorPromptMode;
+  fileIds?: string[];
+}
+
 // ============================================================================
 // API FUNCTIONS
 // ============================================================================
@@ -289,6 +341,29 @@ export async function listSystemBots(instanceId: string): Promise<{ bots: System
   return response.data;
 }
 
+/**
+ * Create a new system bot account. The password is encrypted server-side
+ * before storage; the API never returns the password back. SysAdmin only.
+ */
+export async function createSystemBot(
+  instanceId: string,
+  payload: { email: string; password: string; name?: string },
+): Promise<{ bot: SystemBot }> {
+  const response = await api.post(`/api/teamsbot/${instanceId}/system-bots`, payload);
+  return response.data;
+}
+
+/**
+ * Delete a system bot account. SysAdmin only.
+ */
+export async function deleteSystemBot(
+  instanceId: string,
+  botId: string,
+): Promise<{ deleted: boolean }> {
+  const response = await api.delete(`/api/teamsbot/${instanceId}/system-bots/${botId}`);
+  return response.data;
+}
+
 /**
  * Test TTS voice with AI-generated sample text. Returns base64-encoded audio.
  */
@@ -452,3 +527,50 @@ export async function submitMfaCode(
   });
   return response.data;
 }
+
+// =========================================================================
+// Director Prompts
+// =========================================================================
+
+/**
+ * Submit a private director prompt to the running bot. Triggers the full
+ * agent path (web, mail, RAG, etc.) and delivers the answer into the meeting.
+ */
+export async function submitDirectorPrompt(
+  instanceId: string,
+  sessionId: string,
+  body: DirectorPromptCreateRequest,
+): Promise<{ prompt: DirectorPrompt }> {
+  const response = await api.post(
+    `/api/teamsbot/${instanceId}/sessions/${sessionId}/directorPrompts`,
+    body,
+  );
+  return response.data;
+}
+
+/**
+ * List director prompts for a session (operator's own prompts only).
+ */
+export async function listDirectorPrompts(
+  instanceId: string,
+  sessionId: string,
+): Promise<{ prompts: DirectorPrompt[] }> {
+  const response = await api.get(
+    `/api/teamsbot/${instanceId}/sessions/${sessionId}/directorPrompts`,
+  );
+  return response.data;
+}
+
+/**
+ * Remove a (typically persistent) director prompt.
+ */
+export async function deleteDirectorPrompt(
+  instanceId: string,
+  sessionId: string,
+  promptId: string,
+): Promise<{ deleted: boolean; promptId: string }> {
+  const response = await api.delete(
+    `/api/teamsbot/${instanceId}/sessions/${sessionId}/directorPrompts/${promptId}`,
+  );
+  return response.data;
+}
diff --git a/src/api/workflowApi.ts b/src/api/workflowApi.ts
index de467e5..76aa49a 100644
--- a/src/api/workflowApi.ts
+++ b/src/api/workflowApi.ts
@@ -29,6 +29,7 @@ export interface PortField {
   /** Plain string or per-language map from the API catalog. */
   description: string | Record<string, string>;
   required: boolean;
+  enumValues?: string[] | null;
 }
 
 export interface PortSchema {
@@ -40,8 +41,14 @@ export interface InputPortDef {
   accepts: string[];
 }
 
+/** Graph-defined output schema (e.g. form fields from node parameters). */
+export interface GraphDefinedSchemaRef {
+  kind: 'fromGraph';
+  parameter: string;
+}
+
 export interface OutputPortDef {
-  schema: string;
+  schema: string | GraphDefinedSchemaRef;
   dynamic?: boolean;
   deriveFrom?: string;
 }
@@ -90,7 +97,7 @@ export interface Automation2GraphNode {
   type: string;
   parameters?: Record<string, unknown>;
   inputPorts?: Array<{ name: string; schema: string; accepts?: string[] }>;
-  outputPorts?: Array<{ name: string; schema: string }>;
+  outputPorts?: Array<{ name: string; schema: string | GraphDefinedSchemaRef }>;
 }
 
 export interface Automation2Connection {
@@ -109,6 +116,10 @@ export interface ExecuteGraphResponse {
   success: boolean;
   nodeOutputs?: Record<string, unknown>;
   error?: string;
+  /** Soft, non-blocking message displayed alongside a successful response.
+   *  Used e.g. by the Save flow to surface "Gespeichert mit X Pflicht-Fehlern"
+   *  without flipping `success` to `false`. */
+  warning?: string;
   stopped?: boolean;
   failedNode?: string;
   paused?: boolean;
@@ -264,8 +275,55 @@ export async function fetchNodeTypes(
   });
   const nodeTypes = data?.nodeTypes ?? [];
   const categories = data?.categories ?? [];
-  console.log(`${LOG} fetchNodeTypes response: ${nodeTypes.length} nodeTypes, ${categories.length} categories`);
-  return { nodeTypes, categories };
+  const portTypeCatalog = data?.portTypeCatalog ?? undefined;
+  const systemVariables = data?.systemVariables ?? undefined;
+  console.log(
+    `${LOG} fetchNodeTypes response: ${nodeTypes.length} nodeTypes, ${categories.length} categories, ` +
+      `${portTypeCatalog ? Object.keys(portTypeCatalog).length : 0} portTypes, ` +
+      `${systemVariables ? Object.keys(systemVariables).length : 0} sysVars`
+  );
+  return { nodeTypes, categories, portTypeCatalog, systemVariables };
+}
+
+export interface UpstreamPathEntry {
+  producerNodeId: string;
+  producerLabel?: string;
+  path: (string | number)[];
+  type: string;
+  label: string;
+  scopeOrigin: 'data' | 'loop' | 'system';
+}
+
+/**
+ * POST /api/workflows/{instanceId}/upstream-paths — pickable upstream paths for DataPicker / AI.
+ */
+export async function postUpstreamPaths(
+  request: ApiRequestFunction,
+  instanceId: string,
+  graph: Automation2Graph,
+  nodeId: string
+): Promise<{ paths: UpstreamPathEntry[] }> {
+  const data = await request({
+    url: `/api/workflows/${instanceId}/upstream-paths`,
+    method: 'post',
+    data: { graph, nodeId },
+  });
+  return { paths: (data?.paths ?? []) as UpstreamPathEntry[] };
+}
+
+/** GET saved workflow graph variant of upstream-paths (requires workflowId). */
+export async function getUpstreamPathsSaved(
+  request: ApiRequestFunction,
+  instanceId: string,
+  workflowId: string,
+  nodeId: string
+): Promise<{ paths: UpstreamPathEntry[] }> {
+  const data = await request({
+    url: `/api/workflows/${instanceId}/upstream-paths/${encodeURIComponent(nodeId)}`,
+    method: 'get',
+    params: { workflowId },
+  });
+  return { paths: (data?.paths ?? []) as UpstreamPathEntry[] };
 }
 
 /**
diff --git a/src/components/FlowEditor/context/Automation2DataFlowContext.tsx b/src/components/FlowEditor/context/Automation2DataFlowContext.tsx
index 8fb4419..8be4ea9 100644
--- a/src/components/FlowEditor/context/Automation2DataFlowContext.tsx
+++ b/src/components/FlowEditor/context/Automation2DataFlowContext.tsx
@@ -6,7 +6,7 @@
 import React, { createContext, useContext, useMemo } from 'react';
 import type { CanvasNode, CanvasConnection } from '../editor/FlowCanvas';
 import { getAvailableSources } from '../nodes/shared/dataFlowGraph';
-import type { NodeType, PortSchema, SystemVariable } from '../../../api/workflowApi';
+import type { ApiRequestFunction, NodeType, PortField, PortSchema, SystemVariable } from '../../../api/workflowApi';
 
 export interface Automation2DataFlowContextValue {
   currentNodeId: string;
@@ -19,6 +19,11 @@ export interface Automation2DataFlowContextValue {
   systemVariables: Record<string, SystemVariable>;
   getNodeLabel: (node: { id: string; title?: string; label?: string; type?: string }) => string;
   getAvailableSourceIds: () => string[];
+  /** Present when rendered inside the flow editor (ConnectionPicker / tools). */
+  instanceId?: string;
+  request?: ApiRequestFunction;
+  /** Build FormPayload-like schema from ``parameters[parameterKey]`` (fieldBuilder JSON). */
+  parseGraphDefinedSchema: (parameterKey: string) => PortSchema | null;
 }
 
 const Automation2DataFlowContext = createContext<Automation2DataFlowContextValue | null>(null);
@@ -36,6 +41,8 @@ interface Automation2DataFlowProviderProps {
   language: string;
   portTypeCatalog?: Record<string, PortSchema>;
   systemVariables?: Record<string, SystemVariable>;
+  instanceId?: string;
+  request?: ApiRequestFunction;
   children: React.ReactNode;
 }
 
@@ -48,10 +55,52 @@ export const Automation2DataFlowProvider: React.FC<Automation2DataFlowProviderPr
   language,
   portTypeCatalog = {},
   systemVariables = {},
+  instanceId,
+  request,
   children,
 }) => {
   const value = useMemo((): Automation2DataFlowContextValue | null => {
     if (!node) return null;
+    const parseGraphDefinedSchema = (parameterKey: string): PortSchema | null => {
+      const raw = node.parameters?.[parameterKey];
+      if (!Array.isArray(raw)) return null;
+      const fields: PortField[] = [];
+      for (const item of raw) {
+        if (typeof item !== 'object' || item === null) continue;
+        const rec = item as Record<string, unknown>;
+        if (typeof rec.name !== 'string') continue;
+        const lab = rec.label;
+        const desc =
+          typeof lab === 'string' ? lab : typeof lab === 'object' && lab !== null ? String((lab as Record<string, string>).de ?? '') : '';
+        const ftype = typeof rec.type === 'string' ? rec.type : 'str';
+        if (ftype === 'group' && Array.isArray(rec.fields)) {
+          for (const sub of rec.fields as Record<string, unknown>[]) {
+            if (!sub || typeof sub.name !== 'string') continue;
+            const sl = sub.label;
+            const sdesc =
+              typeof sl === 'string'
+                ? sl
+                : typeof sl === 'object' && sl !== null
+                  ? String((sl as Record<string, string>).de ?? '')
+                  : '';
+            fields.push({
+              name: `${rec.name}.${sub.name}`,
+              type: typeof sub.type === 'string' ? sub.type : 'str',
+              description: (sdesc && sdesc.trim()) || `${rec.name}.${sub.name}`,
+              required: Boolean(sub.required),
+            });
+          }
+          continue;
+        }
+        fields.push({
+          name: rec.name,
+          type: ftype,
+          description: (desc && desc.trim()) || rec.name,
+          required: Boolean(rec.required),
+        });
+      }
+      return fields.length ? { name: 'FormPayload_dynamic', fields } : null;
+    };
     return {
       currentNodeId: node.id,
       nodes,
@@ -64,8 +113,11 @@ export const Automation2DataFlowProvider: React.FC<Automation2DataFlowProviderPr
       getNodeLabel: (n: { id: string; title?: string; label?: string; type?: string }) =>
         n.title ?? n.label ?? n.type ?? n.id,
       getAvailableSourceIds: () => getAvailableSources(node.id, nodes, connections),
+      instanceId,
+      request,
+      parseGraphDefinedSchema,
     };
-  }, [node?.id, nodes, connections, nodeOutputsPreview, nodeTypes, language, portTypeCatalog, systemVariables]);
+  }, [node, nodes, connections, nodeOutputsPreview, nodeTypes, language, portTypeCatalog, systemVariables, instanceId, request]);
 
   return (
     <Automation2DataFlowContext.Provider value={value}>
diff --git a/src/components/FlowEditor/editor/Automation2FlowEditor.tsx b/src/components/FlowEditor/editor/Automation2FlowEditor.tsx
index 35e42b9..7cdf7d8 100644
--- a/src/components/FlowEditor/editor/Automation2FlowEditor.tsx
+++ b/src/components/FlowEditor/editor/Automation2FlowEditor.tsx
@@ -45,6 +45,8 @@ import {
   buildInvocationsForPrimaryKind,
 } from '../nodes/runtime/workflowStartSync';
 import { buildNodeOutputsPreview, setPortTypeCatalog as setRegistryCatalog } from '../nodes/shared/outputPreviewRegistry';
+import { findGraphErrors } from '../nodes/shared/paramValidation';
+import { getLabel as getParamLabel } from '../nodes/shared/utils';
 import { Automation2DataFlowProvider } from '../context/Automation2DataFlowContext';
 import { usePrompt } from '../../../hooks/usePrompt';
 import { EditorChatPanel } from './EditorChatPanel';
@@ -180,6 +182,21 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
     [canvasNodes, nodeTypes, executeResult?.nodeOutputs]
   );
 
+  // Phase-4 Schicht-4 — Per-node required-but-unbound errors used by both the
+  // canvas error badges and the Run-button gate. Graph-level: Save stays
+  // unconditional (Schicht-4 invariant: WIP must always be persistable).
+  const nodeErrors = useMemo(
+    () =>
+      findGraphErrors(
+        canvasNodes,
+        nodeTypes,
+        (p) => getParamLabel(p.description, language) || p.name,
+      ),
+    [canvasNodes, nodeTypes, language]
+  );
+  const hasGraphErrors = useMemo(() => Object.keys(nodeErrors).length > 0, [nodeErrors]);
+  const firstErrorNodeId = useMemo(() => Object.keys(nodeErrors)[0] ?? null, [nodeErrors]);
+
   const applyGraphWithSync = useCallback(
     (graph: Automation2Graph | null | undefined, wfInvocations: WorkflowEntryPoint[] | undefined) => {
       const inv = wfInvocations?.length ? wfInvocations : _buildDefaultInvocations(t('Jetzt ausführen'));
@@ -211,6 +228,19 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
       setExecuteResult({ success: false, error: t('Keine Nodes im Workflow.') });
       return;
     }
+    // Phase-4 Schicht-4: Run blockiert bei Pflicht-Fehlern. Save bleibt offen.
+    if (Object.keys(nodeErrors).length > 0) {
+      const firstId = Object.keys(nodeErrors)[0];
+      const firstNode = canvasNodes.find((n) => n.id === firstId);
+      if (firstNode) setSelectedNode(firstNode);
+      setExecuteResult({
+        success: false,
+        error:
+          t('Workflow hat Pflicht-Felder ohne Quelle. Bitte erst beheben.') +
+          (firstNode ? ` (${firstNode.title ?? firstNode.label ?? firstNode.type})` : ''),
+      });
+      return;
+    }
     setExecuting(true);
     setExecuteResult(null);
     try {
@@ -228,7 +258,7 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
     } finally {
       setExecuting(false);
     }
-  }, [request, instanceId, canvasNodes, canvasConnections, currentWorkflowId, invocations, t]);
+  }, [request, instanceId, canvasNodes, canvasConnections, currentWorkflowId, invocations, t, nodeErrors]);
 
   const handleSave = useCallback(async () => {
     const graph = toApiGraph(canvasNodes, canvasConnections);
@@ -236,11 +266,28 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
       setExecuteResult({ success: false, error: t('Keine Nodes zum Speichern.') });
       return;
     }
+    // Phase-4 Schicht-4 / AC 9: Save bleibt bei Pflicht-Fehlern erlaubt,
+    // aber wir berichten die Anzahl in einem nicht-blockierenden Warning,
+    // damit der User die WIP-Lücken nicht stillschweigend persistiert.
+    const errorCount = Object.values(nodeErrors).reduce(
+      (acc, list) => acc + list.length,
+      0,
+    );
+    const errorNodeCount = Object.keys(nodeErrors).length;
+    const _buildSaveResult = (): ExecuteGraphResponse => ({
+      success: true,
+      warning:
+        errorCount > 0
+          ? t('Gespeichert mit {n} Pflicht-Fehlern in {m} Nodes.')
+              .replace('{n}', String(errorCount))
+              .replace('{m}', String(errorNodeCount))
+          : undefined,
+    });
     setSaving(true);
     try {
       if (currentWorkflowId) {
         await updateWorkflow(request, instanceId, currentWorkflowId, { graph, invocations });
-        setExecuteResult({ success: true } as ExecuteGraphResponse);
+        setExecuteResult(_buildSaveResult());
       } else {
         const label = await promptInput(t('Workflow-Name:'), {
           title: t('Workflow speichern'),
@@ -259,14 +306,14 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
         setCurrentWorkflowId(created.id);
         if (created.invocations?.length) setInvocations(created.invocations);
         setWorkflows((prev) => [...prev, created]);
-        setExecuteResult({ success: true } as ExecuteGraphResponse);
+        setExecuteResult(_buildSaveResult());
       }
     } catch (err: unknown) {
       setExecuteResult({ success: false, error: err instanceof Error ? err.message : String(err) });
     } finally {
       setSaving(false);
     }
-  }, [request, instanceId, canvasNodes, canvasConnections, currentWorkflowId, promptInput, invocations, t]);
+  }, [request, instanceId, canvasNodes, canvasConnections, currentWorkflowId, promptInput, invocations, t, nodeErrors]);
 
   const handleLoad = useCallback(
     async (workflowId: string) => {
@@ -749,6 +796,17 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
           saving={saving}
           executing={executing}
           hasNodes={canvasNodes.length > 0}
+          executeBlockedReason={
+            hasGraphErrors
+              ? t('Pflicht-Felder ohne Quelle vorhanden. Klicken markiert die erste betroffene Node.')
+              : null
+          }
+          onExecuteBlockedClick={() => {
+            if (firstErrorNodeId) {
+              const n = canvasNodes.find((x) => x.id === firstErrorNodeId);
+              if (n) setSelectedNode(n);
+            }
+          }}
           executeResult={executeResult}
           versions={versions}
           currentVersionId={currentVersionId}
@@ -777,6 +835,7 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
               getCategoryIcon={getCategoryIcon}
               onSelectionChange={setSelectedNode}
               highlightedNodeIds={tracingRunId ? tracingNodeStatuses : undefined}
+              nodeErrors={nodeErrors}
               onExternalDrop={async (mime, payload) => {
                 if (mime !== 'application/json+workflow' || !instanceId) return false;
                 const p = payload as { files?: Array<{ id: string }> } | undefined;
@@ -804,6 +863,8 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
               language={language}
               portTypeCatalog={portTypeCatalog as Record<string, never>}
               systemVariables={systemVariables as Record<string, never>}
+              instanceId={instanceId}
+              request={request}
             >
               <NodeConfigPanel
                 node={selectedNode}
diff --git a/src/components/FlowEditor/editor/CanvasHeader.test.tsx b/src/components/FlowEditor/editor/CanvasHeader.test.tsx
new file mode 100644
index 0000000..b0e1b61
--- /dev/null
+++ b/src/components/FlowEditor/editor/CanvasHeader.test.tsx
@@ -0,0 +1,99 @@
+// Copyright (c) 2025 Patrick Motsch
+// All rights reserved.
+//
+// Plan #2 — Track A1.4 (T10): CanvasHeader Run-button gating logic.
+// Verifies the AC-9 patch — Save always enabled (unless saving), Run blocked
+// when executeBlockedReason is set + warning toast surfaced as amber banner.
+
+import React from 'react';
+import { describe, expect, it, vi } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import type { Automation2Workflow, ExecuteGraphResponse } from '../../../api/workflowApi';
+
+vi.mock('../../../providers/language/LanguageContext', () => ({
+  useLanguage: () => ({ t: (s: string) => s }),
+}));
+
+import { CanvasHeader } from './CanvasHeader';
+
+const _workflows: Automation2Workflow[] = [];
+
+function _renderHeader(overrides: Partial<React.ComponentProps<typeof CanvasHeader>> = {}) {
+  const props: React.ComponentProps<typeof CanvasHeader> = {
+    workflows: _workflows,
+    currentWorkflowId: null,
+    onWorkflowSelect: () => {},
+    onNew: () => {},
+    onSave: () => {},
+    onExecute: () => {},
+    saving: false,
+    executing: false,
+    hasNodes: true,
+    executeResult: null,
+    ...overrides,
+  };
+  return render(<CanvasHeader {...props} />);
+}
+
+describe('CanvasHeader Run-button (T10)', () => {
+  it('runs `onExecute` when not blocked', async () => {
+    const onExecute = vi.fn();
+    _renderHeader({ onExecute });
+    await userEvent.click(screen.getByRole('button', { name: /Ausführen/i }));
+    expect(onExecute).toHaveBeenCalledTimes(1);
+  });
+
+  it('shows the "Pflicht-Felder fehlen" label and triggers `onExecuteBlockedClick` instead of `onExecute`', async () => {
+    const onExecute = vi.fn();
+    const onExecuteBlockedClick = vi.fn();
+    _renderHeader({
+      onExecute,
+      onExecuteBlockedClick,
+      executeBlockedReason: '2 Nodes mit Pflicht-Fehlern',
+    });
+    const btn = screen.getByRole('button', { name: /Pflicht-Felder fehlen/i });
+    expect(btn).toHaveAttribute('aria-disabled', 'true');
+    expect(btn).toHaveAttribute('title', '2 Nodes mit Pflicht-Fehlern');
+    await userEvent.click(btn);
+    expect(onExecute).not.toHaveBeenCalled();
+    expect(onExecuteBlockedClick).toHaveBeenCalledTimes(1);
+  });
+
+  it('disables the Run button while executing or when no nodes are present', () => {
+    const { rerender } = _renderHeader({ executing: true });
+    expect(screen.getByRole('button', { name: /Ausführen…/i })).toBeDisabled();
+    rerender(
+      <CanvasHeader
+        workflows={_workflows}
+        currentWorkflowId={null}
+        onWorkflowSelect={() => {}}
+        onNew={() => {}}
+        onSave={() => {}}
+        onExecute={() => {}}
+        saving={false}
+        executing={false}
+        hasNodes={false}
+        executeResult={null}
+      />,
+    );
+    expect(screen.getByRole('button', { name: /Ausführen/i })).toBeDisabled();
+  });
+});
+
+describe('CanvasHeader executeResult banner (AC-9)', () => {
+  it('renders the warning text in amber when success+warning is present', () => {
+    const result: ExecuteGraphResponse = {
+      success: true,
+      warning: 'Gespeichert mit 3 Pflicht-Fehlern in 2 Nodes.',
+    };
+    _renderHeader({ executeResult: result });
+    expect(screen.getByText(/Gespeichert mit 3 Pflicht-Fehlern/i)).toBeInTheDocument();
+  });
+
+  it('renders the error text in red when success=false', () => {
+    const result: ExecuteGraphResponse = { success: false, error: 'Boom' };
+    _renderHeader({ executeResult: result });
+    expect(screen.getByText(/Boom/)).toBeInTheDocument();
+  });
+});
diff --git a/src/components/FlowEditor/editor/CanvasHeader.tsx b/src/components/FlowEditor/editor/CanvasHeader.tsx
index 3ffe702..d30430e 100644
--- a/src/components/FlowEditor/editor/CanvasHeader.tsx
+++ b/src/components/FlowEditor/editor/CanvasHeader.tsx
@@ -21,6 +21,11 @@ interface CanvasHeaderProps {
   saving: boolean;
   executing: boolean;
   hasNodes: boolean;
+  /** Phase-4 Schicht-4: when set, the Run button is disabled and the message
+   *  is shown as a tooltip. Click triggers `onExecuteBlockedClick` so the
+   *  parent can navigate the user to the first offending node. */
+  executeBlockedReason?: string | null;
+  onExecuteBlockedClick?: () => void;
   executeResult: ExecuteGraphResponse | null;
   versions?: AutoVersion[];
   currentVersionId?: string | null;
@@ -56,6 +61,8 @@ export const CanvasHeader: React.FC<CanvasHeaderProps> = ({ workflows,
   saving,
   executing,
   hasNodes,
+  executeBlockedReason,
+  onExecuteBlockedClick,
   executeResult,
   versions,
   currentVersionId,
@@ -213,7 +220,11 @@ export const CanvasHeader: React.FC<CanvasHeaderProps> = ({ workflows,
           type="button"
           className={styles.retryButton}
           onClick={onSave}
-          disabled={saving || !hasNodes}
+          // Phase-4 Schicht-4: Save niemals blockieren — work-in-progress muss
+          // jederzeit persistierbar sein. Nur während des Save-Requests selbst
+          // sperren wir den Button, um Doppelklicks zu verhindern.
+          disabled={saving}
+          title={!hasNodes ? t('Workflow ist leer — Speichern legt einen leeren Workflow an.') : undefined}
         >
           {saving ? <FaSpinner className={styles.spinner} /> : t('Speichern')}
         </button>
@@ -277,14 +288,37 @@ export const CanvasHeader: React.FC<CanvasHeaderProps> = ({ workflows,
         <button
           type="button"
           className={styles.retryButton}
-          onClick={onExecute}
+          onClick={() => {
+            if (executeBlockedReason) {
+              onExecuteBlockedClick?.();
+              return;
+            }
+            onExecute();
+          }}
           disabled={executing || !hasNodes}
+          aria-disabled={executing || !hasNodes || !!executeBlockedReason}
+          title={executeBlockedReason ?? undefined}
+          style={
+            executeBlockedReason
+              ? {
+                  background: 'rgba(220,53,69,0.10)',
+                  borderColor: 'var(--danger-color, #dc3545)',
+                  color: 'var(--danger-color, #dc3545)',
+                  cursor: 'help',
+                }
+              : undefined
+          }
         >
           {executing ? (
             <>
               <FaSpinner className={styles.spinner} style={{ marginRight: '0.5rem', display: 'inline-block' }} />
               {t('Ausführen…')}
             </>
+          ) : executeBlockedReason ? (
+            <>
+              <FaPlay style={{ marginRight: '0.5rem', opacity: 0.5 }} />
+              {t('Pflicht-Felder fehlen')}
+            </>
           ) : (
             <>
               <FaPlay style={{ marginRight: '0.5rem' }} />
@@ -392,19 +426,27 @@ export const CanvasHeader: React.FC<CanvasHeaderProps> = ({ workflows,
             borderRadius: 6,
             fontSize: '0.875rem',
             background: executeResult.success
-              ? 'rgba(40,167,69,0.15)'
+              ? executeResult.warning
+                ? 'rgba(255,193,7,0.15)'
+                : 'rgba(40,167,69,0.15)'
               : (executeResult as { paused?: boolean }).paused
                 ? 'rgba(0,123,255,0.15)'
                 : 'rgba(220,53,69,0.15)',
             color: executeResult.success
-              ? 'var(--success-color,#28a745)'
+              ? executeResult.warning
+                ? 'var(--warning-color,#ffc107)'
+                : 'var(--success-color,#28a745)'
               : (executeResult as { paused?: boolean }).paused
                 ? 'var(--primary-color,#007bff)'
                 : 'var(--danger-color,#dc3545)',
           }}
         >
           {executeResult.success ? (
-            <>{t('Ausführung abgeschlossen')}</>
+            executeResult.warning ? (
+              <>⚠ {executeResult.warning}</>
+            ) : (
+              <>{t('Ausführung abgeschlossen')}</>
+            )
           ) : (executeResult as { paused?: boolean }).paused ? (
             <>
               ⏸ Workflow pausiert. Öffne <strong>{t('Workflows/Tasks')}</strong> in der Sidebar, um den
diff --git a/src/components/FlowEditor/editor/FlowCanvas.tsx b/src/components/FlowEditor/editor/FlowCanvas.tsx
index 65c6743..1a3a128 100644
--- a/src/components/FlowEditor/editor/FlowCanvas.tsx
+++ b/src/components/FlowEditor/editor/FlowCanvas.tsx
@@ -4,7 +4,7 @@
  */
 
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import type { NodeType } from '../../../api/workflowApi';
+import type { GraphDefinedSchemaRef, NodeType } from '../../../api/workflowApi';
 import styles from './Automation2FlowEditor.module.css';
 
 import { useLanguage } from '../../../providers/language/LanguageContext';
@@ -23,7 +23,7 @@ export interface CanvasNode {
   outputs: number;
   parameters?: Record<string, unknown>;
   inputPorts?: Array<{ name: string; schema: string; accepts?: string[] }>;
-  outputPorts?: Array<{ name: string; schema: string }>;
+  outputPorts?: Array<{ name: string; schema: string | GraphDefinedSchemaRef }>;
 }
 
 export interface CanvasConnection {
@@ -108,6 +108,12 @@ export function computeAutoLayout(
   });
 }
 
+function _outputSchemaName(schema: string | GraphDefinedSchemaRef | undefined): string {
+  if (typeof schema === 'string') return schema;
+  if (schema && typeof schema === 'object' && schema.kind === 'fromGraph') return 'FormPayload';
+  return '';
+}
+
 /** Soft port compatibility check: returns 'ok' | 'warning' | 'error' */
 function _checkConnectionCompatibility(
   sourceNode: CanvasNode,
@@ -124,11 +130,12 @@ function _checkConnectionCompatibility(
   const tgtPort = tgtType.inputPorts[targetInputIdx];
   if (!srcPort || !tgtPort) return 'ok';
 
-  const srcSchema = srcPort.schema;
+  const srcSchema = _outputSchemaName(srcPort.schema as string | GraphDefinedSchemaRef);
   const accepts = tgtPort.accepts;
   if (!accepts || accepts.length === 0) return 'ok';
   if (accepts.includes('Transit')) return 'ok';
-  if (accepts.includes(srcSchema)) return 'ok';
+  if (srcSchema && accepts.includes(srcSchema)) return 'ok';
+  if (srcSchema?.startsWith('FormPayload') && accepts.includes('FormPayload')) return 'ok';
   return 'warning';
 }
 
@@ -143,6 +150,9 @@ interface FlowCanvasProps {
   getCategoryIcon: (category: string) => React.ReactNode;
   onSelectionChange?: (node: CanvasNode | null) => void;
   highlightedNodeIds?: Record<string, string>;
+  /** Phase-4: per-node "required-but-unbound" param errors. The canvas renders
+   *  a red error badge in the top-right of each node whose id is a key. */
+  nodeErrors?: Record<string, Array<{ paramName: string; paramLabel: string }>>;
   /** Wenn ein Drop mit einer registrierten externen MIME-Type ankommt
    * (z. B. ``application/json+workflow`` aus der UDB-FilesTab),
    * wird dieser Callback statt der Node-Type-Drop-Logik aufgerufen.
@@ -167,6 +177,7 @@ export const FlowCanvas: React.FC<FlowCanvasProps> = ({ nodes,
   getCategoryIcon,
   onSelectionChange,
   highlightedNodeIds,
+  nodeErrors,
   onExternalDrop,
 }) => {
   const { t } = useLanguage();
@@ -790,6 +801,9 @@ export const FlowCanvas: React.FC<FlowCanvasProps> = ({ nodes,
         for (let i = 0; i < node.inputs; i++) handles.push({ index: i, isOutput: false });
         for (let i = 0; i < node.outputs; i++) handles.push({ index: node.inputs + i, isOutput: true });
 
+        const wireSourceNode =
+          connectingFrom && !selectedConnectionId ? nodes.find((n) => n.id === connectingFrom.nodeId) : null;
+
         const isSelected = selectedNodeIds.has(node.id);
         const isEditingTitle = editingNodeId === node.id && editingField === 'title';
         const displayTitle = node.title ?? node.label ?? getLabel(node);
@@ -834,15 +848,54 @@ export const FlowCanvas: React.FC<FlowCanvasProps> = ({ nodes,
                 title={t('Dieser Schritt nutzt AI und verbraucht Credits')}
               />
             )}
+            {nodeErrors?.[node.id]?.length ? (
+              <div
+                role="status"
+                title={
+                  t('Pflicht-Felder ohne Quelle: ') +
+                  nodeErrors[node.id].map((e) => e.paramLabel).join(', ')
+                }
+                style={{
+                  position: 'absolute',
+                  top: -8,
+                  right: -8,
+                  minWidth: 20,
+                  height: 20,
+                  borderRadius: 10,
+                  padding: '0 6px',
+                  background: 'var(--danger-color, #dc3545)',
+                  color: '#fff',
+                  fontSize: 11,
+                  fontWeight: 700,
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  boxShadow: '0 1px 3px rgba(0,0,0,0.25)',
+                  zIndex: 5,
+                  pointerEvents: 'auto',
+                }}
+              >
+                {nodeErrors[node.id].length}
+              </div>
+            ) : null}
             {handles.map(({ index, isOutput }) => {
               const pos = getHandlePosition(node, index);
               const used = !isOutput && getUsedTargetHandles.has(`${node.id}-${index}`);
               const selConn = selectedConnectionId ? connections.find((c) => c.id === selectedConnectionId) : null;
               const isCurrentTargetOfSelection =
                 selConn && selConn.targetId === node.id && selConn.targetHandle === index;
+              let wireTargetOk = true;
+              if (!isOutput && connectingFrom && !selectedConnectionId && wireSourceNode) {
+                const sourceOutputIdx =
+                  connectingFrom.handleIndex >= wireSourceNode.inputs
+                    ? connectingFrom.handleIndex - wireSourceNode.inputs
+                    : 0;
+                wireTargetOk =
+                  _checkConnectionCompatibility(wireSourceNode, sourceOutputIdx, node, index, nodeTypes) === 'ok';
+              }
               const canConnect =
                 isOutput ||
-                (!used && connectingFrom) ||
+                (!used && !!connectingFrom && (!selectedConnectionId ? wireTargetOk : true)) ||
                 (!!selectedConnectionId && !isOutput && (!used || isCurrentTargetOfSelection));
               const nt = nodeTypeMap[node.type];
               const outputLabel = isOutput && nt?.outputLabels ? nt.outputLabels[index - node.inputs] : undefined;
diff --git a/src/components/FlowEditor/editor/NodeConfigPanel.tsx b/src/components/FlowEditor/editor/NodeConfigPanel.tsx
index 8265257..92c37cb 100644
--- a/src/components/FlowEditor/editor/NodeConfigPanel.tsx
+++ b/src/components/FlowEditor/editor/NodeConfigPanel.tsx
@@ -3,12 +3,14 @@
  * Renders each parameter using FRONTEND_TYPE_RENDERERS based on frontendType.
  */
 
-import React, { useState, useEffect, useCallback, useRef } from 'react';
+import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import type { CanvasNode } from './FlowCanvas';
-import type { NodeType, NodeTypeParameter, PortSchema } from '../../../api/workflowApi';
+import type { GraphDefinedSchemaRef, NodeType, NodeTypeParameter, PortSchema } from '../../../api/workflowApi';
 import type { ApiRequestFunction } from '../../../api/workflowApi';
 import { getLabel } from '../nodes/shared/utils';
 import { FRONTEND_TYPE_RENDERERS } from '../nodes/frontendTypeRenderers';
+import { RequiredAttributePicker } from '../nodes/shared/RequiredAttributePicker';
+import { findRequiredErrors } from '../nodes/shared/paramValidation';
 import { useAutomation2DataFlow } from '../context/Automation2DataFlowContext';
 import styles from './Automation2FlowEditor.module.css';
 
@@ -76,11 +78,27 @@ export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
   const dataFlow = useAutomation2DataFlow();
   const portTypeCatalog: Record<string, PortSchema> = (dataFlow?.portTypeCatalog as Record<string, PortSchema> | undefined) ?? {};
 
+  // Phase-4 Schicht-4 — Pflicht-Params zuerst sortieren, damit der User
+  // nicht nach unten scrollen muss, um zu sehen was fehlt.
+  const sortedParameters: NodeTypeParameter[] = useMemo(() => {
+    const all = nodeType?.parameters ?? [];
+    const required = all.filter((p) => p.required);
+    const optional = all.filter((p) => !p.required);
+    return [...required, ...optional];
+  }, [nodeType?.parameters]);
+
+  // Pre-compute which required params are unbound on this node so we can
+  // surface a panel-level summary banner.
+  const requiredErrors = useMemo(() => {
+    if (!node || !nodeType) return [];
+    return findRequiredErrors(node, nodeType, (p) => getLabel(p.description, language) || p.name);
+  }, [node, nodeType, language]);
+
   if (!node || !nodeType) return null;
 
   const isTrigger = node.type.startsWith('trigger.');
   const showNameField = onNodeUpdate && !isTrigger;
-  const parameters = nodeType.parameters || [];
+  const parameters = sortedParameters;
 
   const inputPortDefs = nodeType.inputPorts ?? {};
   const outputPortDefs = nodeType.outputPorts ?? {};
@@ -112,9 +130,18 @@ export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
         </p>
       )}
       {hasPortInfo && (
-        <details className={styles.nodeConfigPorts ?? ''} style={{ margin: '0 0 0.75rem', fontSize: '0.75rem' }}>
-          <summary style={{ cursor: 'pointer', color: 'var(--text-secondary, #666)', fontWeight: 600, padding: '0.25rem 0' }}>
-            {t('Datenfluss (Eingabe / Ausgabe)')}
+        <details className={styles.nodeConfigPorts ?? ''} style={{ margin: '0 0 0.75rem', fontSize: '0.7rem' }}>
+          <summary
+            style={{
+              cursor: 'pointer',
+              color: 'var(--text-secondary, #888)',
+              fontWeight: 500,
+              padding: '0.15rem 0',
+              fontStyle: 'italic',
+            }}
+            title={t('Statische Schema-Referenz f\u00fcr diesen Node-Typ \u2014 keine Live-Daten')}
+          >
+            {t('Schema (Typ-Referenz)')}
           </summary>
           {inputPortEntries.length > 0 && (
             <div style={{ marginTop: '0.4rem' }}>
@@ -142,7 +169,7 @@ export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
                 <_PortFieldList
                   key={`out-${idx}`}
                   portIndex={Number(idx)}
-                  schemaNames={def?.schema ? [def.schema] : []}
+                  schemaNames={_schemaNamesFromOutputPort(def)}
                   catalog={portTypeCatalog}
                   emptyLabel={t('keine Felder')}
                   language={language}
@@ -152,26 +179,123 @@ export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
           )}
         </details>
       )}
+      {requiredErrors.length > 0 && (
+        <div
+          style={{
+            marginBottom: 8,
+            padding: '6px 10px',
+            background: 'rgba(220,53,69,0.10)',
+            borderLeft: '3px solid var(--danger-color, #dc3545)',
+            borderRadius: 4,
+            fontSize: 12,
+            color: 'var(--danger-color, #dc3545)',
+          }}
+        >
+          {t('Pflicht-Felder ohne Quelle:')}{' '}
+          <strong>{requiredErrors.map((e) => e.paramLabel).join(', ')}</strong>
+        </div>
+      )}
       {parameters.map((param: NodeTypeParameter) => {
+        const useRequiredPicker = _shouldUseRequiredPicker(param);
+        if (useRequiredPicker) {
+          return (
+            <div key={param.name} style={{ marginBottom: 8 }}>
+              <RequiredAttributePicker
+                label={getLabel(param.description, language) || param.name}
+                expectedType={param.type}
+                value={params[param.name] ?? param.default}
+                onChange={(val) => updateParam(param.name, val)}
+              />
+            </div>
+          );
+        }
         const frontendType = param.frontendType || 'text';
         const Renderer = FRONTEND_TYPE_RENDERERS[frontendType] ?? FRONTEND_TYPE_RENDERERS.text;
         return (
-          <Renderer
-            key={param.name}
-            param={param}
-            value={params[param.name] ?? param.default}
-            onChange={(val: unknown) => updateParam(param.name, val)}
-            allParams={params}
-            instanceId={instanceId}
-            request={request}
-            nodeType={node.type}
-          />
+          <div key={param.name} style={{ marginBottom: 4 }}>
+            <div style={{ display: 'flex', alignItems: 'center', gap: 6, marginBottom: 2 }}>
+              {param.required && (
+                <span
+                  title={t('Pflichtfeld')}
+                  style={{ color: 'var(--danger-color, #dc3545)', fontWeight: 700 }}
+                >
+                  *
+                </span>
+              )}
+              {param.type && (
+                <span
+                  title={t('Parameter-Typ')}
+                  style={{
+                    fontSize: 10,
+                    fontWeight: 600,
+                    color: '#555',
+                    background: '#eee',
+                    borderRadius: 4,
+                    padding: '1px 6px',
+                  }}
+                >
+                  {param.type}
+                </span>
+              )}
+            </div>
+            <Renderer
+              param={param}
+              value={params[param.name] ?? param.default}
+              onChange={(val: unknown) => updateParam(param.name, val)}
+              allParams={params}
+              instanceId={instanceId}
+              request={request}
+              nodeType={node.type}
+            />
+          </div>
         );
       })}
     </div>
   );
 };
 
+/** Heuristic: required params with a Schicht-1 catalog type (non-primitive
+ *  ref/record/list) get the typed RequiredAttributePicker; primitive scalars
+ *  fall through to the legacy frontend-type renderer (text/number/select etc.)
+ *  unless they have no frontendType at all and a non-trivial type. */
+function _shouldUseRequiredPicker(param: NodeTypeParameter): boolean {
+  if (!param.required) return false;
+  if (!param.type) return false;
+  // Always defer to specialized FE renderers when explicitly chosen.
+  if (param.frontendType && _LEGACY_RENDERERS_THAT_HANDLE_BINDINGS.has(param.frontendType)) {
+    return false;
+  }
+  // Catalog ref/record/list types are best handled by RequiredAttributePicker.
+  if (/^(List\[|Dict\[)/.test(param.type)) return true;
+  if (/^[A-Z]/.test(param.type)) return true;
+  return false;
+}
+
+const _LEGACY_RENDERERS_THAT_HANDLE_BINDINGS = new Set([
+  'userConnection',
+  'sharepointFolder',
+  'sharepointFile',
+  'clickupList',
+  'clickupTask',
+  'dataRef',
+  'caseList',
+  'fieldBuilder',
+  'keyValueRows',
+  'cron',
+  'condition',
+  'mappingTable',
+  'filterExpression',
+  'attachmentBuilder',
+  'json',
+]);
+
+function _schemaNamesFromOutputPort(def: { schema?: string | GraphDefinedSchemaRef } | undefined): string[] {
+  if (!def?.schema) return [];
+  if (typeof def.schema === 'string') return [def.schema];
+  if (typeof def.schema === 'object' && def.schema.kind === 'fromGraph') return ['FormPayload', 'FormPayload_dynamic'];
+  return [];
+}
+
 interface _PortFieldListProps {
   portIndex: number;
   schemaNames: string[];
diff --git a/src/components/FlowEditor/nodes/frontendTypeRenderers/DataRefRenderer.tsx b/src/components/FlowEditor/nodes/frontendTypeRenderers/DataRefRenderer.tsx
new file mode 100644
index 0000000..ecf7902
--- /dev/null
+++ b/src/components/FlowEditor/nodes/frontendTypeRenderers/DataRefRenderer.tsx
@@ -0,0 +1,168 @@
+/**
+ * DataRefRenderer — Pick-not-Push attribute binding using the existing
+ * hierarchical DataPicker.
+ *
+ * For required typed parameters (e.g. ``documentList: DocumentList``) where
+ * the user must explicitly bind to an upstream node's typed output. Replaces
+ * the legacy ``frontendType: "hidden"`` so the binding becomes visible and
+ * editable directly in the node config panel.
+ */
+
+import React from 'react';
+import { useLanguage } from '../../../../providers/language/LanguageContext';
+import { useAutomation2DataFlow } from '../../context/Automation2DataFlowContext';
+import { DataPicker } from '../shared/DataPicker';
+import { isRef, type DataRef, type SystemVarRef } from '../shared/dataRef';
+import type { FieldRendererProps } from './index';
+
+export const DataRefRenderer: React.FC<FieldRendererProps> = ({ param, value, onChange }) => {
+  const { t } = useLanguage();
+  const dataFlow = useAutomation2DataFlow();
+  const [pickerOpen, setPickerOpen] = React.useState(false);
+
+  const currentRef = isRef(value) ? (value as DataRef) : null;
+  const isMissing = param.required && !currentRef;
+
+  const sourceIds = dataFlow?.getAvailableSourceIds() ?? [];
+  const hasSources = sourceIds.some((id) => {
+    const n = dataFlow?.nodes.find((x) => x.id === id);
+    return n?.type !== 'trigger.manual';
+  });
+
+  const currentNodeLabel = currentRef
+    ? dataFlow?.getNodeLabel(
+        dataFlow.nodes.find((n) => n.id === currentRef.nodeId) ?? { id: currentRef.nodeId },
+      ) ?? currentRef.nodeId
+    : null;
+
+  const onPick = (picked: DataRef | SystemVarRef) => {
+    onChange(picked);
+  };
+
+  return (
+    <div style={{ marginBottom: 8 }}>
+      <label style={{ display: 'block', fontSize: 12, marginBottom: 2, fontWeight: 600 }}>
+        {param.description || param.name}
+        {param.required && <span style={{ color: '#d9534f', marginLeft: 4 }}>*</span>}
+        {param.type && (
+          <span
+            style={{
+              marginLeft: 6,
+              fontFamily: 'monospace',
+              fontWeight: 500,
+              fontSize: 10,
+              color: '#666',
+              background: '#eef',
+              padding: '0 4px',
+              borderRadius: 3,
+            }}
+            title={t('Erwarteter Typ')}
+          >
+            {param.type}
+          </span>
+        )}
+      </label>
+
+      {currentRef && (
+        <div
+          style={{
+            padding: '4px 8px',
+            background: '#eaf6e8',
+            border: '1px solid #5cb85c',
+            borderRadius: 4,
+            fontSize: 12,
+            marginBottom: 4,
+            display: 'flex',
+            alignItems: 'center',
+            gap: 6,
+          }}
+          title={t('Aktive DataRef-Bindung')}
+        >
+          <span style={{ color: '#3c763d', fontWeight: 700 }}>{'\u2190'}</span>
+          <span style={{ fontFamily: 'monospace', color: '#3c763d', flex: 1 }}>
+            {currentNodeLabel}
+            {currentRef.path.length > 0 && (
+              <>
+                <span style={{ color: '#999' }}>{' \u2192 '}</span>
+                {currentRef.path.map((p) => String(p)).join('.')}
+              </>
+            )}
+          </span>
+          {currentRef.expectedType && (
+            <span style={{ fontSize: 10, color: '#666', fontFamily: 'monospace' }}>
+              {currentRef.expectedType}
+            </span>
+          )}
+          <button
+            type="button"
+            onClick={() => onChange(undefined)}
+            title={t('Bindung entfernen')}
+            style={{
+              padding: '0 6px',
+              border: '1px solid #5cb85c',
+              borderRadius: 3,
+              background: '#fff',
+              color: '#3c763d',
+              cursor: 'pointer',
+              fontSize: 11,
+            }}
+          >
+            ×
+          </button>
+        </div>
+      )}
+
+      {isMissing && (
+        <div
+          style={{
+            padding: '4px 8px',
+            background: '#fdecea',
+            border: '1px solid #d9534f',
+            borderRadius: 4,
+            fontSize: 12,
+            color: '#a94442',
+            marginBottom: 4,
+          }}
+        >
+          {t('Pflicht-Bindung fehlt — Quelle aus Upstream-Node wählen.')}
+        </div>
+      )}
+
+      <button
+        type="button"
+        onClick={() => setPickerOpen(true)}
+        disabled={!hasSources}
+        style={{
+          width: '100%',
+          padding: '4px 8px',
+          borderRadius: 4,
+          border: `1px solid ${isMissing ? '#d9534f' : currentRef ? '#5cb85c' : '#1c5fb5'}`,
+          background: hasSources ? '#fff' : '#f5f5f5',
+          color: hasSources ? '#1c5fb5' : '#999',
+          cursor: hasSources ? 'pointer' : 'not-allowed',
+          fontSize: 12,
+          textAlign: 'left',
+        }}
+      >
+        {!hasSources
+          ? t('Keine vorherigen Nodes verfügbar')
+          : currentRef
+            ? t('Bindung ändern …')
+            : t('Quelle wählen …')}
+      </button>
+
+      {dataFlow && (
+        <DataPicker
+          open={pickerOpen}
+          onClose={() => setPickerOpen(false)}
+          onPick={onPick}
+          availableSourceIds={sourceIds}
+          nodes={dataFlow.nodes}
+          nodeOutputsPreview={dataFlow.nodeOutputsPreview}
+          getNodeLabel={dataFlow.getNodeLabel}
+          expectedParamType={param.type}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx b/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx
index 3d86c7f..a910ca6 100644
--- a/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx
+++ b/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx
@@ -26,6 +26,11 @@ export type FieldRendererComponent = ComponentType<FieldRendererProps>;
 import React from 'react';
 
 import { useLanguage } from '../../../../providers/language/LanguageContext';
+import { useAutomation2DataFlow } from '../../context/Automation2DataFlowContext';
+import { toApiGraph } from '../shared/graphUtils';
+import { postUpstreamPaths } from '../../../../api/workflowApi';
+import type { CanvasNode } from '../../editor/FlowCanvas';
+import { DataRefRenderer } from './DataRefRenderer';
 
 const TextInput: React.FC<FieldRendererProps> = ({ param, value, onChange }) => (
   <div style={{ marginBottom: 8 }}>
@@ -152,8 +157,11 @@ const HiddenInput: React.FC<FieldRendererProps> = () => null;
 
 const ConnectionPicker: React.FC<FieldRendererProps> = ({ param, value, onChange, instanceId, request }) => {
   const { t } = useLanguage();
+  const dataFlow = useAutomation2DataFlow();
   const [connections, setConnections] = React.useState<Array<{ id: string; label: string }>>([]);
   const [loadError, setLoadError] = React.useState<string | null>(null);
+  const [upstreamBindOptions, setUpstreamBindOptions] = React.useState<Array<{ key: string; label: string; ref: unknown }>>([]);
+  const autoSingleRef = React.useRef(false);
   const authority = (param.frontendOptions?.authority as string | undefined) || undefined;
   React.useEffect(() => {
     if (!instanceId || !request) return;
@@ -170,26 +178,100 @@ const ConnectionPicker: React.FC<FieldRendererProps> = ({ param, value, onChange
         setLoadError(err instanceof Error ? err.message : String(err));
       });
   }, [instanceId, request, authority]);
+
+  React.useEffect(() => {
+    if (!instanceId || !request || !dataFlow?.currentNodeId) {
+      setUpstreamBindOptions([]);
+      return;
+    }
+    const graph = toApiGraph(dataFlow.nodes as CanvasNode[], dataFlow.connections);
+    postUpstreamPaths(request, instanceId, graph, dataFlow.currentNodeId)
+      .then(({ paths }) => {
+        const opts = paths
+          .filter(
+            (p) =>
+              p.path.length > 0
+              && (String(p.path[p.path.length - 1]) === 'id' || p.path.join('.').includes('connection')),
+          )
+          .map((p, i) => ({
+            key: `${p.producerNodeId}:${p.path.join('.')}:${i}`,
+            label: `${p.producerLabel ?? p.producerNodeId} → ${p.label}`,
+            ref: {
+              type: 'ref',
+              nodeId: p.producerNodeId,
+              path: p.path,
+              expectedType: p.type,
+            },
+          }));
+        setUpstreamBindOptions(opts);
+      })
+      .catch(() => setUpstreamBindOptions([]));
+  }, [instanceId, request, dataFlow?.currentNodeId, dataFlow?.nodes, dataFlow?.connections]);
+
+  React.useEffect(() => {
+    if (connections.length !== 1 || autoSingleRef.current) return;
+    if (value !== '' && value !== undefined && value !== null) return;
+    autoSingleRef.current = true;
+    onChange(connections[0].id);
+  }, [connections, value, onChange]);
+
+  const strVal = typeof value === 'string' ? value : '';
+  const isRef = typeof value === 'object' && value !== null && (value as { type?: string }).type === 'ref';
+  const selectedUpstreamKey =
+    isRef
+      ? upstreamBindOptions.find((o) => {
+          const r = o.ref as { nodeId?: string; path?: unknown[] };
+          const v = value as { nodeId?: string; path?: unknown[] };
+          return r.nodeId === v.nodeId && JSON.stringify(r.path ?? []) === JSON.stringify(v.path ?? []);
+        })?.key ?? ''
+      : '';
+
   return (
     <div style={{ marginBottom: 8 }}>
       <label style={{ display: 'block', fontSize: 12, marginBottom: 2 }}>{param.description || param.name}</label>
-      <select
-        value={typeof value === 'string' ? value : ''}
-        onChange={(e) => onChange(e.target.value)}
-        style={{ width: '100%', padding: '4px 8px', borderRadius: 4, border: '1px solid #ccc' }}
-      >
-        <option value="">{t('Verbindung wählen')}</option>
-        {connections.map((c) => (
-          <option key={c.id} value={c.id}>{c.label}</option>
-        ))}
-      </select>
-      {!loadError && connections.length === 0 && (
-        <div style={{ fontSize: 11, color: '#888', marginTop: 2 }}>
+      {connections.length === 0 && !loadError && (
+        <div style={{ fontSize: 11, color: '#888', marginBottom: 4 }}>
           {authority
             ? t('Keine {authority}-Verbindung gefunden — Verbindung in den Account-Einstellungen anlegen.', { authority })
             : t('Keine Verbindung gefunden — Verbindung in den Account-Einstellungen anlegen.')}
         </div>
       )}
+      {connections.length === 1 && (
+        <div style={{ fontSize: 12, marginBottom: 4, color: '#444' }}>
+          {connections[0].label}
+        </div>
+      )}
+      {connections.length > 1 && (
+        <select
+          value={strVal}
+          onChange={(e) => onChange(e.target.value)}
+          style={{ width: '100%', padding: '4px 8px', borderRadius: 4, border: '1px solid #ccc' }}
+        >
+          <option value="">{t('Verbindung wählen')}</option>
+          {connections.map((c) => (
+            <option key={c.id} value={c.id}>{c.label}</option>
+          ))}
+        </select>
+      )}
+      {upstreamBindOptions.length > 0 && (
+        <div style={{ marginTop: 6 }}>
+          <div style={{ fontSize: 11, color: '#666', marginBottom: 2 }}>{t('Oder aus vorherigem Node (DataRef)')}</div>
+          <select
+            value={selectedUpstreamKey}
+            onChange={(e) => {
+              const opt = upstreamBindOptions.find((o) => o.key === e.target.value);
+              if (opt) onChange(opt.ref);
+              else if (!e.target.value) onChange('');
+            }}
+            style={{ width: '100%', padding: '4px 8px', borderRadius: 4, border: '1px solid #ccc' }}
+          >
+            <option value="">{t('—')}</option>
+            {upstreamBindOptions.map((o) => (
+              <option key={o.key} value={o.key}>{o.label}</option>
+            ))}
+          </select>
+        </div>
+      )}
       {loadError && (
         <div style={{ fontSize: 11, color: '#c00', marginTop: 2 }}>{t('Verbindungen konnten nicht geladen werden')}</div>
       )}
@@ -470,12 +552,65 @@ const FieldBuilderEditor: React.FC<FieldRendererProps> = ({ param, value, onChan
             <option value="checkbox">{t('Kontrollkästchen')}</option>
             <option value="select">{t('Auswahl')}</option>
             <option value="textarea">{t('Mehrzeilig')}</option>
+            <option value="group">{t('Gruppe')}</option>
           </select>
           <input type="text" placeholder={t('Bezeichnung')} value={String(f.label ?? '')} onChange={(e) => updateField(i, 'label', e.target.value)} style={{ flex: 1, padding: '2px 4px', borderRadius: 4, border: '1px solid #ccc' }} />
           <label style={{ fontSize: 11, display: 'flex', alignItems: 'center', gap: 2 }}>
             <input type="checkbox" checked={Boolean(f.required)} onChange={(e) => updateField(i, 'required', e.target.checked)} /> {t('Pflicht')}
           </label>
           <button onClick={() => removeField(i)} style={{ padding: '2px 8px', borderRadius: 4, border: '1px solid #ccc', cursor: 'pointer' }}>×</button>
+          {String(f.type) === 'group' && (
+            <div style={{ width: '100%', marginTop: 6, marginLeft: 8, borderLeft: '2px solid #ddd', paddingLeft: 8 }}>
+              <div style={{ fontSize: 11, color: '#666', marginBottom: 4 }}>{t('Unterfelder')}</div>
+              {(Array.isArray(f.fields) ? f.fields : []).map((sub: Record<string, unknown>, j: number) => (
+                <div key={j} style={{ display: 'flex', gap: 4, marginBottom: 4, flexWrap: 'wrap' }}>
+                  <input
+                    type="text"
+                    placeholder={t('Name')}
+                    value={String(sub.name ?? '')}
+                    onChange={(e) => {
+                      const nextFields = [...(Array.isArray(f.fields) ? f.fields : [])];
+                      nextFields[j] = { ...sub, name: e.target.value };
+                      updateField(i, 'fields', nextFields);
+                    }}
+                    style={{ flex: 1, minWidth: 80, padding: '2px 4px', borderRadius: 4, border: '1px solid #ccc' }}
+                  />
+                  <select
+                    value={String(sub.type ?? 'text')}
+                    onChange={(e) => {
+                      const nextFields = [...(Array.isArray(f.fields) ? f.fields : [])];
+                      nextFields[j] = { ...sub, type: e.target.value };
+                      updateField(i, 'fields', nextFields);
+                    }}
+                    style={{ flex: 1, minWidth: 80, padding: '2px 4px', borderRadius: 4, border: '1px solid #ccc' }}
+                  >
+                    <option value="text">{t('Text')}</option>
+                    <option value="number">{t('Zahl')}</option>
+                  </select>
+                  <button
+                    type="button"
+                    onClick={() => {
+                      const nextFields = (Array.isArray(f.fields) ? f.fields : []).filter((_: unknown, k: number) => k !== j);
+                      updateField(i, 'fields', nextFields);
+                    }}
+                    style={{ padding: '2px 8px', borderRadius: 4, border: '1px solid #ccc', cursor: 'pointer' }}
+                  >
+                    ×
+                  </button>
+                </div>
+              ))}
+              <button
+                type="button"
+                onClick={() => {
+                  const nextFields = [...(Array.isArray(f.fields) ? f.fields : []), { name: '', type: 'text', label: '', required: false }];
+                  updateField(i, 'fields', nextFields);
+                }}
+                style={{ padding: '2px 8px', borderRadius: 4, border: '1px solid #ccc', cursor: 'pointer', fontSize: 11 }}
+              >
+                {t('Unterfeld hinzufügen')}
+              </button>
+            </div>
+          )}
         </div>
       ))}
       <button onClick={addField} style={{ padding: '2px 8px', borderRadius: 4, border: '1px solid #ccc', cursor: 'pointer', fontSize: 12 }}>{t('Feld hinzufügen')}</button>
@@ -618,6 +753,7 @@ export const FRONTEND_TYPE_RENDERERS: Record<string, FieldRendererComponent> = {
   json: JsonEditor,
   file: TextInput,
   hidden: HiddenInput,
+  dataRef: DataRefRenderer,
   userConnection: ConnectionPicker,
   sharepointFolder: SharepointPathPicker,
   sharepointFile: SharepointPathPicker,
@@ -630,6 +766,7 @@ export const FRONTEND_TYPE_RENDERERS: Record<string, FieldRendererComponent> = {
   condition: ConditionBuilder,
   mappingTable: MappingTableEditor,
   filterExpression: FilterExpressionEditor,
+  attachmentBuilder: JsonEditor,
 };
 
 export default FRONTEND_TYPE_RENDERERS;
diff --git a/src/components/FlowEditor/nodes/shared/DataPicker.test.tsx b/src/components/FlowEditor/nodes/shared/DataPicker.test.tsx
new file mode 100644
index 0000000..2df5ba5
--- /dev/null
+++ b/src/components/FlowEditor/nodes/shared/DataPicker.test.tsx
@@ -0,0 +1,194 @@
+// Copyright (c) 2025 Patrick Motsch
+// All rights reserved.
+//
+// Plan #2 — Track A1.2 / A1.3
+// T7: DataPicker strict-type filtering (only compatible candidates rendered).
+// T8: DataPicker generic object drill-down via wildcard '*' segment when the
+//     schema declares List[X] of a known X.
+
+import React from 'react';
+import { describe, expect, it, vi } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import type { CanvasConnection, CanvasNode } from '../../editor/FlowCanvas';
+import type { NodeType, PortField, PortSchema } from '../../../../api/workflowApi';
+import type { DataRef, SystemVarRef } from './dataRef';
+
+vi.mock('../../../../providers/language/LanguageContext', () => ({
+  useLanguage: () => ({ t: (s: string) => s }),
+}));
+
+let _ctxValue: unknown = null;
+vi.mock('../../context/Automation2DataFlowContext', () => ({
+  useAutomation2DataFlow: () => _ctxValue,
+}));
+
+import { DataPicker } from './DataPicker';
+
+// ---------------------------------------------------------------------------
+// Fixtures
+// ---------------------------------------------------------------------------
+
+function _field(name: string, type: string): PortField {
+  return { name, type, description: '', required: false };
+}
+
+const _docListSchema: PortSchema = {
+  name: 'DocumentList',
+  fields: [
+    _field('documents', 'List[UdmDocument]'),
+    _field('count', 'int'),
+    _field('meta', 'str'),
+  ],
+};
+const _udmDocumentSchema: PortSchema = {
+  name: 'UdmDocument',
+  fields: [
+    _field('name', 'str'),
+    _field('mimeType', 'str'),
+    _field('sizeBytes', 'int'),
+  ],
+};
+
+const _portCatalog: Record<string, PortSchema> = {
+  DocumentList: _docListSchema,
+  UdmDocument: _udmDocumentSchema,
+};
+
+function _setContext(opts: {
+  consumerNodeId: string;
+  nodes: CanvasNode[];
+  connections: CanvasConnection[];
+  nodeTypes: NodeType[];
+}) {
+  _ctxValue = {
+    currentNodeId: opts.consumerNodeId,
+    nodes: opts.nodes,
+    connections: opts.connections,
+    nodeTypes: opts.nodeTypes,
+    portTypeCatalog: _portCatalog,
+    nodeOutputsPreview: {},
+    systemVariables: {},
+    language: 'de',
+    getNodeLabel: (n: { id: string; title?: string }) => n.title ?? n.id,
+    getAvailableSourceIds: () => opts.nodes.filter((n) => n.id !== opts.consumerNodeId).map((n) => n.id),
+    parseGraphDefinedSchema: () => null,
+  };
+}
+
+function _node(id: string, type: string): CanvasNode {
+  return { id, type, title: id, x: 0, y: 0, inputs: 1, outputs: 1, parameters: {} };
+}
+function _conn(id: string, src: string, tgt: string): CanvasConnection {
+  return { id, sourceId: src, sourceHandle: 0, targetId: tgt, targetHandle: 0 };
+}
+function _nodeType(id: string, outputSchema: string): NodeType {
+  return {
+    id,
+    label: id,
+    description: id,
+    category: 'test',
+    parameters: [],
+    inputs: 1,
+    outputs: 1,
+    outputPorts: [{ schema: outputSchema }],
+  } as unknown as NodeType;
+}
+
+function _renderPicker(props?: { expectedParamType?: string; onPick?: (r: DataRef | SystemVarRef) => void }) {
+  const upstream = _node('up', 'sharepoint.readDocs');
+  const consumer = _node('cons', 'ai.summarize');
+  _setContext({
+    consumerNodeId: 'cons',
+    nodes: [upstream, consumer],
+    connections: [_conn('c1', 'up', 'cons')],
+    nodeTypes: [_nodeType('sharepoint.readDocs', 'DocumentList'), _nodeType('ai.summarize', 'AiResult')],
+  });
+  return render(
+    <DataPicker
+      open
+      onClose={() => {}}
+      onPick={props?.onPick ?? (() => {})}
+      availableSourceIds={['up']}
+      nodes={[upstream]}
+      nodeOutputsPreview={{}}
+      getNodeLabel={(n) => n.title ?? n.id}
+      expectedParamType={props?.expectedParamType}
+    />,
+  );
+}
+
+// ---------------------------------------------------------------------------
+// T8: Wildcard drill-down
+// ---------------------------------------------------------------------------
+
+describe('DataPicker — generic-object drill-down (T8)', () => {
+  it('renders the wildcard "documents → * → name" path when drilling into List[UdmDocument]', async () => {
+    _renderPicker();
+    await userEvent.click(screen.getByText(/^up$/));
+    expect(screen.getByText(/documents → \* → name/)).toBeInTheDocument();
+    expect(screen.getByText(/documents → \* → mimeType/)).toBeInTheDocument();
+  });
+
+  it('lists the wholeOutput, top-level fields, and drilled fields together', async () => {
+    _renderPicker();
+    await userEvent.click(screen.getByText(/^up$/));
+    expect(screen.getByText('documents')).toBeInTheDocument();
+    expect(screen.getByText('count')).toBeInTheDocument();
+    expect(screen.getByText('meta')).toBeInTheDocument();
+    // Multiple drilled candidates exist (name, mimeType, sizeBytes, _success, _error).
+    expect(screen.getAllByText(/documents → \*/).length).toBeGreaterThanOrEqual(2);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// T7: Strict type filter
+// ---------------------------------------------------------------------------
+
+describe('DataPicker — strict type filtering (T7)', () => {
+  it('hides hard-mismatch fields when expectedParamType is set + strict toggle is on (default)', async () => {
+    _renderPicker({ expectedParamType: 'str' });
+    expect(screen.getByLabelText(/Nur kompatible/i)).toBeChecked();
+    await userEvent.click(screen.getByText(/^up$/));
+    // documents (List[UdmDocument]) is a hard mismatch → must be hidden.
+    expect(screen.queryByText('documents')).not.toBeInTheDocument();
+    // meta (str) is exact match → kept.
+    expect(screen.getByText('meta')).toBeInTheDocument();
+    // count (int) is "coerce" against str → kept (coerce is allowed in strict mode).
+    expect(screen.getByText('count')).toBeInTheDocument();
+    // Drilled wildcard candidates of type str (name, mimeType) remain.
+    expect(screen.getByText(/documents → \* → name/)).toBeInTheDocument();
+  });
+
+  it('shows all fields after the user disables the strict toggle', async () => {
+    _renderPicker({ expectedParamType: 'str' });
+    await userEvent.click(screen.getByLabelText(/Nur kompatible/i));
+    await userEvent.click(screen.getByText(/^up$/));
+    expect(screen.getByText('documents')).toBeInTheDocument();
+    expect(screen.getByText('count')).toBeInTheDocument();
+    expect(screen.getByText('meta')).toBeInTheDocument();
+  });
+
+  it('shows the iterieren-button on List[X] candidates that match expectedParamType=X (T6)', async () => {
+    _renderPicker({ expectedParamType: 'UdmDocument' });
+    await userEvent.click(screen.getByText(/^up$/));
+    // documents (List[UdmDocument]) is the only candidate with expectedParamType=UdmDocument
+    expect(screen.getByText('documents')).toBeInTheDocument();
+    expect(screen.getByText('iterieren')).toBeInTheDocument();
+  });
+
+  it('emits a wildcard ref when the user clicks "iterieren"', async () => {
+    const onPick = vi.fn();
+    _renderPicker({ expectedParamType: 'UdmDocument', onPick });
+    await userEvent.click(screen.getByText(/^up$/));
+    await userEvent.click(screen.getByText('iterieren'));
+    expect(onPick).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: 'ref',
+        nodeId: 'up',
+        path: ['documents', '*'],
+        expectedType: 'UdmDocument',
+      }),
+    );
+  });
+});
diff --git a/src/components/FlowEditor/nodes/shared/DataPicker.tsx b/src/components/FlowEditor/nodes/shared/DataPicker.tsx
index 8735008..c1ea657 100644
--- a/src/components/FlowEditor/nodes/shared/DataPicker.tsx
+++ b/src/components/FlowEditor/nodes/shared/DataPicker.tsx
@@ -5,10 +5,11 @@
  * Includes a System Variables section.
  */
 
-import React, { useState } from 'react';
-import { createRef, createSystemVar, type DataRef, type SystemVarRef } from './dataRef';
+import React, { useMemo, useState } from 'react';
+import { createRef, createSystemVar, type DataRef, type SystemVarRef, isCompatible } from './dataRef';
 import { useAutomation2DataFlow } from '../../context/Automation2DataFlowContext';
-import type { NodeType, PortSchema } from '../../../../api/workflowApi';
+import type { GraphDefinedSchemaRef, NodeType, PortSchema } from '../../../../api/workflowApi';
+import { findLoopAncestorIds } from './scopeHelpers';
 import styles from '../../editor/Automation2FlowEditor.module.css';
 
 import { useLanguage } from '../../../../providers/language/LanguageContext';
@@ -18,33 +19,103 @@ interface DataPickerProps {
   onClose: () => void;
   onPick: (ref: DataRef | SystemVarRef) => void;
   availableSourceIds: string[];
-  nodes: Array<{ id: string; title?: string; type?: string }>;
+  nodes: Array<{ id: string; title?: string; type?: string; parameters?: Record<string, unknown> }>;
   nodeOutputsPreview: Record<string, unknown>;
   getNodeLabel: (node: { id: string; title?: string }) => string;
+  /** When set, the picker can hide incompatible candidates (strict toggle) and
+   *  surfaces "Iterieren als Loop" affordances for List[X]→X candidates. */
+  expectedParamType?: string;
 }
 
 interface PickablePath {
   path: (string | number)[];
   label: string;
   type?: string;
+  /** True iff this path produces `List[X]` and the consumer expects `X` —
+   *  picking with iterate=true appends the wildcard segment. */
+  iterable?: boolean;
 }
 
+const _LIST_INNER_RE = /^List\[(.+)\]$/;
+
 function _buildPathsFromSchema(
   schema: PortSchema | undefined,
+  catalog: Record<string, PortSchema>,
   basePath: (string | number)[] = [],
+  depth = 0,
 ): PickablePath[] {
-  if (!schema || !schema.fields) return [];
+  if (!schema || !schema.fields || depth > 8) return [];
   const result: PickablePath[] = [];
   for (const field of schema.fields) {
     const fieldPath = [...basePath, field.name];
     const label = fieldPath.map(String).join(' → ');
     result.push({ path: fieldPath, label, type: field.type });
+    const m = typeof field.type === 'string' ? field.type.match(_LIST_INNER_RE) : null;
+    const inner = m?.[1]?.trim();
+    if (inner && catalog[inner]) {
+      // Generic List drill-down: use '*' wildcard so the engine maps each item.
+      result.push(..._buildPathsFromSchema(catalog[inner], catalog, [...fieldPath, '*'], depth + 1));
+    }
   }
   result.push({ path: [...basePath, '_success'], label: [...basePath, '_success'].map(String).join(' → '), type: 'bool' });
   result.push({ path: [...basePath, '_error'], label: [...basePath, '_error'].map(String).join(' → '), type: 'str' });
   return result;
 }
 
+/** Annotate each candidate with `iterable=true` if it is `List[X]` and the
+ *  consumer expects `X`. Used to render a "Iterieren als Loop"-Vorschlag. */
+function _markIterableCandidates(paths: PickablePath[], expectedParamType?: string): PickablePath[] {
+  if (!expectedParamType) return paths;
+  return paths.map((p) => {
+    if (!p.type) return p;
+    const m = p.type.match(_LIST_INNER_RE);
+    if (m && m[1].trim() === expectedParamType) return { ...p, iterable: true };
+    return p;
+  });
+}
+
+function _deriveFormPortSchemaFromParams(
+  node: { parameters?: Record<string, unknown> },
+  paramKey: string,
+): PortSchema | undefined {
+  const raw = node.parameters?.[paramKey];
+  if (!Array.isArray(raw)) return undefined;
+  const fields: Array<{ name: string; type: string; description: string | Record<string, string>; required: boolean }> = [];
+  for (const item of raw) {
+    if (typeof item !== 'object' || item === null) continue;
+    const rec = item as Record<string, unknown>;
+    if (typeof rec.name !== 'string') continue;
+    const lab = rec.label;
+    let description: string | Record<string, string> = rec.name;
+    if (typeof lab === 'string') description = lab;
+    else if (lab && typeof lab === 'object') description = lab as Record<string, string>;
+    const ftype = typeof rec.type === 'string' ? rec.type : 'str';
+    if (ftype === 'group' && Array.isArray(rec.fields)) {
+      for (const sub of rec.fields as Record<string, unknown>[]) {
+        if (!sub || typeof sub.name !== 'string') continue;
+        const sl = sub.label;
+        let sdesc: string | Record<string, string> = `${rec.name}.${sub.name}`;
+        if (typeof sl === 'string') sdesc = sl;
+        else if (sl && typeof sl === 'object') sdesc = sl as Record<string, string>;
+        fields.push({
+          name: `${rec.name}.${sub.name}`,
+          type: typeof sub.type === 'string' ? sub.type : 'str',
+          description: sdesc,
+          required: Boolean(sub.required),
+        });
+      }
+      continue;
+    }
+    fields.push({
+      name: rec.name,
+      type: ftype,
+      description,
+      required: Boolean(rec.required),
+    });
+  }
+  return fields.length ? { name: 'FormPayload_dynamic', fields } : undefined;
+}
+
 function _buildPathsFromPreview(
   obj: unknown,
   basePath: (string | number)[] = [],
@@ -74,7 +145,7 @@ function _buildPathsFromPreview(
 
 function _resolveSchemaForNode(
   nodeId: string,
-  nodes: Array<{ id: string; type?: string }>,
+  nodes: Array<{ id: string; type?: string; parameters?: Record<string, unknown> }>,
   nodeTypes: NodeType[],
   connections: Array<{ source: string; target: string; sourceOutput?: number }>,
   catalog: Record<string, PortSchema>,
@@ -88,11 +159,23 @@ function _resolveSchemaForNode(
   const typeDef = nodeTypes.find((nt) => nt.id === node.type);
   if (!typeDef?.outputPorts) return undefined;
 
-  const port0 = typeDef.outputPorts[0];
+  const port0 = typeDef.outputPorts[0] as {
+    schema?: string | GraphDefinedSchemaRef;
+    dynamic?: boolean;
+    deriveFrom?: string;
+  };
   if (!port0) return undefined;
 
-  if (port0.schema !== 'Transit') {
-    return catalog[port0.schema];
+  const schemaSpec = port0.schema;
+  if (typeof schemaSpec === 'object' && schemaSpec !== null && schemaSpec.kind === 'fromGraph') {
+    const paramKey = schemaSpec.parameter ?? 'fields';
+    return _deriveFormPortSchemaFromParams(node, paramKey);
+  }
+  if (port0.dynamic && port0.deriveFrom) {
+    return _deriveFormPortSchemaFromParams(node, port0.deriveFrom);
+  }
+  if (typeof schemaSpec === 'string' && schemaSpec !== 'Transit') {
+    return catalog[schemaSpec];
   }
 
   // Transit: follow the incoming connection to find the real producer
@@ -108,23 +191,42 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
   nodes,
   nodeOutputsPreview,
   getNodeLabel,
+  expectedParamType,
 }) => {
   const { t } = useLanguage();
   const [expandedNodes, setExpandedNodes] = useState<Set<string>>(new Set());
   const [showSystem, setShowSystem] = useState(false);
+  // Default: when the consumer declares an expected type, show only compatible
+  // candidates ("strict" mode). User can override per-session via the toggle.
+  const [strictFilter, setStrictFilter] = useState<boolean>(Boolean(expectedParamType));
   const ctx = useAutomation2DataFlow();
 
+  // NOTE: All hooks must be called unconditionally on every render to satisfy
+  // the Rules of Hooks. The `if (!open) return null;` early-return therefore
+  // has to live BELOW every hook in this component. Adding a useMemo (or any
+  // other hook) below it would change the hook count when the picker toggles
+  // open/closed and crash the whole tree (white screen).
+  const connectionsRaw = ctx?.connections ?? [];
+  const connections = useMemo(
+    () =>
+      connectionsRaw.map((c) => ({
+        source: c.sourceId,
+        target: c.targetId,
+        sourceOutput: c.sourceHandle,
+      })),
+    [connectionsRaw],
+  );
+  const loopAncestorIds = useMemo(() => {
+    const cid = ctx?.currentNodeId;
+    if (!cid) return [] as string[];
+    return findLoopAncestorIds(nodes, connections, cid);
+  }, [ctx?.currentNodeId, nodes, connections]);
+
   if (!open) return null;
 
   const catalog = ctx?.portTypeCatalog ?? {};
   const systemVars = ctx?.systemVariables ?? {};
   const nodeTypes = ctx?.nodeTypes ?? [];
-  const connectionsRaw = ctx?.connections ?? [];
-  const connections = connectionsRaw.map((c) => ({
-    source: c.sourceId,
-    target: c.targetId,
-    sourceOutput: c.sourceHandle,
-  }));
 
   const toggleExpand = (nodeId: string) => {
     setExpandedNodes((prev) => {
@@ -135,8 +237,15 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
     });
   };
 
-  const handlePick = (nodeId: string, path: (string | number)[]) => {
-    onPick(createRef(nodeId, path));
+  const handlePick = (nodeId: string, path: (string | number)[], expectedType?: string) => {
+    onPick(createRef(nodeId, path, expectedType));
+    onClose();
+  };
+
+  /** Loop-Vorschlag: for List[X]→X candidates, append the '*' wildcard so the
+   *  engine maps the consumer over each element (executionEngine wildcard). */
+  const handlePickIterate = (nodeId: string, path: (string | number)[], expectedType?: string) => {
+    onPick(createRef(nodeId, [...path, '*'], expectedType));
     onClose();
   };
 
@@ -149,13 +258,92 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
     <div className={styles.dataPickerOverlay} onClick={onClose}>
       <div className={styles.dataPickerModal} onClick={(e) => e.stopPropagation()}>
         <div className={styles.dataPickerHeader}>
-          <h4 className={styles.dataPickerTitle}>{t('Datenquelle wählen')}</h4>
-          <button type="button" className={styles.dataPickerClose} onClick={onClose} aria-label={t('Schließen')}>
-            ×
-          </button>
+          <h4 className={styles.dataPickerTitle}>
+            {t('Datenquelle wählen')}
+            {expectedParamType && (
+              <span
+                style={{
+                  marginLeft: 8,
+                  fontSize: 11,
+                  fontFamily: 'monospace',
+                  color: '#555',
+                  background: '#eee',
+                  borderRadius: 4,
+                  padding: '1px 6px',
+                  fontWeight: 400,
+                }}
+                title={t('Erwarteter Typ')}
+              >
+                {expectedParamType}
+              </span>
+            )}
+          </h4>
+          <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+            {expectedParamType && (
+              <label style={{ fontSize: 11, color: '#666', display: 'flex', alignItems: 'center', gap: 4 }}>
+                <input
+                  type="checkbox"
+                  checked={strictFilter}
+                  onChange={(e) => setStrictFilter(e.target.checked)}
+                />
+                {t('Nur kompatible')}
+              </label>
+            )}
+            <button type="button" className={styles.dataPickerClose} onClick={onClose} aria-label={t('Schließen')}>
+              ×
+            </button>
+          </div>
         </div>
         <div className={styles.dataPickerBody}>
           {/* System Variables Section */}
+          {loopAncestorIds.length > 0 && (
+            <div className={styles.dataPickerNodeSection}>
+              <div className={styles.dataPickerNodeHeader} style={{ cursor: 'default' }}>
+                <span className={styles.dataPickerNodeLabel}>{t('Schleife (lexikalisch)')}</span>
+              </div>
+              <div className={styles.dataPickerTree}>
+                {loopAncestorIds.map((loopId) => {
+                  const loopNode = nodes.find((n) => n.id === loopId);
+                  const loopLabel = loopNode ? getNodeLabel(loopNode as { id: string; title?: string }) : loopId;
+                  const loopSchema = catalog.LoopItem;
+                  const loopPaths = loopSchema
+                    ? _buildPathsFromSchema(loopSchema, catalog, [], 0).filter((p) => !String(p.path[p.path.length - 1]).startsWith('_'))
+                    : [
+                        { path: ['currentItem'], label: 'currentItem', type: 'Any' },
+                        { path: ['currentIndex'], label: 'currentIndex', type: 'int' },
+                        { path: ['count'], label: 'count', type: 'int' },
+                      ];
+                  return (
+                    <div key={loopId} style={{ marginBottom: 6 }}>
+                      <div style={{ fontSize: 11, color: '#666', marginBottom: 2 }}>{loopLabel}</div>
+                      {loopPaths.map((p, i) => {
+                        const compat = expectedParamType && p.type
+                          ? isCompatible(p.type, expectedParamType)
+                          : 'ok';
+                        return (
+                          <button
+                            key={`${loopId}-${p.path.join('.')}-${i}`}
+                            type="button"
+                            className={styles.dataPickerLeaf}
+                            style={{ opacity: compat === 'mismatch' ? 0.45 : 1 }}
+                            onClick={() => handlePick(loopId, p.path, p.type)}
+                          >
+                            {p.label}
+                            {p.type && (
+                              <span style={{ color: '#888', fontSize: 10, marginLeft: 4 }}>
+                                ({p.type})
+                              </span>
+                            )}
+                          </button>
+                        );
+                      })}
+                    </div>
+                  );
+                })}
+              </div>
+            </div>
+          )}
+
           {Object.keys(systemVars).length > 0 && (
             <div className={styles.dataPickerNodeSection}>
               <button
@@ -199,12 +387,26 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
               const isExpanded = expandedNodes.has(nodeId);
 
               const resolvedSchema = _resolveSchemaForNode(
-                nodeId, nodes, nodeTypes, connections, catalog,
+                nodeId,
+                nodes,
+                nodeTypes,
+                connections,
+                catalog,
               );
-              const schemaPaths = _buildPathsFromSchema(resolvedSchema);
-              const paths = schemaPaths.length > 0
-                ? schemaPaths
-                : _buildPathsFromPreview(nodeOutputsPreview[nodeId], [], t('(ganze Ausgabe)'));
+              const schemaPaths = _buildPathsFromSchema(resolvedSchema, catalog);
+              const annotated = _markIterableCandidates(
+                schemaPaths.length > 0
+                  ? schemaPaths
+                  : _buildPathsFromPreview(nodeOutputsPreview[nodeId], [], t('(ganze Ausgabe)')),
+                expectedParamType,
+              );
+              const paths = strictFilter && expectedParamType
+                ? annotated.filter((p) => {
+                    if (p.iterable) return true;
+                    if (!p.type) return false;
+                    return isCompatible(p.type, expectedParamType) !== 'mismatch';
+                  })
+                : annotated;
 
               return (
                 <div key={nodeId} className={styles.dataPickerNodeSection}>
@@ -223,21 +425,52 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
                   </button>
                   {isExpanded && (
                     <div className={styles.dataPickerTree}>
-                      {paths.map((p, i) => (
-                        <button
-                          key={`${p.path.join('.')}-${i}`}
-                          type="button"
-                          className={styles.dataPickerLeaf}
-                          onClick={() => handlePick(nodeId, p.path)}
-                        >
-                          {p.label}
-                          {p.type && (
-                            <span style={{ color: '#888', fontSize: 10, marginLeft: 4 }}>
-                              ({p.type})
-                            </span>
-                          )}
-                        </button>
-                      ))}
+                      {paths.length === 0 && (
+                        <div style={{ fontSize: 11, color: '#999', padding: '4px 8px' }}>
+                          {t('(keine kompatiblen Felder — Filter „Nur kompatible“ deaktivieren)')}
+                        </div>
+                      )}
+                      {paths.map((p, i) => {
+                        const compat =
+                          expectedParamType && p.type ? isCompatible(p.type, expectedParamType) : 'ok';
+                        return (
+                          <div
+                            key={`${p.path.join('.')}-${i}`}
+                            style={{ display: 'flex', alignItems: 'center', gap: 4 }}
+                          >
+                            <button
+                              type="button"
+                              className={styles.dataPickerLeaf}
+                              style={{ opacity: compat === 'mismatch' && !p.iterable ? 0.45 : 1, flex: 1 }}
+                              onClick={() => handlePick(nodeId, p.path, p.type)}
+                            >
+                              {p.label}
+                              {p.type && (
+                                <span style={{ color: '#888', fontSize: 10, marginLeft: 4 }}>
+                                  ({p.type})
+                                </span>
+                              )}
+                            </button>
+                            {p.iterable && (
+                              <button
+                                type="button"
+                                className={styles.dataPickerLeaf}
+                                onClick={() => handlePickIterate(nodeId, p.path, expectedParamType)}
+                                style={{
+                                  fontSize: 10,
+                                  padding: '2px 6px',
+                                  background: 'rgba(0,123,255,0.10)',
+                                  color: 'var(--primary-color, #007bff)',
+                                  whiteSpace: 'nowrap',
+                                }}
+                                title={t('Pro Element der Liste iterieren (Loop)')}
+                              >
+                                {t('iterieren')}
+                              </button>
+                            )}
+                          </div>
+                        );
+                      })}
                     </div>
                   )}
                 </div>
diff --git a/src/components/FlowEditor/nodes/shared/RequiredAttributePicker.test.tsx b/src/components/FlowEditor/nodes/shared/RequiredAttributePicker.test.tsx
new file mode 100644
index 0000000..e7c2e77
--- /dev/null
+++ b/src/components/FlowEditor/nodes/shared/RequiredAttributePicker.test.tsx
@@ -0,0 +1,243 @@
+// Copyright (c) 2025 Patrick Motsch
+// All rights reserved.
+//
+// Plan #2 — Track A1.1: Component-level tests for RequiredAttributePicker.
+// Validates the 0/1/N rendering logic that orchestrates DataPicker selection
+// + the iterierens-suggestion (T5, T6).
+//
+// We mock the two consumed contexts (LanguageContext + Automation2DataFlow)
+// and the DataPicker child so we can assert on the picker UI in isolation.
+
+import React from 'react';
+import { describe, expect, it, vi } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import type { CanvasConnection, CanvasNode } from '../../editor/FlowCanvas';
+import type { NodeType, PortField, PortSchema } from '../../../../api/workflowApi';
+import type { DataRef, SystemVarRef } from './dataRef';
+
+// ---------------------------------------------------------------------------
+// Module mocks — must be registered before importing the SUT
+// ---------------------------------------------------------------------------
+
+vi.mock('../../../../providers/language/LanguageContext', () => ({
+  useLanguage: () => ({ t: (s: string) => s }),
+}));
+
+let _ctxValue: unknown = null;
+vi.mock('../../context/Automation2DataFlowContext', () => ({
+  useAutomation2DataFlow: () => _ctxValue,
+}));
+
+vi.mock('./DataPicker', () => ({
+  DataPicker: (props: {
+    open: boolean;
+    onClose: () => void;
+    onPick: (ref: DataRef | SystemVarRef) => void;
+  }) => {
+    if (!props.open) return null;
+    return (
+      <div data-testid="mock-data-picker">
+        <button
+          type="button"
+          onClick={() => {
+            props.onPick({ type: 'ref', nodeId: 'picked', path: [], expectedType: 'DocumentList' });
+            props.onClose();
+          }}
+        >
+          mock-pick
+        </button>
+        <button type="button" onClick={props.onClose}>
+          mock-close
+        </button>
+      </div>
+    );
+  },
+}));
+
+// SUT imported AFTER mocks (so mocks are applied)
+import { RequiredAttributePicker } from './RequiredAttributePicker';
+
+// ---------------------------------------------------------------------------
+// Fixtures
+// ---------------------------------------------------------------------------
+
+function _field(name: string, type: string): PortField {
+  return { name, type, description: '', required: false };
+}
+
+const _docListSchema: PortSchema = {
+  name: 'DocumentList',
+  fields: [_field('documents', 'List[UdmDocument]'), _field('count', 'int')],
+};
+const _udmDocumentSchema: PortSchema = {
+  name: 'UdmDocument',
+  fields: [_field('name', 'str'), _field('mimeType', 'str')],
+};
+const _portCatalog: Record<string, PortSchema> = {
+  DocumentList: _docListSchema,
+  UdmDocument: _udmDocumentSchema,
+};
+
+function _setContext(opts: {
+  consumerNodeId: string;
+  nodes: CanvasNode[];
+  connections: CanvasConnection[];
+  nodeTypes: NodeType[];
+}) {
+  _ctxValue = {
+    currentNodeId: opts.consumerNodeId,
+    nodes: opts.nodes,
+    connections: opts.connections,
+    nodeTypes: opts.nodeTypes,
+    portTypeCatalog: _portCatalog,
+    nodeOutputsPreview: {},
+    systemVariables: {},
+    language: 'de',
+    getNodeLabel: (n: { id: string; title?: string }) => n.title ?? n.id,
+    getAvailableSourceIds: () => opts.nodes.map((n) => n.id).filter((id) => id !== opts.consumerNodeId),
+    parseGraphDefinedSchema: () => null,
+  };
+}
+
+function _node(id: string, type: string): CanvasNode {
+  return { id, type, title: id, x: 0, y: 0, inputs: 1, outputs: 1, parameters: {} };
+}
+
+function _conn(id: string, src: string, tgt: string): CanvasConnection {
+  return { id, sourceId: src, sourceHandle: 0, targetId: tgt, targetHandle: 0 };
+}
+
+function _nodeType(id: string, outputSchema: string): NodeType {
+  return {
+    id,
+    label: id,
+    description: id,
+    category: 'test',
+    parameters: [],
+    inputs: 1,
+    outputs: 1,
+    outputPorts: [{ schema: outputSchema }],
+  } as unknown as NodeType;
+}
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe('RequiredAttributePicker — 0/1/N rendering (T5/T6)', () => {
+  it('shows red "no source" pill when no upstream candidate matches (0-case)', () => {
+    _setContext({
+      consumerNodeId: 'cons',
+      nodes: [_node('cons', 'ai.summarizeDocument')],
+      connections: [],
+      nodeTypes: [_nodeType('ai.summarizeDocument', 'AiResult')],
+    });
+    render(
+      <RequiredAttributePicker
+        label="Document List"
+        expectedType="DocumentList"
+        value={undefined}
+        onChange={() => {}}
+      />,
+    );
+    expect(
+      screen.getByText(/Keine typkompatible Quelle vorhanden/i),
+    ).toBeInTheDocument();
+  });
+
+  it('shows auto-bind suggestion when exactly one candidate matches (1-case)', () => {
+    _setContext({
+      consumerNodeId: 'cons',
+      nodes: [_node('up', 'sharepoint.readDocs'), _node('cons', 'ai.summarizeDocument')],
+      connections: [_conn('c1', 'up', 'cons')],
+      nodeTypes: [
+        _nodeType('sharepoint.readDocs', 'DocumentList'),
+        _nodeType('ai.summarizeDocument', 'AiResult'),
+      ],
+    });
+    render(
+      <RequiredAttributePicker
+        label="Document List"
+        expectedType="DocumentList"
+        value={undefined}
+        onChange={() => {}}
+      />,
+    );
+    expect(screen.getByText(/Vorschlag übernehmen/i)).toBeInTheDocument();
+  });
+
+  it('shows iterieren-suggestion when upstream is List[X] and required is X (T6)', () => {
+    _setContext({
+      consumerNodeId: 'cons',
+      nodes: [_node('up', 'sharepoint.readDocs'), _node('cons', 'ai.summarizeDocument')],
+      connections: [_conn('c1', 'up', 'cons')],
+      nodeTypes: [
+        _nodeType('sharepoint.readDocs', 'DocumentList'),
+        _nodeType('ai.summarizeDocument', 'AiResult'),
+      ],
+    });
+    render(
+      <RequiredAttributePicker
+        label="Single document"
+        expectedType="UdmDocument"
+        value={undefined}
+        onChange={() => {}}
+      />,
+    );
+    expect(screen.getByText(/iterieren/i)).toBeInTheDocument();
+  });
+
+  it('renders bound chip + "Andere wählen" when value is already a DataRef', async () => {
+    _setContext({
+      consumerNodeId: 'cons',
+      nodes: [_node('up', 'sharepoint.readDocs'), _node('cons', 'ai.summarizeDocument')],
+      connections: [_conn('c1', 'up', 'cons')],
+      nodeTypes: [
+        _nodeType('sharepoint.readDocs', 'DocumentList'),
+        _nodeType('ai.summarizeDocument', 'AiResult'),
+      ],
+    });
+    const onChange = vi.fn();
+    render(
+      <RequiredAttributePicker
+        label="Document List"
+        expectedType="DocumentList"
+        value={{ type: 'ref', nodeId: 'up', path: [], expectedType: 'DocumentList' }}
+        onChange={onChange}
+      />,
+    );
+    expect(screen.getByText('up')).toBeInTheDocument();
+    const clearButton = screen.getByTitle(/Bindung entfernen/i);
+    await userEvent.click(clearButton);
+    expect(onChange).toHaveBeenCalledWith(null);
+  });
+
+  it('opens DataPicker via "Andere wählen" and forwards the picked ref to onChange', async () => {
+    _setContext({
+      consumerNodeId: 'cons',
+      nodes: [_node('up', 'sharepoint.readDocs'), _node('cons', 'ai.summarizeDocument')],
+      connections: [_conn('c1', 'up', 'cons')],
+      nodeTypes: [
+        _nodeType('sharepoint.readDocs', 'DocumentList'),
+        _nodeType('ai.summarizeDocument', 'AiResult'),
+      ],
+    });
+    const onChange = vi.fn();
+    render(
+      <RequiredAttributePicker
+        label="Document List"
+        expectedType="DocumentList"
+        value={{ type: 'ref', nodeId: 'up', path: [], expectedType: 'DocumentList' }}
+        onChange={onChange}
+      />,
+    );
+    const otherButton = screen.getByText(/Andere wählen…/i);
+    await userEvent.click(otherButton);
+    expect(screen.getByTestId('mock-data-picker')).toBeInTheDocument();
+    await userEvent.click(screen.getByText('mock-pick'));
+    expect(onChange).toHaveBeenCalledWith(
+      expect.objectContaining({ type: 'ref', nodeId: 'picked', expectedType: 'DocumentList' }),
+    );
+  });
+});
diff --git a/src/components/FlowEditor/nodes/shared/RequiredAttributePicker.tsx b/src/components/FlowEditor/nodes/shared/RequiredAttributePicker.tsx
new file mode 100644
index 0000000..81236c4
--- /dev/null
+++ b/src/components/FlowEditor/nodes/shared/RequiredAttributePicker.tsx
@@ -0,0 +1,228 @@
+/**
+ * RequiredAttributePicker — Phase-4 Schicht-4 binding affordance for
+ * required parameters of a Schicht-3 Adapter (Editor-Node).
+ *
+ * 0/1/N logic, applied on the set of typed source candidates:
+ *   - 0 candidates  → red pill: "Keine typkompatible Quelle vorhanden"
+ *                     (user must add an upstream node first)
+ *   - 1 candidate   → auto-bound chip with a "Andere wählen…" override button
+ *                     (still shown explicitly so the user sees what was chosen)
+ *   - N candidates  → "Quelle wählen…" button that opens the DataPicker
+ *                     pre-filtered to the expected type
+ *
+ * The picker also surfaces a "Iterieren als Loop" hint when the expected type
+ * is `X` and an upstream candidate is `List[X]` — see paramValidation.ts.
+ */
+
+import React, { useMemo, useState } from 'react';
+import { useAutomation2DataFlow } from '../../context/Automation2DataFlowContext';
+import { DataPicker } from './DataPicker';
+import { createRef, formatRefLabel, isRef, type DataRef, type SystemVarRef } from './dataRef';
+import { findSourceCandidates, strictlyCompatible, type SourceCandidate } from './paramValidation';
+import styles from '../../editor/Automation2FlowEditor.module.css';
+
+import { useLanguage } from '../../../../providers/language/LanguageContext';
+
+export interface RequiredAttributePickerProps {
+  /** Display label for the parameter (already localized). */
+  label: string;
+  /** Type expected by the bound action argument (e.g. "DocumentList", "str"). */
+  expectedType?: string;
+  /** Current bound value (DataRef, SystemVarRef, or unset). */
+  value: unknown;
+  /** Persist a new binding (or `null` to clear). */
+  onChange: (next: DataRef | SystemVarRef | null) => void;
+  /** Optional description shown beneath the picker. */
+  description?: React.ReactNode;
+}
+
+export const RequiredAttributePicker: React.FC<RequiredAttributePickerProps> = ({
+  label,
+  expectedType,
+  value,
+  onChange,
+  description,
+}) => {
+  const { t } = useLanguage();
+  const ctx = useAutomation2DataFlow();
+  const [pickerOpen, setPickerOpen] = useState(false);
+
+  const consumerNodeId = ctx?.currentNodeId ?? '';
+  const nodes = ctx?.nodes ?? [];
+  const connections = ctx?.connections ?? [];
+  const nodeTypes = ctx?.nodeTypes ?? [];
+  const catalog = ctx?.portTypeCatalog ?? {};
+
+  const allCandidates: SourceCandidate[] = useMemo(() => {
+    if (!consumerNodeId) return [];
+    return findSourceCandidates({
+      consumerNodeId,
+      expectedType,
+      nodes,
+      connections: connections.map((c) => ({
+        id: c.id,
+        sourceId: c.sourceId,
+        sourceHandle: c.sourceHandle,
+        targetId: c.targetId,
+        targetHandle: c.targetHandle,
+      })),
+      nodeTypes,
+      portTypeCatalog: catalog,
+    });
+  }, [consumerNodeId, expectedType, nodes, connections, nodeTypes, catalog]);
+
+  const compatibleCandidates = useMemo(() => strictlyCompatible(allCandidates), [allCandidates]);
+
+  const isBoundRef = isRef(value);
+  const boundLabel = isBoundRef ? formatRefLabel(value as DataRef, nodes) : null;
+
+  // 0/1/N
+  const candidateCount = compatibleCandidates.length;
+  const single = candidateCount === 1 ? compatibleCandidates[0] : null;
+
+  const handleAutoBind = () => {
+    if (!single) return;
+    const ref = createRef(single.nodeId, single.iterable && expectedType ? [...single.path, '*'] : single.path, expectedType);
+    onChange(ref);
+  };
+
+  const handlePicked = (picked: DataRef | SystemVarRef) => {
+    onChange(picked);
+  };
+
+  return (
+    <div className={styles.requiredAttributePicker} style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
+      <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
+        <label style={{ fontSize: 12, fontWeight: 600 }}>
+          {label}
+          <span style={{ color: 'var(--danger-color, #dc3545)', marginLeft: 2 }}>*</span>
+        </label>
+        {expectedType && (
+          <span
+            title={t('Erwarteter Typ')}
+            style={{
+              fontSize: 10,
+              fontFamily: 'monospace',
+              color: '#555',
+              background: '#eee',
+              borderRadius: 4,
+              padding: '1px 6px',
+            }}
+          >
+            {expectedType}
+          </span>
+        )}
+      </div>
+
+      {isBoundRef ? (
+        <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
+          <span
+            style={{
+              padding: '2px 8px',
+              borderRadius: 12,
+              background: 'rgba(40,167,69,0.15)',
+              color: 'var(--success-color, #28a745)',
+              fontSize: 12,
+              fontWeight: 500,
+            }}
+          >
+            {boundLabel}
+          </span>
+          <button
+            type="button"
+            className={styles.retryButton}
+            onClick={() => setPickerOpen(true)}
+            style={{ fontSize: 11, padding: '2px 8px' }}
+          >
+            {t('Andere wählen…')}
+          </button>
+          <button
+            type="button"
+            className={styles.retryButton}
+            onClick={() => onChange(null)}
+            style={{ fontSize: 11, padding: '2px 8px' }}
+            title={t('Bindung entfernen')}
+          >
+            ×
+          </button>
+        </div>
+      ) : candidateCount === 0 ? (
+        <div
+          style={{
+            display: 'flex',
+            alignItems: 'center',
+            gap: 6,
+            padding: '4px 8px',
+            background: 'rgba(220,53,69,0.12)',
+            color: 'var(--danger-color, #dc3545)',
+            borderRadius: 6,
+            fontSize: 12,
+          }}
+        >
+          <span aria-hidden="true">⚠</span>
+          <span>
+            {t('Keine typkompatible Quelle vorhanden — füge zuerst einen Knoten ein, der ')}
+            <code style={{ fontFamily: 'monospace' }}>{expectedType ?? '?'}</code>
+            {t(' liefert.')}
+          </span>
+        </div>
+      ) : single ? (
+        <div style={{ display: 'flex', alignItems: 'center', gap: 6, flexWrap: 'wrap' }}>
+          <button
+            type="button"
+            className={styles.retryButton}
+            onClick={handleAutoBind}
+            style={{ fontSize: 11, padding: '3px 10px' }}
+            title={t('Einzige passende Quelle übernehmen')}
+          >
+            {t('Vorschlag übernehmen:')}{' '}
+            <strong>
+              {nodes.find((n) => n.id === single.nodeId)?.title ?? single.nodeId}
+              {single.path.length > 0 ? ' → ' + single.path.map(String).join(' → ') : ''}
+              {single.iterable ? ' [' + t('iterieren') + ']' : ''}
+            </strong>
+          </button>
+          <button
+            type="button"
+            className={styles.retryButton}
+            onClick={() => setPickerOpen(true)}
+            style={{ fontSize: 11, padding: '3px 10px' }}
+          >
+            {t('Andere…')}
+          </button>
+        </div>
+      ) : (
+        <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
+          <button
+            type="button"
+            className={styles.retryButton}
+            onClick={() => setPickerOpen(true)}
+            style={{ fontSize: 11, padding: '3px 10px' }}
+          >
+            {t('Quelle wählen…')} <span style={{ opacity: 0.6 }}>({candidateCount})</span>
+          </button>
+        </div>
+      )}
+
+      {description && <div style={{ fontSize: 11, color: '#888' }}>{description}</div>}
+
+      {pickerOpen && (
+        <DataPicker
+          open={pickerOpen}
+          onClose={() => setPickerOpen(false)}
+          onPick={(picked) => {
+            handlePicked(picked);
+            setPickerOpen(false);
+          }}
+          availableSourceIds={ctx?.getAvailableSourceIds() ?? []}
+          nodes={nodes}
+          nodeOutputsPreview={ctx?.nodeOutputsPreview ?? {}}
+          getNodeLabel={(n) =>
+            ctx?.getNodeLabel(n as { id: string; title?: string; label?: string; type?: string }) ?? n.id
+          }
+          expectedParamType={expectedType}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/src/components/FlowEditor/nodes/shared/dataRef.ts b/src/components/FlowEditor/nodes/shared/dataRef.ts
index 72fd11b..097fbe2 100644
--- a/src/components/FlowEditor/nodes/shared/dataRef.ts
+++ b/src/components/FlowEditor/nodes/shared/dataRef.ts
@@ -8,6 +8,8 @@ export interface DataRef {
   type: 'ref';
   nodeId: string;
   path: (string | number)[];
+  /** Optional declared type at bind time (for UI / validation hints) */
+  expectedType?: string;
 }
 
 /** Explicit static value wrapper */
@@ -63,8 +65,18 @@ export function createSystemVar(variable: string): SystemVarRef {
 }
 
 /** Create a reference object */
-export function createRef(nodeId: string, path: (string | number)[] = []): DataRef {
-  return { type: 'ref', nodeId, path };
+export function createRef(nodeId: string, path: (string | number)[] = [], expectedType?: string): DataRef {
+  return { type: 'ref', nodeId, path, ...(expectedType ? { expectedType } : {}) };
+}
+
+/** Structural type compatibility (best-effort; same as gateway soft rules). */
+export function isCompatible(producedType: string, expectedType: string): 'ok' | 'coerce' | 'mismatch' {
+  if (!expectedType || !producedType) return 'ok';
+  if (producedType === expectedType) return 'ok';
+  if (expectedType === 'Any' || producedType === 'Any') return 'ok';
+  if (expectedType === 'str' && (producedType === 'int' || producedType === 'float')) return 'coerce';
+  if (expectedType === 'int' && producedType === 'str') return 'coerce';
+  return 'mismatch';
 }
 
 /** Create a value wrapper */
diff --git a/src/components/FlowEditor/nodes/shared/graphUtils.ts b/src/components/FlowEditor/nodes/shared/graphUtils.ts
index 14524c3..2f63a22 100644
--- a/src/components/FlowEditor/nodes/shared/graphUtils.ts
+++ b/src/components/FlowEditor/nodes/shared/graphUtils.ts
@@ -8,6 +8,7 @@ import type {
   Automation2Graph,
   Automation2GraphNode,
   Automation2Connection,
+  GraphDefinedSchemaRef,
 } from '../../../../api/workflowApi';
 import type { CanvasNode, CanvasConnection } from '../../editor/FlowCanvas';
 
@@ -42,7 +43,10 @@ export function fromApiGraph(
         ? Object.entries(nt.inputPorts).map(([, v]) => ({ name: '', schema: '', accepts: (v as { accepts?: string[] }).accepts }))
         : undefined,
       outputPorts: nt?.outputPorts
-        ? Object.entries(nt.outputPorts).map(([, v]) => ({ name: '', schema: (v as { schema?: string }).schema ?? '' }))
+        ? Object.entries(nt.outputPorts).map(([, v]) => ({
+            name: '',
+            schema: (v as { schema?: string | GraphDefinedSchemaRef }).schema ?? '',
+          }))
         : undefined,
     };
   });
diff --git a/src/components/FlowEditor/nodes/shared/outputPreviewRegistry.ts b/src/components/FlowEditor/nodes/shared/outputPreviewRegistry.ts
index 3f02c89..e0bcd44 100644
--- a/src/components/FlowEditor/nodes/shared/outputPreviewRegistry.ts
+++ b/src/components/FlowEditor/nodes/shared/outputPreviewRegistry.ts
@@ -69,6 +69,10 @@ export function buildNodeOutputPreview(
     return { _transit: true, _meta: {}, data: {} };
   }
 
+  if (typeof port0.schema !== 'string') {
+    return {};
+  }
+
   return _buildSchemaPreview(port0.schema);
 }
 
diff --git a/src/components/FlowEditor/nodes/shared/paramValidation.test.ts b/src/components/FlowEditor/nodes/shared/paramValidation.test.ts
new file mode 100644
index 0000000..86a7235
--- /dev/null
+++ b/src/components/FlowEditor/nodes/shared/paramValidation.test.ts
@@ -0,0 +1,304 @@
+// Copyright (c) 2025 Patrick Motsch
+// All rights reserved.
+//
+// Plan #2 — Track A1 / FE-Tests
+// T5/T6 (RequiredAttributePicker): 0/1/N candidate logic + iterierens-suggestion
+// T7   (DataPicker): strict type filtering
+// T8   (DataPicker): generic-object drill-down via wildcard segment '*'
+//
+// We test the pure helpers in paramValidation.ts directly. The component
+// pickers are thin shells over these helpers, so covering the helpers covers
+// the deterministic core of the binding affordance.
+
+import { describe, expect, it } from 'vitest';
+
+import {
+  findGraphErrors,
+  findRequiredErrors,
+  findSourceCandidates,
+  isParamBound,
+  strictlyCompatible,
+  type SourceCandidate,
+} from './paramValidation';
+import { createRef, createSystemVar, createValue } from './dataRef';
+import type { CanvasConnection, CanvasNode } from '../../editor/FlowCanvas';
+import type { NodeType, PortField, PortSchema } from '../../../../api/workflowApi';
+
+// ---------------------------------------------------------------------------
+// Fixtures
+// ---------------------------------------------------------------------------
+
+function _field(name: string, type: string): PortField {
+  return { name, type, description: '', required: false };
+}
+
+function _schema(name: string, fields: PortField[]): PortSchema {
+  return { name, fields };
+}
+
+const _docListSchema: PortSchema = _schema('DocumentList', [
+  _field('documents', 'List[UdmDocument]'),
+  _field('count', 'int'),
+]);
+
+const _udmDocumentSchema: PortSchema = _schema('UdmDocument', [
+  _field('name', 'str'),
+  _field('mimeType', 'str'),
+  _field('sizeBytes', 'int'),
+]);
+
+const _aiResultSchema: PortSchema = _schema('AiResult', [
+  _field('text', 'str'),
+  _field('tokensUsed', 'int'),
+]);
+
+const _portCatalog: Record<string, PortSchema> = {
+  DocumentList: _docListSchema,
+  UdmDocument: _udmDocumentSchema,
+  AiResult: _aiResultSchema,
+};
+
+function _makeNode(id: string, type: string, parameters: Record<string, unknown> = {}): CanvasNode {
+  return {
+    id,
+    type,
+    title: `${id} (${type})`,
+    x: 0,
+    y: 0,
+    inputs: 1,
+    outputs: 1,
+    parameters,
+  };
+}
+
+function _makeConnection(id: string, sourceId: string, targetId: string): CanvasConnection {
+  return {
+    id,
+    sourceId,
+    sourceHandle: 0,
+    targetId,
+    targetHandle: 0,
+  };
+}
+
+function _makeNodeType(
+  id: string,
+  outputSchema: string,
+  parameters: NodeType['parameters'] = [],
+): NodeType {
+  return {
+    id,
+    label: id,
+    description: id,
+    category: 'test',
+    parameters,
+    inputs: 1,
+    outputs: 1,
+    outputPorts: [{ schema: outputSchema }],
+  } as unknown as NodeType;
+}
+
+// ---------------------------------------------------------------------------
+// isParamBound
+// ---------------------------------------------------------------------------
+
+describe('isParamBound', () => {
+  it('returns false for null/undefined/empty string', () => {
+    expect(isParamBound(null)).toBe(false);
+    expect(isParamBound(undefined)).toBe(false);
+    expect(isParamBound('')).toBe(false);
+  });
+
+  it('returns true for non-empty string/number/boolean', () => {
+    expect(isParamBound('hello')).toBe(true);
+    expect(isParamBound(0)).toBe(true);
+    expect(isParamBound(false)).toBe(true);
+  });
+
+  it('returns true for a valid DataRef and false for one without nodeId', () => {
+    expect(isParamBound(createRef('node-1', ['x']))).toBe(true);
+    expect(isParamBound({ type: 'ref', nodeId: '', path: [] })).toBe(false);
+  });
+
+  it('returns true for a SystemVarRef with a variable name', () => {
+    expect(isParamBound(createSystemVar('user.id'))).toBe(true);
+    expect(isParamBound({ type: 'system', variable: '' })).toBe(false);
+  });
+
+  it('treats {type:"value", value:""} as unbound but {value:0} as bound', () => {
+    expect(isParamBound(createValue(''))).toBe(false);
+    expect(isParamBound(createValue(0))).toBe(true);
+    expect(isParamBound(createValue([]))).toBe(false);
+    expect(isParamBound(createValue(['a']))).toBe(true);
+  });
+
+  it('counts non-empty arrays/objects as bound', () => {
+    expect(isParamBound([])).toBe(false);
+    expect(isParamBound([1])).toBe(true);
+    expect(isParamBound({})).toBe(false);
+    expect(isParamBound({ k: 1 })).toBe(true);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// findRequiredErrors / findGraphErrors
+// ---------------------------------------------------------------------------
+
+describe('findRequiredErrors', () => {
+  it('returns empty when all required params are bound', () => {
+    const node = _makeNode('n1', 'ai.process', {
+      aiPrompt: 'hello',
+      documentList: createRef('upstream', ['documents']),
+    });
+    const nodeType = _makeNodeType('ai.process', 'AiResult', [
+      { name: 'aiPrompt', type: 'str', required: true },
+      { name: 'documentList', type: 'DocumentList', required: true },
+      { name: 'optional', type: 'str', required: false },
+    ]);
+    expect(findRequiredErrors(node, nodeType)).toEqual([]);
+  });
+
+  it('flags every unbound required param with its name + type', () => {
+    const node = _makeNode('n1', 'ai.process', {});
+    const nodeType = _makeNodeType('ai.process', 'AiResult', [
+      { name: 'aiPrompt', type: 'str', required: true },
+      { name: 'documentList', type: 'DocumentList', required: true },
+      { name: 'optional', type: 'str', required: false },
+    ]);
+    const errs = findRequiredErrors(node, nodeType);
+    expect(errs).toHaveLength(2);
+    expect(errs.map((e) => e.paramName)).toEqual(['aiPrompt', 'documentList']);
+  });
+
+  it('returns empty list when nodeType is unknown', () => {
+    const node = _makeNode('n1', 'ghost.node');
+    expect(findRequiredErrors(node, undefined)).toEqual([]);
+  });
+});
+
+describe('findGraphErrors', () => {
+  it('aggregates per-node errors and omits clean nodes', () => {
+    const cleanNodeType = _makeNodeType('clean.node', 'AiResult', [
+      { name: 'p1', type: 'str', required: true },
+    ]);
+    const dirtyNodeType = _makeNodeType('dirty.node', 'AiResult', [
+      { name: 'p1', type: 'str', required: true },
+      { name: 'p2', type: 'str', required: true },
+    ]);
+    const nodes: CanvasNode[] = [
+      _makeNode('clean', 'clean.node', { p1: 'value' }),
+      _makeNode('dirty', 'dirty.node', { p1: 'set' }),
+    ];
+    const result = findGraphErrors(nodes, [cleanNodeType, dirtyNodeType]);
+    expect(Object.keys(result)).toEqual(['dirty']);
+    expect(result['dirty']!.map((e) => e.paramName)).toEqual(['p2']);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// findSourceCandidates — T5/T6/T7/T8 core
+// ---------------------------------------------------------------------------
+
+describe('findSourceCandidates', () => {
+  function _makeFixture() {
+    const upstreamType = _makeNodeType('sharepoint.readDocs', 'DocumentList');
+    const consumerType = _makeNodeType('ai.summarize', 'AiResult', [
+      { name: 'documentList', type: 'DocumentList', required: true },
+    ]);
+    const upstream = _makeNode('up', 'sharepoint.readDocs');
+    const consumer = _makeNode('cons', 'ai.summarize');
+    const conns = [_makeConnection('c1', 'up', 'cons')];
+    return { nodes: [upstream, consumer], connections: conns, nodeTypes: [upstreamType, consumerType] };
+  }
+
+  it('returns the whole-output candidate first (path=[]) for the upstream', () => {
+    const f = _makeFixture();
+    const candidates = findSourceCandidates({
+      consumerNodeId: 'cons',
+      expectedType: 'DocumentList',
+      ...f,
+      portTypeCatalog: _portCatalog,
+    });
+    const wholeOutput = candidates.find((c) => c.nodeId === 'up' && c.path.length === 0);
+    expect(wholeOutput).toBeDefined();
+    expect(wholeOutput!.type).toBe('DocumentList');
+    expect(wholeOutput!.compat).toBe('ok');
+  });
+
+  it('drills into List[X] elements via wildcard "*" segment (T8 generic drill-down)', () => {
+    const f = _makeFixture();
+    const candidates = findSourceCandidates({
+      consumerNodeId: 'cons',
+      expectedType: 'str',
+      ...f,
+      portTypeCatalog: _portCatalog,
+    });
+    const wildcardCandidate = candidates.find(
+      (c) =>
+        c.nodeId === 'up' &&
+        c.path[0] === 'documents' &&
+        c.path[1] === '*' &&
+        c.path[2] === 'name',
+    );
+    expect(wildcardCandidate).toBeDefined();
+    expect(wildcardCandidate!.type).toBe('str');
+    expect(wildcardCandidate!.compat).toBe('ok');
+  });
+
+  it('marks List[X] → X as iterable (T6 "iterieren"-Vorschlag)', () => {
+    const f = _makeFixture();
+    const candidates = findSourceCandidates({
+      consumerNodeId: 'cons',
+      expectedType: 'UdmDocument',
+      ...f,
+      portTypeCatalog: _portCatalog,
+    });
+    const iterable = candidates.find(
+      (c) => c.nodeId === 'up' && c.path.length === 1 && c.path[0] === 'documents' && c.iterable,
+    );
+    expect(iterable).toBeDefined();
+    expect(iterable!.type).toBe('List[UdmDocument]');
+  });
+
+  it('returns no candidates when no upstream is connected (T5: 0-case)', () => {
+    const f = _makeFixture();
+    const isolated = _makeNode('iso', 'ai.summarize');
+    const candidates = findSourceCandidates({
+      consumerNodeId: 'iso',
+      expectedType: 'DocumentList',
+      nodes: [...f.nodes, isolated],
+      connections: f.connections,
+      nodeTypes: f.nodeTypes,
+      portTypeCatalog: _portCatalog,
+    });
+    expect(candidates).toEqual([]);
+  });
+
+  it('returns plain candidates (compat="ok") when expectedType is omitted', () => {
+    const f = _makeFixture();
+    const candidates = findSourceCandidates({
+      consumerNodeId: 'cons',
+      ...f,
+      portTypeCatalog: _portCatalog,
+    });
+    expect(candidates.length).toBeGreaterThan(0);
+    expect(candidates.every((c) => c.compat === 'ok')).toBe(true);
+  });
+});
+
+// ---------------------------------------------------------------------------
+// strictlyCompatible — T7 strict type filter
+// ---------------------------------------------------------------------------
+
+describe('strictlyCompatible', () => {
+  it('keeps only ok / coerce / iterable candidates and drops mismatch', () => {
+    const all: SourceCandidate[] = [
+      { nodeId: 'a', path: [], type: 'DocumentList', compat: 'ok' },
+      { nodeId: 'a', path: ['documents'], type: 'List[UdmDocument]', compat: 'mismatch', iterable: true },
+      { nodeId: 'a', path: ['count'], type: 'int', compat: 'coerce' },
+      { nodeId: 'a', path: ['junk'], type: 'object', compat: 'mismatch' },
+    ];
+    const out = strictlyCompatible(all);
+    expect(out.map((c) => c.path)).toEqual([[], ['documents'], ['count']]);
+  });
+});
diff --git a/src/components/FlowEditor/nodes/shared/paramValidation.ts b/src/components/FlowEditor/nodes/shared/paramValidation.ts
new file mode 100644
index 0000000..8b8c2d6
--- /dev/null
+++ b/src/components/FlowEditor/nodes/shared/paramValidation.ts
@@ -0,0 +1,208 @@
+/**
+ * Phase-4 Schicht-4 (Instanz-Bindings) — Validation utilities.
+ *
+ * Single source of truth for two questions every UI surface needs to answer:
+ *   1. "Is this required parameter on this node bound to anything?"
+ *   2. "Which upstream nodes are type-compatible sources for this parameter?"
+ *
+ * Used by:
+ *   - RequiredAttributePicker (renders 0/1/N affordance based on candidate count)
+ *   - NodeConfigPanel (orders required params first, surfaces missing-source pill)
+ *   - FlowCanvas (red error badge per node when any required param is unbound)
+ *   - CanvasHeader (Run button disabled when any node has unbound required params)
+ *
+ * The required check is deliberately conservative: a param counts as "bound"
+ * if it has any non-empty value, a non-empty static value-wrapper, a ref, or a
+ * system-var ref. Empty string / null / undefined / { type: 'value', value: '' }
+ * all count as unbound.
+ */
+
+import type { CanvasConnection, CanvasNode } from '../../editor/FlowCanvas';
+import type { GraphDefinedSchemaRef, NodeType, NodeTypeParameter, OutputPortDef, PortSchema } from '../../../../api/workflowApi';
+import { isCompatible, isRef, isSystemVar, isValue } from './dataRef';
+import { getAvailableSources } from './dataFlowGraph';
+
+const _LIST_INNER_RE = /^List\[(.+)\]$/;
+
+/** A candidate path on an upstream node that could satisfy a parameter binding. */
+export interface SourceCandidate {
+  nodeId: string;
+  /** JSON path on the node output, e.g. ['documents', 0, 'name']. */
+  path: (string | number)[];
+  /** Type as declared by the schema field at this path (best-effort). */
+  type?: string;
+  /** Compatibility verdict against the requested type. */
+  compat: 'ok' | 'coerce' | 'mismatch';
+  /** True iff the candidate is a List that, by element-iteration ('*'), would
+   *  satisfy the requested scalar type — the "iterieren als Loop-Vorschlag". */
+  iterable?: boolean;
+}
+
+/** Decide whether a parameter value counts as "bound" for required-check purposes. */
+export function isParamBound(value: unknown): boolean {
+  if (value === null || value === undefined) return false;
+  if (typeof value === 'string') return value.length > 0;
+  if (typeof value === 'number' || typeof value === 'boolean') return true;
+  if (isRef(value)) return Boolean(value.nodeId);
+  if (isSystemVar(value)) return Boolean(value.variable);
+  if (isValue(value)) {
+    const inner = value.value;
+    if (inner === null || inner === undefined) return false;
+    if (typeof inner === 'string') return inner.length > 0;
+    if (Array.isArray(inner)) return inner.length > 0;
+    return true;
+  }
+  if (Array.isArray(value)) return value.length > 0;
+  if (typeof value === 'object') return Object.keys(value as object).length > 0;
+  return false;
+}
+
+/** A "required" param on a node that has no value and no incoming binding. */
+export interface RequiredParamError {
+  paramName: string;
+  paramLabel: string;
+  paramType?: string;
+}
+
+/** Walk a node's parameter spec + values and flag every required-but-unbound. */
+export function findRequiredErrors(
+  node: CanvasNode,
+  nodeType: NodeType | undefined,
+  resolveLabel: (param: NodeTypeParameter) => string = (p) => p.name,
+): RequiredParamError[] {
+  if (!nodeType) return [];
+  const errors: RequiredParamError[] = [];
+  const values = node.parameters ?? {};
+  for (const param of nodeType.parameters ?? []) {
+    if (!param.required) continue;
+    if (isParamBound(values[param.name])) continue;
+    errors.push({ paramName: param.name, paramLabel: resolveLabel(param), paramType: param.type });
+  }
+  return errors;
+}
+
+/** Map of nodeId → required errors. Empty entries are omitted. */
+export function findGraphErrors(
+  nodes: CanvasNode[],
+  nodeTypes: NodeType[],
+  resolveLabel?: (param: NodeTypeParameter) => string,
+): Record<string, RequiredParamError[]> {
+  const byId: Record<string, RequiredParamError[]> = {};
+  const byTypeId = new Map(nodeTypes.map((nt) => [nt.id, nt]));
+  for (const n of nodes) {
+    const errs = findRequiredErrors(n, byTypeId.get(n.type), resolveLabel);
+    if (errs.length) byId[n.id] = errs;
+  }
+  return byId;
+}
+
+/** Resolve the schema produced by an output port (Transit follows incoming connection). */
+function _resolveOutputSchemaName(
+  nodeId: string,
+  nodes: CanvasNode[],
+  connections: CanvasConnection[],
+  nodeTypes: NodeType[],
+  visited: Set<string> = new Set(),
+): { schemaName?: string; node?: CanvasNode; portDef?: OutputPortDef } {
+  if (visited.has(nodeId)) return {};
+  visited.add(nodeId);
+  const node = nodes.find((n) => n.id === nodeId);
+  if (!node) return {};
+  const typeDef = nodeTypes.find((nt) => nt.id === node.type);
+  const port0 = typeDef?.outputPorts?.[0] as OutputPortDef | undefined;
+  if (!port0) return { node };
+  const spec = port0.schema as string | GraphDefinedSchemaRef | undefined;
+  if (typeof spec === 'object' && spec !== null && spec.kind === 'fromGraph') {
+    return { schemaName: 'FormPayload_dynamic', node, portDef: port0 };
+  }
+  if (port0.dynamic) {
+    return { schemaName: 'FormPayload_dynamic', node, portDef: port0 };
+  }
+  if (typeof spec === 'string' && spec !== 'Transit') {
+    return { schemaName: spec, node, portDef: port0 };
+  }
+  // Transit: follow upstream
+  const incoming = connections.find((c) => c.targetId === nodeId);
+  if (!incoming) return { node };
+  return _resolveOutputSchemaName(incoming.sourceId, nodes, connections, nodeTypes, visited);
+}
+
+/** Build candidate paths from a schema, recursing into List-element schemas one level deep. */
+function _candidatesFromSchema(
+  schema: PortSchema | undefined,
+  catalog: Record<string, PortSchema>,
+  basePath: (string | number)[] = [],
+  depth = 0,
+): Array<{ path: (string | number)[]; type?: string }> {
+  if (!schema || !schema.fields || depth > 6) return [];
+  const out: Array<{ path: (string | number)[]; type?: string }> = [];
+  for (const field of schema.fields) {
+    const fieldPath = [...basePath, field.name];
+    out.push({ path: fieldPath, type: field.type });
+    const inner = typeof field.type === 'string' ? field.type.match(_LIST_INNER_RE)?.[1]?.trim() : undefined;
+    if (inner && catalog[inner]) {
+      out.push(..._candidatesFromSchema(catalog[inner], catalog, [...fieldPath, '*'], depth + 1));
+    }
+  }
+  return out;
+}
+
+/**
+ * Compute every typed source candidate that could satisfy `expectedType`
+ * for the given consumer node. Includes ranked compatibility per candidate
+ * and a `iterable` flag for List-X→X "iterate as Loop" suggestions.
+ *
+ * If `expectedType` is omitted, returns all candidates (all marked 'ok').
+ */
+export function findSourceCandidates(args: {
+  consumerNodeId: string;
+  expectedType?: string;
+  nodes: CanvasNode[];
+  connections: CanvasConnection[];
+  nodeTypes: NodeType[];
+  portTypeCatalog: Record<string, PortSchema>;
+}): SourceCandidate[] {
+  const { consumerNodeId, expectedType, nodes, connections, nodeTypes, portTypeCatalog } = args;
+  const sourceIds = getAvailableSources(consumerNodeId, nodes, connections).filter((id) => {
+    const n = nodes.find((x) => x.id === id);
+    return n?.type !== 'trigger.manual';
+  });
+
+  const results: SourceCandidate[] = [];
+  for (const nid of sourceIds) {
+    const { schemaName } = _resolveOutputSchemaName(nid, nodes, connections, nodeTypes);
+    const schema = schemaName ? portTypeCatalog[schemaName] : undefined;
+    const wholeType = schemaName ?? undefined;
+    results.push({
+      nodeId: nid,
+      path: [],
+      type: wholeType,
+      compat: expectedType && wholeType ? isCompatible(wholeType, expectedType) : 'ok',
+      iterable: _isIterableMatch(wholeType, expectedType),
+    });
+    for (const cand of _candidatesFromSchema(schema, portTypeCatalog)) {
+      const compat = expectedType && cand.type ? isCompatible(cand.type, expectedType) : 'ok';
+      results.push({
+        nodeId: nid,
+        path: cand.path,
+        type: cand.type,
+        compat,
+        iterable: _isIterableMatch(cand.type, expectedType),
+      });
+    }
+  }
+  return results;
+}
+
+/** True iff `producedType` is `List[X]` and `expectedType` equals `X`. */
+function _isIterableMatch(producedType?: string, expectedType?: string): boolean {
+  if (!producedType || !expectedType) return false;
+  const m = producedType.match(_LIST_INNER_RE);
+  if (!m) return false;
+  return m[1].trim() === expectedType;
+}
+
+/** Filter candidates to only those that satisfy `expectedType` (strict mode). */
+export function strictlyCompatible(candidates: SourceCandidate[]): SourceCandidate[] {
+  return candidates.filter((c) => c.compat === 'ok' || c.compat === 'coerce' || c.iterable === true);
+}
diff --git a/src/components/FlowEditor/nodes/shared/scopeHelpers.ts b/src/components/FlowEditor/nodes/shared/scopeHelpers.ts
new file mode 100644
index 0000000..2157c2f
--- /dev/null
+++ b/src/components/FlowEditor/nodes/shared/scopeHelpers.ts
@@ -0,0 +1,55 @@
+/**
+ * Lexical scope for DataPicker: ancestor node ids reachable backward on the graph.
+ */
+
+export interface GraphEdgeLike {
+  source: string;
+  target: string;
+}
+
+export interface GraphNodeLike {
+  id: string;
+  type?: string;
+}
+
+/** All node ids that can reach targetNodeId via incoming edges (excluding target). */
+export function computeAncestorNodeIds(
+  _nodes: GraphNodeLike[],
+  connections: GraphEdgeLike[],
+  targetNodeId: string
+): Set<string> {
+  const preds = new Map<string, Set<string>>();
+  for (const c of connections) {
+    const src = c.source;
+    const tgt = c.target;
+    if (!src || !tgt) continue;
+    if (!preds.has(tgt)) preds.set(tgt, new Set());
+    preds.get(tgt)!.add(src);
+  }
+  const seen = new Set<string>();
+  const stack = [targetNodeId];
+  while (stack.length) {
+    const cur = stack.pop()!;
+    const ps = preds.get(cur);
+    if (!ps) continue;
+    for (const p of ps) {
+      if (!seen.has(p)) {
+        seen.add(p);
+        stack.push(p);
+      }
+    }
+  }
+  seen.delete(targetNodeId);
+  return seen;
+}
+
+/** Node ids of flow.loop ancestors (subset of ancestors). */
+export function findLoopAncestorIds(
+  nodes: GraphNodeLike[],
+  connections: GraphEdgeLike[],
+  targetNodeId: string
+): string[] {
+  const anc = computeAncestorNodeIds(nodes, connections, targetNodeId);
+  const byId = new Map(nodes.map((n) => [n.id, n]));
+  return [...anc].filter((id) => byId.get(id)?.type === 'flow.loop');
+}
diff --git a/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReportTypes.ts b/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReportTypes.ts
index 4b03ecb..1af8319 100644
--- a/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReportTypes.ts
+++ b/src/components/FormGenerator/FormGeneratorReport/FormGeneratorReportTypes.ts
@@ -72,11 +72,11 @@ export interface ReportDateRangeSelectorConfig {
    * stored selection is available. Default: `'ytd'`.
    */
   defaultPresetKind?:
-    | 'ytd' | 'lastYear' | 'nextYear' | 'last12Months' | 'next12Months'
+    | 'allTime' | 'ytd' | 'lastYear' | 'nextYear' | 'last12Months' | 'next12Months'
     | 'thisMonth' | 'lastMonth' | 'thisQuarter' | 'lastQuarter' | 'custom';
   /** Whitelist of preset kinds offered to the user. */
   enabledPresets?: Array<
-    'ytd' | 'lastYear' | 'nextYear' | 'last12Months' | 'next12Months'
+    'allTime' | 'ytd' | 'lastYear' | 'nextYear' | 'last12Months' | 'next12Months'
     | 'thisMonth' | 'lastMonth' | 'thisQuarter' | 'lastQuarter'
     | 'lastN' | 'nextN' | 'custom'
   >;
diff --git a/src/components/PeriodPicker/PeriodPickerLogic.ts b/src/components/PeriodPicker/PeriodPickerLogic.ts
index da53817..26e6fac 100644
--- a/src/components/PeriodPicker/PeriodPickerLogic.ts
+++ b/src/components/PeriodPicker/PeriodPickerLogic.ts
@@ -178,7 +178,7 @@ export function isValueAllowed(value: PeriodValue | null, cfg: PeriodConstraints
 // for ``<input type="date">`` ``min``/``max`` attributes so the browser
 // refuses invalid years instead of us silently falling back to the default
 // preset afterwards.
-export function clampIsoDate(iso: string | undefined, cfg: PeriodConstraints, side: 'min' | 'max'): string | undefined {
+export function clampIsoDate(_iso: string | undefined, cfg: PeriodConstraints, side: 'min' | 'max'): string | undefined {
   const today = toIsoDate(todayDate());
   let lo: string | undefined = cfg.minDate;
   let hi: string | undefined = cfg.maxDate;
diff --git a/src/pages/views/teamsbot/Teamsbot.module.css b/src/pages/views/teamsbot/Teamsbot.module.css
index 26afc09..57c31bd 100644
--- a/src/pages/views/teamsbot/Teamsbot.module.css
+++ b/src/pages/views/teamsbot/Teamsbot.module.css
@@ -416,6 +416,366 @@
   height: 100%;
 }
 
+/* ----- Session Layout (UDB Sidebar + Main) ------------------------------- */
+
+.sessionLayout {
+  display: flex;
+  flex: 1;
+  min-height: 0;
+  gap: 1rem;
+}
+
+.sessionMain {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  min-width: 0;
+  min-height: 0;
+  gap: 1rem;
+}
+
+.udbSidebar {
+  width: 280px;
+  min-width: 280px;
+  border: 1px solid var(--border-color, #e0e0e0);
+  border-radius: 8px;
+  display: flex;
+  flex-direction: column;
+  background: var(--bg-card, #fff);
+  overflow: hidden;
+  position: relative;
+  transition: width 0.2s, min-width 0.2s;
+}
+
+.udbSidebarCollapsed {
+  width: 36px;
+  min-width: 36px;
+}
+
+.udbToggle {
+  position: absolute;
+  top: 8px;
+  right: 4px;
+  z-index: 2;
+  width: 24px;
+  height: 24px;
+  padding: 0;
+  border: 1px solid var(--border-color, #ddd);
+  border-radius: 4px;
+  background: var(--bg-card, #fff);
+  cursor: pointer;
+  font-size: 0.65rem;
+  color: var(--text-secondary, #888);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.udbToggle:hover {
+  background: var(--bg-hover, #f5f5f5);
+  color: var(--primary-color, #F25843);
+}
+
+@media (max-width: 768px) {
+  .sessionLayout {
+    flex-direction: column;
+  }
+  .udbSidebar {
+    width: 100%;
+    min-width: 0;
+    max-height: 220px;
+  }
+  .udbSidebarCollapsed {
+    display: none;
+  }
+}
+
+/* ----- Director Prompt Panel --------------------------------------------- */
+
+.directorPanel {
+  background: var(--surface-color, #fff);
+  border: 1px solid var(--border-color, #e0e0e0);
+  border-radius: 8px;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  transition: outline-color 0.15s, background 0.15s;
+}
+
+.directorPanelDragOver {
+  outline: 2px dashed var(--primary-color, #F25843);
+  outline-offset: -4px;
+  background: var(--primary-dark-bg, rgba(242, 88, 67, 0.06));
+}
+
+.botStatusDot {
+  display: inline-block;
+  width: 9px;
+  height: 9px;
+  border-radius: 50%;
+  margin-left: 0.25rem;
+}
+
+.botStatusDotLive {
+  background: #15803d;
+  box-shadow: 0 0 0 2px rgba(21, 128, 61, 0.18);
+}
+
+.botStatusDotIdle {
+  background: #f59e0b;
+  box-shadow: 0 0 0 2px rgba(245, 158, 11, 0.18);
+  animation: directorPulse 1.6s ease-in-out infinite;
+}
+
+@keyframes directorPulse {
+  0%, 100% { opacity: 1; }
+  50% { opacity: 0.45; }
+}
+
+.directorAttachBtn {
+  border: 1px solid var(--border-color, #ddd);
+  background: var(--bg-card, #fff);
+  border-radius: 6px;
+  padding: 0.25rem 0.6rem;
+  font-size: 0.75rem;
+  cursor: pointer;
+  color: var(--text-secondary, #666);
+}
+
+.directorAttachBtn:hover:not(:disabled) {
+  border-color: var(--primary-color, #F25843);
+  color: var(--primary-color, #F25843);
+}
+
+.directorAttachBtn:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.directorHint {
+  font-size: 0.75rem;
+  color: var(--text-secondary, #888);
+  background: var(--surface-alt, #fafafa);
+  padding: 0.4rem 0.6rem;
+  border-radius: 6px;
+  border: 1px dashed var(--border-color, #ddd);
+}
+
+.directorHeader {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.5rem 1rem;
+  border-bottom: 1px solid var(--border-color, #e0e0e0);
+  background: var(--surface-alt, #fafafa);
+}
+
+.directorHeaderLeft {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.directorTitle {
+  margin: 0;
+  font-size: 0.9rem;
+  font-weight: 600;
+}
+
+.directorBadge {
+  font-size: 0.7rem;
+  padding: 2px 6px;
+  border-radius: 10px;
+  background: var(--primary-color, #F25843);
+  color: #fff;
+  font-weight: 600;
+}
+
+.directorBody {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  padding: 0.75rem 1rem;
+}
+
+.directorTextarea {
+  width: 100%;
+  min-height: 70px;
+  max-height: 200px;
+  resize: vertical;
+  padding: 0.5rem 0.75rem;
+  border: 1px solid var(--border-color, #ddd);
+  border-radius: 6px;
+  font-family: inherit;
+  font-size: 0.9rem;
+  background: var(--bg-card, #fff);
+  color: var(--text-primary, #333);
+}
+
+.directorTextarea:focus {
+  outline: none;
+  border-color: var(--primary-color, #F25843);
+}
+
+.directorRow {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 0.5rem;
+  font-size: 0.8rem;
+}
+
+.directorChips {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.4rem;
+  padding: 0.25rem 0;
+}
+
+.directorChip {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.35rem;
+  padding: 0.2rem 0.5rem;
+  background: var(--surface-alt, #f0f4f8);
+  border: 1px solid var(--border-color, #ddd);
+  border-radius: 12px;
+  font-size: 0.75rem;
+  max-width: 180px;
+}
+
+.directorChipName {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.directorChipRemove {
+  border: none;
+  background: transparent;
+  cursor: pointer;
+  color: var(--text-secondary, #888);
+  font-size: 0.85rem;
+  line-height: 1;
+  padding: 0;
+}
+
+.directorChipRemove:hover {
+  color: var(--primary-color, #F25843);
+}
+
+.directorActions {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 0.5rem;
+}
+
+.directorMeta {
+  display: flex;
+  gap: 0.75rem;
+  font-size: 0.72rem;
+  color: var(--text-secondary, #888);
+}
+
+.directorSubmit {
+  padding: 0.4rem 0.9rem;
+  background: var(--primary-color, #F25843);
+  color: #fff;
+  border: none;
+  border-radius: 6px;
+  font-size: 0.85rem;
+  font-weight: 600;
+  cursor: pointer;
+}
+
+.directorSubmit:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.directorModeToggle {
+  display: inline-flex;
+  border: 1px solid var(--border-color, #ddd);
+  border-radius: 6px;
+  overflow: hidden;
+}
+
+.directorModeButton {
+  border: none;
+  background: var(--bg-card, #fff);
+  padding: 0.25rem 0.6rem;
+  font-size: 0.75rem;
+  cursor: pointer;
+  color: var(--text-secondary, #666);
+}
+
+.directorModeButtonActive {
+  background: var(--primary-color, #F25843);
+  color: #fff;
+}
+
+.directorHistory {
+  border-top: 1px dashed var(--border-color, #e0e0e0);
+  padding: 0.5rem 1rem;
+  max-height: 180px;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  gap: 0.4rem;
+}
+
+.directorHistoryItem {
+  display: flex;
+  flex-direction: column;
+  gap: 0.2rem;
+  padding: 0.4rem 0.5rem;
+  border: 1px solid var(--border-color, #eee);
+  border-radius: 6px;
+  background: var(--surface-alt, #fafafa);
+  font-size: 0.78rem;
+}
+
+.directorHistoryHead {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 0.5rem;
+  color: var(--text-secondary, #666);
+  font-size: 0.7rem;
+}
+
+.directorHistoryText {
+  color: var(--text-primary, #333);
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+.directorStatus {
+  font-size: 0.7rem;
+  font-weight: 600;
+  padding: 1px 6px;
+  border-radius: 8px;
+}
+
+.directorStatusQueued { background: #e6efff; color: #1d4ed8; }
+.directorStatusRunning { background: #fff7e0; color: #b45309; }
+.directorStatusSucceeded { background: #e6f7ec; color: #15803d; }
+.directorStatusFailed { background: #fde2e1; color: #b91c1c; }
+.directorStatusConsumed { background: #eee; color: #555; }
+
+.directorRemoveBtn {
+  border: none;
+  background: transparent;
+  cursor: pointer;
+  color: var(--text-secondary, #888);
+  font-size: 0.8rem;
+}
+
+.directorRemoveBtn:hover {
+  color: var(--primary-color, #F25843);
+}
+
 .sessionViewHeader {
   display: flex;
   justify-content: space-between;
@@ -579,6 +939,35 @@
   max-width: 720px;
 }
 
+/* Tabs */
+.settingsTabs {
+  display: flex;
+  gap: 0.25rem;
+  border-bottom: 1px solid var(--border-color, #e0e0e0);
+  margin-bottom: 1rem;
+}
+
+.settingsTab {
+  padding: 0.6rem 1.1rem;
+  background: transparent;
+  color: var(--text-secondary, #666);
+  border: none;
+  border-bottom: 2px solid transparent;
+  font-size: 0.9rem;
+  font-weight: 500;
+  cursor: pointer;
+  transition: color 0.15s ease, border-color 0.15s ease;
+}
+
+.settingsTab:hover {
+  color: var(--text-color, #333);
+}
+
+.settingsTabActive {
+  color: var(--primary-color, #4A90D9);
+  border-bottom-color: var(--primary-color, #4A90D9);
+}
+
 .settingsCard {
   background: var(--surface-color, #fff);
   border: 1px solid var(--border-color, #e0e0e0);
diff --git a/src/pages/views/teamsbot/TeamsbotSessionView.tsx b/src/pages/views/teamsbot/TeamsbotSessionView.tsx
index f12a2f0..72970e2 100644
--- a/src/pages/views/teamsbot/TeamsbotSessionView.tsx
+++ b/src/pages/views/teamsbot/TeamsbotSessionView.tsx
@@ -2,8 +2,23 @@ import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react'
 import { useSearchParams } from 'react-router-dom';
 import { useCurrentInstance } from '../../../hooks/useCurrentInstance';
 import * as teamsbotApi from '../../../api/teamsbotApi';
-import type { TeamsbotSession, TeamsbotTranscript, TeamsbotBotResponse, TeamsbotSSEEvent, ScreenshotInfo } from '../../../api/teamsbotApi';
+import type {
+  TeamsbotSession,
+  TeamsbotTranscript,
+  TeamsbotBotResponse,
+  TeamsbotSSEEvent,
+  ScreenshotInfo,
+  DirectorPrompt,
+  DirectorPromptMode,
+} from '../../../api/teamsbotApi';
+import {
+  DIRECTOR_PROMPT_TEXT_LIMIT,
+  DIRECTOR_PROMPT_FILE_LIMIT,
+} from '../../../api/teamsbotApi';
 import { getUserDataCache } from '../../../utils/userCache';
+import { UnifiedDataBar } from '../../../components/UnifiedDataBar';
+import type { UdbContext, UdbTab } from '../../../components/UnifiedDataBar';
+import { useFileContext } from '../../../contexts/FileContext';
 import styles from './Teamsbot.module.css';
 
 import { useLanguage } from '../../../providers/language/LanguageContext';
@@ -41,6 +56,32 @@ export const TeamsbotSessionView: React.FC = () => {
     timestamp: string;
   }>>([]);
 
+  // Director Prompt panel state
+  const [directorPrompts, setDirectorPrompts] = useState<DirectorPrompt[]>([]);
+  const [directorText, setDirectorText] = useState('');
+  const [directorMode, setDirectorMode] = useState<DirectorPromptMode>('oneShot');
+  const [directorFiles, setDirectorFiles] = useState<Array<{ id: string; name: string }>>([]);
+  const [directorSubmitting, setDirectorSubmitting] = useState(false);
+  const [directorError, setDirectorError] = useState<string | null>(null);
+  const [directorDragOver, setDirectorDragOver] = useState(false);
+  const [directorUploading, setDirectorUploading] = useState(false);
+  const directorDragCounterRef = useRef(0);
+  const directorFileInputRef = useRef<HTMLInputElement>(null);
+
+  // Bot WebSocket connection state (separate from session.status: the session
+  // can be 'active' before the bot has actually opened its WebSocket back to
+  // the gateway. Director prompts can only be processed once botConnected=true.)
+  const [botConnected, setBotConnected] = useState(false);
+
+  // UDB Sidebar state
+  const [udbCollapsed, setUdbCollapsed] = useState(false);
+  const [udbTab, setUdbTab] = useState<UdbTab>('files');
+  const _udbContext: UdbContext | null = instanceId
+    ? { instanceId, featureInstanceId: instanceId }
+    : null;
+
+  const fileCtx = useFileContext();
+
   const transcriptEndRef = useRef<HTMLDivElement>(null);
   const eventSourceRef = useRef<EventSource | null>(null);
 
@@ -98,14 +139,38 @@ export const TeamsbotSessionView: React.FC = () => {
     _loadSession();
   }, [_loadSession]);
 
-  // SSE Live Stream - connect once per session, don't re-create on status changes
-  const sseSessionRef = useRef<string | null>(null);
-  const sessionStatus = session?.status;
+  // Load director prompt history when session changes
   useEffect(() => {
-    if (!instanceId || !sessionId || !sessionStatus) return;
-    if (!['active', 'joining', 'pending'].includes(sessionStatus)) return;
+    if (!instanceId || !sessionId) return;
+    let cancelled = false;
+    teamsbotApi
+      .listDirectorPrompts(instanceId, sessionId)
+      .then((res) => {
+        if (!cancelled) setDirectorPrompts(res.prompts || []);
+      })
+      .catch(() => {
+        if (!cancelled) setDirectorPrompts([]);
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, [instanceId, sessionId]);
+
+  // SSE Live Stream - connect once per session, don't re-create on status changes.
+  // We deliberately depend ONLY on (instanceId, sessionId), not on session.status,
+  // so transient status transitions (pending -> joining -> active) don't tear down
+  // and rebuild the EventSource (which used to flicker botConnected and spawn
+  // multiple parallel /stream connections to the gateway).
+  const sseSessionRef = useRef<string | null>(null);
+  const sessionStatusRef = useRef<string | undefined>(session?.status);
+  sessionStatusRef.current = session?.status;
+  useEffect(() => {
+    if (!instanceId || !sessionId) return;
     // Avoid reconnecting if already streaming this session
     if (sseSessionRef.current === sessionId && eventSourceRef.current) return;
+    // Don't open a stream for sessions that are known to already be terminal.
+    const initialStatus = sessionStatusRef.current;
+    if (initialStatus && !['active', 'joining', 'pending'].includes(initialStatus)) return;
 
     eventSourceRef.current?.close();
     sseSessionRef.current = sessionId;
@@ -200,6 +265,34 @@ export const TeamsbotSessionView: React.FC = () => {
             break;
           }
 
+          case 'botConnectionState': {
+            const data = sseEvent.data || {};
+            setBotConnected(Boolean(data.connected));
+            _dlog('BOT-WS', data.connected ? 'connected' : 'disconnected');
+            break;
+          }
+
+          case 'directorPrompt': {
+            const prompt = sseEvent.data as DirectorPrompt | undefined;
+            if (!prompt || !prompt.id) break;
+            setDirectorPrompts((prev) => {
+              const idx = prev.findIndex((p) => p.id === prompt.id);
+              if (idx >= 0) {
+                const updated = [...prev];
+                updated[idx] = { ...updated[idx], ...prompt };
+                return updated;
+              }
+              return [prompt, ...prev];
+            });
+            break;
+          }
+
+          case 'agentRun': {
+            const data = sseEvent.data || {};
+            _dlog('AGENT', `${data.status || ''} ${data.reason || ''}`.trim());
+            break;
+          }
+
           case 'error': {
             const errData = sseEvent.data || {};
             const errMsg = errData.message || t('Unbekannter Fehler');
@@ -229,8 +322,10 @@ export const TeamsbotSessionView: React.FC = () => {
       eventSourceRef.current = null;
       sseSessionRef.current = null;
       setIsLive(false);
+      setBotConnected(false);
     };
-  }, [instanceId, sessionId, sessionStatus, _dlog, t]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [instanceId, sessionId]);
 
   // Polling fallback: refresh session data every 5s when SSE is not connected
   const pollRef = useRef<ReturnType<typeof setInterval> | null>(null);
@@ -274,6 +369,193 @@ export const TeamsbotSessionView: React.FC = () => {
     }
   };
 
+  const _addDirectorFile = useCallback((fileId: string, fileName?: string) => {
+    setDirectorFiles((prev) => {
+      if (prev.some((f) => f.id === fileId)) return prev;
+      if (prev.length >= DIRECTOR_PROMPT_FILE_LIMIT) {
+        setDirectorError(
+          t('Maximal {n} Dateien pro Regieanweisung.', { n: String(DIRECTOR_PROMPT_FILE_LIMIT) }),
+        );
+        return prev;
+      }
+      setDirectorError(null);
+      return [...prev, { id: fileId, name: fileName || fileId }];
+    });
+  }, [t]);
+
+  const _handleUdbFileSelect = _addDirectorFile;
+
+  const _removeDirectorFile = (fileId: string) => {
+    setDirectorFiles((prev) => prev.filter((f) => f.id !== fileId));
+  };
+
+  const _uploadAndAttachDirectorFile = useCallback(async (file: File) => {
+    if (!fileCtx?.handleFileUpload) return;
+    setDirectorUploading(true);
+    setDirectorError(null);
+    try {
+      const result = await fileCtx.handleFileUpload(file);
+      if (result?.success) {
+        const data: any = (result.fileData as any)?.file || result.fileData;
+        const id = data?.id || (result.fileData as any)?.id;
+        if (id) {
+          _addDirectorFile(id, data?.fileName || file.name);
+        } else {
+          setDirectorError(t('Upload erfolgreich, aber keine Datei-ID erhalten.'));
+        }
+      } else {
+        setDirectorError(result?.error || t('Upload fehlgeschlagen.'));
+      }
+    } catch (err: any) {
+      setDirectorError(err?.message || t('Upload fehlgeschlagen.'));
+    } finally {
+      setDirectorUploading(false);
+    }
+  }, [fileCtx, _addDirectorFile, t]);
+
+  const _onDirectorDragEnter = useCallback((e: React.DragEvent) => {
+    if (
+      e.dataTransfer.types.includes('Files') ||
+      e.dataTransfer.types.includes('application/file-id') ||
+      e.dataTransfer.types.includes('application/file-ids') ||
+      e.dataTransfer.types.includes('application/tree-items')
+    ) {
+      e.preventDefault();
+      e.stopPropagation();
+      directorDragCounterRef.current += 1;
+      setDirectorDragOver(true);
+    }
+  }, []);
+
+  const _onDirectorDragOver = useCallback((e: React.DragEvent) => {
+    if (
+      e.dataTransfer.types.includes('Files') ||
+      e.dataTransfer.types.includes('application/file-id') ||
+      e.dataTransfer.types.includes('application/file-ids') ||
+      e.dataTransfer.types.includes('application/tree-items')
+    ) {
+      e.preventDefault();
+      e.stopPropagation();
+      e.dataTransfer.dropEffect = 'copy';
+    }
+  }, []);
+
+  const _onDirectorDragLeave = useCallback((e: React.DragEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    directorDragCounterRef.current = Math.max(0, directorDragCounterRef.current - 1);
+    if (directorDragCounterRef.current === 0) setDirectorDragOver(false);
+  }, []);
+
+  const _onDirectorDrop = useCallback(async (e: React.DragEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    directorDragCounterRef.current = 0;
+    setDirectorDragOver(false);
+
+    const fileIdsJson = e.dataTransfer.getData('application/file-ids');
+    if (fileIdsJson) {
+      try {
+        const ids: string[] = JSON.parse(fileIdsJson);
+        ids.forEach((id) => _addDirectorFile(id));
+      } catch { /* ignore malformed */ }
+      return;
+    }
+
+    const singleFileId = e.dataTransfer.getData('application/file-id');
+    if (singleFileId) {
+      const label = e.dataTransfer.getData('text/plain');
+      _addDirectorFile(singleFileId, label || undefined);
+      return;
+    }
+
+    const treeItemsJson = e.dataTransfer.getData('application/tree-items');
+    if (treeItemsJson) {
+      try {
+        const items: Array<{ id: string; type: 'file' | 'folder'; name: string }> = JSON.parse(treeItemsJson);
+        items.filter((it) => it.type === 'file').forEach((it) => _addDirectorFile(it.id, it.name));
+      } catch { /* ignore malformed */ }
+      return;
+    }
+
+    if (e.dataTransfer.files && e.dataTransfer.files.length > 0) {
+      for (const file of Array.from(e.dataTransfer.files)) {
+        if (directorFiles.length >= DIRECTOR_PROMPT_FILE_LIMIT) {
+          setDirectorError(
+            t('Maximal {n} Dateien pro Regieanweisung.', { n: String(DIRECTOR_PROMPT_FILE_LIMIT) }),
+          );
+          break;
+        }
+        await _uploadAndAttachDirectorFile(file);
+      }
+    }
+  }, [_addDirectorFile, _uploadAndAttachDirectorFile, directorFiles.length, t]);
+
+  const _onDirectorFileInput = useCallback(async (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (!e.target.files || e.target.files.length === 0) return;
+    for (const file of Array.from(e.target.files)) {
+      if (directorFiles.length >= DIRECTOR_PROMPT_FILE_LIMIT) break;
+      await _uploadAndAttachDirectorFile(file);
+    }
+    e.target.value = '';
+  }, [_uploadAndAttachDirectorFile, directorFiles.length]);
+
+  const _submitDirectorPrompt = async () => {
+    if (!instanceId || !sessionId) return;
+    const trimmed = directorText.trim();
+    if (!trimmed) {
+      setDirectorError(t('Bitte gib eine Anweisung ein.'));
+      return;
+    }
+    if (trimmed.length > DIRECTOR_PROMPT_TEXT_LIMIT) {
+      setDirectorError(
+        t('Text zu lang (max. {n} Zeichen).', { n: String(DIRECTOR_PROMPT_TEXT_LIMIT) }),
+      );
+      return;
+    }
+    setDirectorSubmitting(true);
+    setDirectorError(null);
+    try {
+      const res = await teamsbotApi.submitDirectorPrompt(instanceId, sessionId, {
+        text: trimmed,
+        mode: directorMode,
+        fileIds: directorFiles.map((f) => f.id),
+      });
+      if (res.prompt) {
+        setDirectorPrompts((prev) => {
+          const idx = prev.findIndex((p) => p.id === res.prompt.id);
+          if (idx >= 0) {
+            const next = [...prev];
+            next[idx] = res.prompt;
+            return next;
+          }
+          return [res.prompt, ...prev];
+        });
+      }
+      setDirectorText('');
+      setDirectorFiles([]);
+    } catch (err: any) {
+      setDirectorError(err?.response?.data?.detail || err?.message || t('Senden fehlgeschlagen.'));
+    } finally {
+      setDirectorSubmitting(false);
+    }
+  };
+
+  const _removeDirectorPrompt = async (promptId: string) => {
+    if (!instanceId || !sessionId) return;
+    try {
+      await teamsbotApi.deleteDirectorPrompt(instanceId, sessionId, promptId);
+      setDirectorPrompts((prev) => prev.filter((p) => p.id !== promptId));
+    } catch (err: any) {
+      setDirectorError(err?.message || t('Entfernen fehlgeschlagen.'));
+    }
+  };
+
+  const activePersistentCount = useMemo(
+    () => directorPrompts.filter((p) => p.mode === 'persistent' && p.status !== 'consumed').length,
+    [directorPrompts],
+  );
+
   const _getSpeakerColor = (speaker: string) => {
     const colors = ['#4A90D9', '#D94A4A', '#4AD99A', '#D9A84A', '#9A4AD9', '#4AD9D9'];
     let hash = 0;
@@ -341,6 +623,227 @@ export const TeamsbotSessionView: React.FC = () => {
 
       {error && <div className={styles.errorBanner}>{error}</div>}
 
+      {/* Layout: UDB Sidebar + Main */}
+      <div className={styles.sessionLayout}>
+        {/* UDB Sidebar (Files / Sources) */}
+        {_udbContext && (
+          <div className={`${styles.udbSidebar} ${udbCollapsed ? styles.udbSidebarCollapsed : ''}`}>
+            <button
+              className={styles.udbToggle}
+              onClick={() => setUdbCollapsed((v) => !v)}
+              title={udbCollapsed ? t('Seitenleiste einblenden') : t('Seitenleiste ausblenden')}
+            >
+              {udbCollapsed ? '\u25B6' : '\u25C0'}
+            </button>
+            {!udbCollapsed && (
+              <UnifiedDataBar
+                context={_udbContext}
+                activeTab={udbTab}
+                onTabChange={setUdbTab}
+                hideTabs={['chats']}
+                onFileSelect={_handleUdbFileSelect}
+              />
+            )}
+          </div>
+        )}
+
+        {/* Main column */}
+        <div className={styles.sessionMain}>
+
+      {/* Director Prompt Panel (private operator instructions) */}
+      {['active', 'joining', 'pending'].includes(session.status) && (
+        <div
+          className={`${styles.directorPanel} ${directorDragOver ? styles.directorPanelDragOver : ''}`}
+          onDragEnter={_onDirectorDragEnter}
+          onDragOver={_onDirectorDragOver}
+          onDragLeave={_onDirectorDragLeave}
+          onDrop={_onDirectorDrop}
+        >
+          {(() => {
+            const sStatus = session?.status;
+            const isSessionLaunching = !!sStatus && ['pending', 'joining'].includes(sStatus);
+            const isSessionActive = sStatus === 'active';
+            // Bot has joined the meeting (session active) but the WebSocket back
+            // to the gateway is missing -> usually means the browser-bot service
+            // can't reach this gateway (e.g. localhost gateway + remote bot, or
+            // bot behind firewall). Audio + transcripts won't flow.
+            const isBotUnreachable = isSessionActive && !botConnected;
+            const statusLabel = botConnected
+              ? t('Bot live')
+              : isBotUnreachable
+                ? t('Bot ist im Meeting, aber nicht mit dem Gateway verbunden')
+                : isSessionLaunching
+                  ? t('Bot startet ...')
+                  : t('Keine aktive Session');
+            const statusTitle = botConnected
+              ? t('Bot ist live im Meeting verbunden und liefert Transkripte')
+              : isBotUnreachable
+                ? t('Der Browser-Bot hat den WebSocket nicht zurueck zum Gateway geoeffnet. Pruefe TEAMSBOT_BROWSER_BOT_URL und APP_API_URL: bei lokalem Gateway muss der Bot ebenfalls lokal laufen oder das Gateway ueber einen Tunnel erreichbar sein.')
+                : isSessionLaunching
+                  ? t('Bot tritt dem Meeting bei und oeffnet die WebSocket-Verbindung ...')
+                  : t('Es laeuft keine aktive Bot-Session');
+            return (
+              <div className={styles.directorHeader}>
+                <div className={styles.directorHeaderLeft}>
+                  <h4 className={styles.directorTitle}>{t('Regieanweisungen')}</h4>
+                  <span
+                    className={`${styles.botStatusDot} ${botConnected ? styles.botStatusDotLive : styles.botStatusDotIdle}`}
+                    title={statusTitle}
+                  />
+                  <span className={styles.directorMeta} title={statusTitle}>
+                    {statusLabel}
+                  </span>
+                  {activePersistentCount > 0 && (
+                    <span className={styles.directorBadge} title={t('Aktive persistente Anweisungen')}>
+                      {activePersistentCount}
+                    </span>
+                  )}
+                </div>
+                <div className={styles.directorMeta}>
+                  {t('Privat - nur fuer den Bot sichtbar')}
+                </div>
+              </div>
+            );
+          })()}
+
+          <div className={styles.directorBody}>
+            <textarea
+              className={styles.directorTextarea}
+              placeholder={t('Anweisung an den Bot (z. B. recherchiere ... und gib eine Empfehlung) ...')}
+              value={directorText}
+              maxLength={DIRECTOR_PROMPT_TEXT_LIMIT}
+              onChange={(e) => setDirectorText(e.target.value)}
+              onKeyDown={(e) => {
+                if ((e.ctrlKey || e.metaKey) && e.key === 'Enter') {
+                  e.preventDefault();
+                  void _submitDirectorPrompt();
+                }
+              }}
+            />
+
+            {directorFiles.length > 0 && (
+              <div className={styles.directorChips}>
+                {directorFiles.map((f) => (
+                  <span key={f.id} className={styles.directorChip} title={f.name}>
+                    <span className={styles.directorChipName}>{f.name}</span>
+                    <button
+                      className={styles.directorChipRemove}
+                      onClick={() => _removeDirectorFile(f.id)}
+                      title={t('Entfernen')}
+                    >
+                      x
+                    </button>
+                  </span>
+                ))}
+              </div>
+            )}
+
+            <div className={styles.directorActions}>
+              <div className={styles.directorRow}>
+                <span className={styles.directorModeToggle}>
+                  <button
+                    className={`${styles.directorModeButton} ${directorMode === 'oneShot' ? styles.directorModeButtonActive : ''}`}
+                    onClick={() => setDirectorMode('oneShot')}
+                    type="button"
+                  >
+                    {t('Einmalig')}
+                  </button>
+                  <button
+                    className={`${styles.directorModeButton} ${directorMode === 'persistent' ? styles.directorModeButtonActive : ''}`}
+                    onClick={() => setDirectorMode('persistent')}
+                    type="button"
+                  >
+                    {t('Persistent')}
+                  </button>
+                </span>
+                <input
+                  ref={directorFileInputRef}
+                  type="file"
+                  multiple
+                  style={{ display: 'none' }}
+                  onChange={_onDirectorFileInput}
+                />
+                <button
+                  className={styles.directorAttachBtn}
+                  onClick={() => directorFileInputRef.current?.click()}
+                  disabled={directorUploading || directorFiles.length >= DIRECTOR_PROMPT_FILE_LIMIT}
+                  title={t('Dateien anhaengen')}
+                  type="button"
+                >
+                  {directorUploading ? t('Lade hoch ...') : t('Datei anhaengen')}
+                </button>
+                <span className={styles.directorMeta}>
+                  {directorText.length}/{DIRECTOR_PROMPT_TEXT_LIMIT} {t('Zeichen')} -
+                  {' '}{directorFiles.length}/{DIRECTOR_PROMPT_FILE_LIMIT} {t('Dateien')}
+                </span>
+              </div>
+              <button
+                className={styles.directorSubmit}
+                onClick={_submitDirectorPrompt}
+                disabled={directorSubmitting || !directorText.trim() || !botConnected}
+                type="button"
+                title={botConnected ? t('Strg+Enter: Senden') : t('Bot ist noch nicht live verbunden')}
+              >
+                {directorSubmitting ? t('Senden ...') : t('An Bot senden')}
+              </button>
+            </div>
+
+            {!botConnected && (
+              <div className={styles.directorHint}>
+                {session?.status === 'active'
+                  ? t('Der Bot ist im Meeting, hat aber den WebSocket-Kanal zum Gateway nicht geoeffnet. Pruefe TEAMSBOT_BROWSER_BOT_URL/APP_API_URL und ob der Browser-Bot-Service das Gateway erreichen kann.')
+                  : t('Der Bot muss erst dem Meeting beitreten und sich verbinden, bevor Regieanweisungen ausgefuehrt werden koennen.')}
+              </div>
+            )}
+
+            {directorError && (
+              <div className={styles.errorBanner} style={{ margin: 0 }}>{directorError}</div>
+            )}
+          </div>
+
+          {directorPrompts.length > 0 && (
+            <div className={styles.directorHistory}>
+              {directorPrompts.slice(0, 8).map((p) => (
+                <div key={p.id} className={styles.directorHistoryItem}>
+                  <div className={styles.directorHistoryHead}>
+                    <span>
+                      {_formatTime(p.createdAt)} - {p.mode === 'persistent' ? t('Persistent') : t('Einmalig')}
+                      {p.fileIds && p.fileIds.length > 0 && ` - ${p.fileIds.length} ${t('Dateien')}`}
+                    </span>
+                    <span style={{ display: 'flex', gap: '6px', alignItems: 'center' }}>
+                      <span className={`${styles.directorStatus} ${styles[`directorStatus${p.status.charAt(0).toUpperCase() + p.status.slice(1)}`] || ''}`}>
+                        {p.status}
+                      </span>
+                      {p.mode === 'persistent' && p.status !== 'consumed' && (
+                        <button
+                          className={styles.directorRemoveBtn}
+                          onClick={() => _removeDirectorPrompt(p.id)}
+                          title={t('Persistente Anweisung entfernen')}
+                          type="button"
+                        >
+                          x
+                        </button>
+                      )}
+                    </span>
+                  </div>
+                  <div className={styles.directorHistoryText}>{p.text}</div>
+                  {p.responseText && (
+                    <div className={styles.directorHistoryText} style={{ opacity: 0.85 }}>
+                      <em>{t('Antwort')}:</em> {p.responseText}
+                    </div>
+                  )}
+                  {p.statusMessage && p.status === 'failed' && (
+                    <div className={styles.directorHistoryText} style={{ color: '#b91c1c' }}>
+                      {p.statusMessage}
+                    </div>
+                  )}
+                </div>
+              ))}
+            </div>
+          )}
+        </div>
+      )}
+
       {/* Main Content: Transcript + Responses */}
       <div className={styles.sessionContent}>
         {/* Left: Transcript */}
@@ -501,6 +1004,9 @@ export const TeamsbotSessionView: React.FC = () => {
           )}
         </div>
       )}
+
+        </div>{/* /sessionMain */}
+      </div>{/* /sessionLayout */}
     </div>
   );
 };
diff --git a/src/pages/views/teamsbot/TeamsbotSettingsView.tsx b/src/pages/views/teamsbot/TeamsbotSettingsView.tsx
index 6bd6ac3..edf7b46 100644
--- a/src/pages/views/teamsbot/TeamsbotSettingsView.tsx
+++ b/src/pages/views/teamsbot/TeamsbotSettingsView.tsx
@@ -1,13 +1,16 @@
 import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { useCurrentInstance } from '../../../hooks/useCurrentInstance';
 import * as teamsbotApi from '../../../api/teamsbotApi';
-import type { TeamsbotConfig, ConfigUpdateRequest, VoiceOption } from '../../../api/teamsbotApi';
+import type { TeamsbotConfig, ConfigUpdateRequest, VoiceOption, SystemBot } from '../../../api/teamsbotApi';
 import type { VoiceLanguage } from '../../../api/voiceCatalogApi';
-import { FaPlay, FaSpinner } from 'react-icons/fa';
+import { FaPlay, FaSpinner, FaTrash } from 'react-icons/fa';
 import styles from './Teamsbot.module.css';
+import { getUserDataCache } from '../../../utils/userCache';
 
 import { useLanguage } from '../../../providers/language/LanguageContext';
 
+type SettingsTabId = 'general' | 'systemBots';
+
 /** Format voice name for display: "de-DE-Wavenet-A" -> "Wavenet A" + gender */
 function _formatVoiceName(voice: VoiceOption): string {
   const parts = voice.name.split('-');
@@ -148,12 +151,44 @@ export const TeamsbotSettingsView: React.FC = () => {
     }
   };
 
+  const cachedUser = getUserDataCache();
+  const _isSysAdmin = cachedUser?.isSysAdmin === true;
+
+  const [activeTab, setActiveTab] = useState<SettingsTabId>('general');
+
   if (loading) return <div className={styles.loading}>{t('Konfiguration laden')}</div>;
 
   return (
     <div className={styles.settingsContainer}>
+      {/* Tab navigation */}
+      <div className={styles.settingsTabs} role="tablist">
+        <button
+          type="button"
+          role="tab"
+          aria-selected={activeTab === 'general'}
+          className={`${styles.settingsTab} ${activeTab === 'general' ? styles.settingsTabActive : ''}`}
+          onClick={() => setActiveTab('general')}
+        >
+          {t('Bot-Einstellungen')}
+        </button>
+        {_isSysAdmin && (
+          <button
+            type="button"
+            role="tab"
+            aria-selected={activeTab === 'systemBots'}
+            className={`${styles.settingsTab} ${activeTab === 'systemBots' ? styles.settingsTabActive : ''}`}
+            onClick={() => setActiveTab('systemBots')}
+          >
+            {t('System-Bots')}
+          </button>
+        )}
+      </div>
+
+      {activeTab === 'systemBots' && _isSysAdmin ? (
+        <_SystemBotsPanel instanceId={instanceId} />
+      ) : (
       <div className={styles.settingsCard}>
-        <h3 className={styles.cardTitle}>Bot-Einstellungen</h3>
+        <h3 className={styles.cardTitle}>{t('Bot-Einstellungen')}</h3>
 
         {error && <div className={styles.errorBanner}>{error}</div>}
         {successMsg && <div className={styles.successBanner}>{successMsg}</div>}
@@ -375,6 +410,266 @@ export const TeamsbotSettingsView: React.FC = () => {
           </button>
         </div>
       </div>
+      )}
+    </div>
+  );
+};
+
+// ============================================================================
+// System-Bots Tab (SysAdmin only)
+// ============================================================================
+
+interface _SystemBotsPanelProps {
+  instanceId: string;
+}
+
+/**
+ * System-Bots panel: list, create and delete the mandate's authenticated
+ * Teams bot accounts (email + encrypted password). Used as the SYSTEM_BOT
+ * join mode in the Dashboard. Server stores the password encrypted and
+ * never returns it; this panel only ever holds the password in memory
+ * during the create form.
+ */
+const _SystemBotsPanel: React.FC<_SystemBotsPanelProps> = ({ instanceId }) => {
+  const { t } = useLanguage();
+
+  const [bots, setBots] = useState<SystemBot[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+  const [successMsg, setSuccessMsg] = useState<string | null>(null);
+
+  // Create form
+  const [showForm, setShowForm] = useState(false);
+  const [formName, setFormName] = useState('');
+  const [formEmail, setFormEmail] = useState('');
+  const [formPassword, setFormPassword] = useState('');
+  const [showPassword, setShowPassword] = useState(false);
+  const [creating, setCreating] = useState(false);
+
+  // Delete state (id of the bot currently being deleted, if any)
+  const [deletingId, setDeletingId] = useState<string | null>(null);
+
+  const _load = useCallback(async () => {
+    if (!instanceId) return;
+    try {
+      setLoading(true);
+      setError(null);
+      const result = await teamsbotApi.listSystemBots(instanceId);
+      setBots(result.bots || []);
+    } catch (err: any) {
+      setError(err?.message || t('Fehler beim Laden'));
+    } finally {
+      setLoading(false);
+    }
+  }, [instanceId, t]);
+
+  useEffect(() => {
+    _load();
+  }, [_load]);
+
+  const _resetForm = () => {
+    setFormName('');
+    setFormEmail('');
+    setFormPassword('');
+    setShowPassword(false);
+    setShowForm(false);
+  };
+
+  const _flashSuccess = (msg: string) => {
+    setSuccessMsg(msg);
+    setTimeout(() => setSuccessMsg(null), 3000);
+  };
+
+  const _handleCreate = async (e: React.FormEvent) => {
+    e.preventDefault();
+    if (!formEmail.trim() || !formPassword) {
+      setError(t('Email und Passwort sind erforderlich'));
+      return;
+    }
+    setCreating(true);
+    setError(null);
+    try {
+      await teamsbotApi.createSystemBot(instanceId, {
+        email: formEmail.trim(),
+        password: formPassword,
+        name: formName.trim() || undefined,
+      });
+      _resetForm();
+      await _load();
+      _flashSuccess(t('System-Bot gespeichert'));
+    } catch (err: any) {
+      setError(err?.response?.data?.detail || err?.message || t('Fehler beim Speichern'));
+    } finally {
+      setCreating(false);
+    }
+  };
+
+  const _handleDelete = async (bot: SystemBot) => {
+    const confirmed = window.confirm(
+      t('System-Bot wirklich loeschen?') + `\n\n${bot.name} <${bot.email}>`,
+    );
+    if (!confirmed) return;
+    setDeletingId(bot.id);
+    setError(null);
+    try {
+      await teamsbotApi.deleteSystemBot(instanceId, bot.id);
+      setBots(prev => prev.filter(b => b.id !== bot.id));
+      _flashSuccess(t('System-Bot geloescht'));
+    } catch (err: any) {
+      setError(err?.response?.data?.detail || err?.message || t('Fehler beim Loeschen'));
+    } finally {
+      setDeletingId(null);
+    }
+  };
+
+  return (
+    <div className={styles.settingsCard}>
+      <h3 className={styles.cardTitle}>{t('System-Bots')}</h3>
+      <p className={styles.cardDescription}>
+        {t('Authentifizierte Teams-Konten, mit denen der Bot Meetings beitreten kann. Passwoerter werden verschluesselt gespeichert und nie zurueckgegeben.')}
+      </p>
+
+      {error && <div className={styles.errorBanner}>{error}</div>}
+      {successMsg && <div className={styles.successBanner}>{successMsg}</div>}
+
+      {loading ? (
+        <div className={styles.loading}>{t('Laden')}...</div>
+      ) : (
+        <>
+          {bots.length === 0 ? (
+            <div className={styles.emptyState || ''} style={{ padding: '1rem 0', color: 'var(--text-secondary, #666)', fontSize: '0.9rem' }}>
+              {t('Noch kein System-Bot konfiguriert. Anonyme Joins werden verwendet, bis ein Konto angelegt ist.')}
+            </div>
+          ) : (
+            <table className={styles.systemBotsTable || ''} style={{ width: '100%', borderCollapse: 'collapse', marginBottom: '1rem' }}>
+              <thead>
+                <tr style={{ textAlign: 'left', borderBottom: '1px solid var(--border-color, #e0e0e0)' }}>
+                  <th style={{ padding: '0.5rem 0.5rem 0.5rem 0', fontSize: '0.85rem', fontWeight: 600 }}>{t('Name')}</th>
+                  <th style={{ padding: '0.5rem', fontSize: '0.85rem', fontWeight: 600 }}>{t('Email')}</th>
+                  <th style={{ padding: '0.5rem', fontSize: '0.85rem', fontWeight: 600 }}>{t('Status')}</th>
+                  <th style={{ padding: '0.5rem 0 0.5rem 0.5rem', fontSize: '0.85rem', fontWeight: 600, textAlign: 'right' }}></th>
+                </tr>
+              </thead>
+              <tbody>
+                {bots.map(bot => (
+                  <tr key={bot.id} style={{ borderBottom: '1px solid var(--border-color, #f0f0f0)' }}>
+                    <td style={{ padding: '0.6rem 0.5rem 0.6rem 0', fontSize: '0.9rem' }}>{bot.name}</td>
+                    <td style={{ padding: '0.6rem 0.5rem', fontSize: '0.9rem', fontFamily: 'monospace' }}>{bot.email}</td>
+                    <td style={{ padding: '0.6rem 0.5rem', fontSize: '0.85rem' }}>
+                      {bot.isActive ? (
+                        <span style={{ color: 'var(--success-color, #2D8E5C)' }}>{t('Aktiv')}</span>
+                      ) : (
+                        <span style={{ color: 'var(--text-secondary, #999)' }}>{t('Inaktiv')}</span>
+                      )}
+                    </td>
+                    <td style={{ padding: '0.6rem 0 0.6rem 0.5rem', textAlign: 'right' }}>
+                      <button
+                        type="button"
+                        className={styles.deleteButton}
+                        onClick={() => _handleDelete(bot)}
+                        disabled={deletingId === bot.id}
+                        title={t('Loeschen')}
+                        style={{ display: 'inline-flex', alignItems: 'center', gap: '6px' }}
+                      >
+                        {deletingId === bot.id ? <FaSpinner className={styles.spinner} /> : <FaTrash />}
+                        {t('Loeschen')}
+                      </button>
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          )}
+
+          {!showForm ? (
+            <div className={styles.settingsActions}>
+              <button
+                type="button"
+                className={styles.saveButton}
+                onClick={() => { setShowForm(true); setError(null); }}
+              >
+                {t('Neuen System-Bot anlegen')}
+              </button>
+            </div>
+          ) : (
+            <form onSubmit={_handleCreate} className={styles.settingsSection}>
+              <h4 className={styles.sectionTitle}>{t('Neuer System-Bot')}</h4>
+
+              <div className={styles.formGroup}>
+                <label className={styles.label}>{t('Anzeigename')}</label>
+                <input
+                  type="text"
+                  className={styles.input}
+                  value={formName}
+                  onChange={(e) => setFormName(e.target.value)}
+                  placeholder={t('z.B. Nyla Larsson')}
+                  autoComplete="off"
+                />
+                <span className={styles.hint}>
+                  {t('Optional. Falls leer, wird der Email-Localpart verwendet.')}
+                </span>
+              </div>
+
+              <div className={styles.formGroup}>
+                <label className={styles.label}>{t('Email')} *</label>
+                <input
+                  type="email"
+                  className={styles.input}
+                  value={formEmail}
+                  onChange={(e) => setFormEmail(e.target.value)}
+                  placeholder="bot@example.onmicrosoft.com"
+                  autoComplete="off"
+                  required
+                />
+              </div>
+
+              <div className={styles.formGroup}>
+                <label className={styles.label}>{t('Passwort')} *</label>
+                <div style={{ display: 'flex', gap: '8px', alignItems: 'center' }}>
+                  <input
+                    type={showPassword ? 'text' : 'password'}
+                    className={styles.input}
+                    style={{ flex: 1 }}
+                    value={formPassword}
+                    onChange={(e) => setFormPassword(e.target.value)}
+                    autoComplete="new-password"
+                    required
+                  />
+                  <button
+                    type="button"
+                    className={styles.viewButton}
+                    onClick={() => setShowPassword(s => !s)}
+                  >
+                    {showPassword ? t('Verbergen') : t('Anzeigen')}
+                  </button>
+                </div>
+                <span className={styles.hint}>
+                  {t('Wird serverseitig verschluesselt gespeichert und nie zurueckgegeben.')}
+                </span>
+              </div>
+
+              <div className={styles.settingsActions} style={{ display: 'flex', gap: '8px' }}>
+                <button
+                  type="submit"
+                  className={styles.saveButton}
+                  disabled={creating}
+                >
+                  {creating ? <FaSpinner className={styles.spinner} /> : null}
+                  {creating ? t('Speichern') : t('System-Bot speichern')}
+                </button>
+                <button
+                  type="button"
+                  className={styles.viewButton}
+                  onClick={_resetForm}
+                  disabled={creating}
+                >
+                  {t('Abbrechen')}
+                </button>
+              </div>
+            </form>
+          )}
+        </>
+      )}
     </div>
   );
 };
diff --git a/src/pages/views/trustee/TrusteeAccountingSettingsView.tsx b/src/pages/views/trustee/TrusteeAccountingSettingsView.tsx
index 4aef0a5..9fbb4c2 100644
--- a/src/pages/views/trustee/TrusteeAccountingSettingsView.tsx
+++ b/src/pages/views/trustee/TrusteeAccountingSettingsView.tsx
@@ -69,6 +69,7 @@ export const TrusteeAccountingSettingsView: React.FC = () => {
   const [clearingCache, setClearingCache] = useState(false);
   const [exporting, setExporting] = useState(false);
   const [importPeriod, setImportPeriod] = useState<PeriodValue | null>(null);
+  const [wipingData, setWipingData] = useState(false);
   const { confirm, ConfirmDialog } = useConfirm();
 
   useEffect(() => {
@@ -438,7 +439,9 @@ export const TrusteeAccountingSettingsView: React.FC = () => {
                 const lastSyncAt = importStatus?.lastSyncAt as number | null | undefined;
                 const winFrom = importStatus?.lastSyncDateFrom as string | undefined;
                 const winTo = importStatus?.lastSyncDateTo as string | undefined;
-                const counts = (importStatus?.lastSyncCounts || {}) as Record<string, number>;
+                const counts = (importStatus?.lastSyncCounts || {}) as Record<string, any>;
+                const oldestBooking = counts.oldestBookingDate as string | null | undefined;
+                const newestBooking = counts.newestBookingDate as string | null | undefined;
                 const timeWindow = winFrom && winTo
                   ? t('{from} bis {to}', { from: winFrom, to: winTo })
                   : winFrom
@@ -446,6 +449,13 @@ export const TrusteeAccountingSettingsView: React.FC = () => {
                     : winTo
                       ? t('bis {to}', { to: winTo })
                       : null;
+                const dataWindow = oldestBooking && newestBooking
+                  ? t('{from} bis {to}', { from: oldestBooking, to: newestBooking })
+                  : oldestBooking
+                    ? t('ab {from}', { from: oldestBooking })
+                    : newestBooking
+                      ? t('bis {to}', { to: newestBooking })
+                      : null;
                 return (
                   <div style={{
                     fontSize: '0.8rem',
@@ -461,9 +471,18 @@ export const TrusteeAccountingSettingsView: React.FC = () => {
                         <div>
                           <strong>{t('Letzter Import:')}</strong> {new Date(lastSyncAt * 1000).toLocaleString()}
                           {timeWindow && (
-                            <> {' '}&middot; <strong>{t('Zeitfenster:')}</strong> {timeWindow}</>
+                            <> {' '}&middot; <strong>{t('Angefragtes Zeitfenster:')}</strong> {timeWindow}</>
                           )}
                         </div>
+                        {dataWindow && (
+                          <div style={{ marginTop: '0.2rem' }}>
+                            <strong>{t('Tatsächlich erhaltene Buchungen:')}</strong>{' '}
+                            {dataWindow}
+                            <span style={{ marginLeft: '0.5rem', fontStyle: 'italic' }}>
+                              ({t('älteste/neuste Buchung im Import — zur Vollständigkeitsprüfung')})
+                            </span>
+                          </div>
+                        )}
                         <div style={{ marginTop: '0.2rem' }}>
                           {t('{konten} Konten, {buchungen} Buchungen ({zeilen} Zeilen), {kontakte} Kontakte, {salden} Salden', {
                             konten: String(counts.accounts ?? 0),
@@ -547,12 +566,13 @@ export const TrusteeAccountingSettingsView: React.FC = () => {
                 <button
                   className={styles.secondaryButton}
                   disabled={clearingCache}
+                  title={t('Leert nur den Antwort-Cache des KI-Agenten (~5 Min). Synchronisierte Daten bleiben unverändert.')}
                   onClick={async () => {
                     if (!instanceId) return;
                     setClearingCache(true);
                     try {
                       const result = await request({ url: `/api/trustee/${instanceId}/accounting/clear-cache`, method: 'post' });
-                      showSuccess(t('Cache geleert'), t('{n} gecachte Abfragen entfernt. Die nächste KI-Abfrage liest frische Daten.', { n: String(result?.cleared ?? 0) }));
+                      showSuccess(t('KI-Antwort-Cache geleert'), t('{n} gecachte KI-Antworten entfernt. Die nächste KI-Abfrage berechnet frische Antworten aus den synchronisierten Tabellen. Diese Aktion löscht KEINE importierten Buchungen.', { n: String(result?.cleared ?? 0) }));
                     } catch (err: any) {
                       showError(t('Fehler'), err.response?.data?.detail || err.message || t('Cache konnte nicht geleert werden.'));
                     } finally {
@@ -560,7 +580,41 @@ export const TrusteeAccountingSettingsView: React.FC = () => {
                     }
                   }}
                 >
-                  {clearingCache ? t('Leere…') : t('KI-Cache leeren')}
+                  {clearingCache ? t('Leere…') : t('KI-Antwort-Cache leeren')}
+                </button>
+                <button
+                  className={styles.secondaryButton}
+                  disabled={wipingData}
+                  title={t('Löscht alle importierten Buchungen, Konten, Kontakte und Salden für diese Instanz. Die Verbindungseinstellungen bleiben erhalten.')}
+                  style={{ color: 'var(--error-color, #dc2626)' }}
+                  onClick={async () => {
+                    if (!instanceId) return;
+                    const ok = await confirm(
+                      t('Wirklich alle importierten Buchhaltungsdaten dieser Instanz aus der lokalen Datenbank löschen? Die Verbindungseinstellungen bleiben erhalten. Sie können danach jederzeit erneut importieren.'),
+                      {
+                        title: t('Importierte Daten löschen'),
+                        confirmLabel: t('Löschen'),
+                        variant: 'danger',
+                      },
+                    );
+                    if (!ok) return;
+                    setWipingData(true);
+                    try {
+                      const result = await request({ url: `/api/trustee/${instanceId}/accounting/wipe-imported-data`, method: 'post' });
+                      showSuccess(
+                        t('Daten gelöscht'),
+                        t('{n} Datensätze entfernt. Sie können nun einen frischen Import starten.', { n: String(result?.totalRemoved ?? 0) }),
+                      );
+                      _loadImportStatus();
+                      void loadData();
+                    } catch (err: any) {
+                      showError(t('Fehler'), err.response?.data?.detail || err.message || t('Daten konnten nicht gelöscht werden.'));
+                    } finally {
+                      setWipingData(false);
+                    }
+                  }}
+                >
+                  {wipingData ? t('Lösche…') : t('Importierte Daten löschen')}
                 </button>
                 <button
                   className={styles.secondaryButton}
diff --git a/src/pages/views/trustee/trusteePipelineGraph.ts b/src/pages/views/trustee/trusteePipelineGraph.ts
index 79f01c1..b9a8b3c 100644
--- a/src/pages/views/trustee/trusteePipelineGraph.ts
+++ b/src/pages/views/trustee/trusteePipelineGraph.ts
@@ -17,11 +17,12 @@ interface TrusteeGraphNode {
   position: { x: number; y: number };
 }
 
+/** Matches automation2 ``buildConnectionMap`` (``sourceOutput`` / ``targetInput``). */
 interface TrusteeGraphConnection {
   source: string;
-  sourcePort: number;
+  sourceOutput: number;
   target: string;
-  targetPort: number;
+  targetInput: number;
 }
 
 export interface TrusteeGraph {
@@ -68,7 +69,7 @@ export function _buildScanUploadGraph(
       _method: 'trustee',
       _action: 'processDocuments',
       parameters: {
-        documentList: [],
+        documentList: { type: 'ref', nodeId: 'extract', path: ['documents'] },
         featureInstanceId: trusteeInstanceId,
       },
       position: { x: 500, y: 0 },
@@ -80,7 +81,7 @@ export function _buildScanUploadGraph(
       _method: 'trustee',
       _action: 'syncToAccounting',
       parameters: {
-        documentList: [],
+        documentList: { type: 'ref', nodeId: 'process', path: ['documents'] },
         featureInstanceId: trusteeInstanceId,
       },
       position: { x: 750, y: 0 },
@@ -88,9 +89,9 @@ export function _buildScanUploadGraph(
   ];
 
   const connections: TrusteeGraphConnection[] = [
-    { source: 'trigger-manual', sourcePort: 0, target: 'extract', targetPort: 0 },
-    { source: 'extract', sourcePort: 0, target: 'process', targetPort: 0 },
-    { source: 'process', sourcePort: 0, target: 'sync', targetPort: 0 },
+    { source: 'trigger-manual', sourceOutput: 0, target: 'extract', targetInput: 0 },
+    { source: 'extract', sourceOutput: 0, target: 'process', targetInput: 0 },
+    { source: 'process', sourceOutput: 0, target: 'sync', targetInput: 0 },
   ];
 
   return { nodes, connections };
@@ -137,7 +138,7 @@ export function _buildExpenseImportGraph(
       _method: 'trustee',
       _action: 'processDocuments',
       parameters: {
-        documentList: [],
+        documentList: { type: 'ref', nodeId: 'extract', path: ['documents'] },
         featureInstanceId: trusteeInstanceId,
       },
       position: { x: 500, y: 0 },
@@ -149,7 +150,7 @@ export function _buildExpenseImportGraph(
       _method: 'trustee',
       _action: 'syncToAccounting',
       parameters: {
-        documentList: [],
+        documentList: { type: 'ref', nodeId: 'process', path: ['documents'] },
         featureInstanceId: trusteeInstanceId,
       },
       position: { x: 750, y: 0 },
@@ -157,9 +158,9 @@ export function _buildExpenseImportGraph(
   ];
 
   const connections: TrusteeGraphConnection[] = [
-    { source: 'trigger-manual', sourcePort: 0, target: 'extract', targetPort: 0 },
-    { source: 'extract', sourcePort: 0, target: 'process', targetPort: 0 },
-    { source: 'process', sourcePort: 0, target: 'sync', targetPort: 0 },
+    { source: 'trigger-manual', sourceOutput: 0, target: 'extract', targetInput: 0 },
+    { source: 'extract', sourceOutput: 0, target: 'process', targetInput: 0 },
+    { source: 'process', sourceOutput: 0, target: 'sync', targetInput: 0 },
   ];
 
   return { nodes, connections };
@@ -210,7 +211,7 @@ export function _buildScheduledExpenseImportGraph(
       _method: 'trustee',
       _action: 'processDocuments',
       parameters: {
-        documentList: [],
+        documentList: { type: 'ref', nodeId: 'extract', path: ['documents'] },
         featureInstanceId: trusteeInstanceId,
       },
       position: { x: 500, y: 0 },
@@ -222,7 +223,7 @@ export function _buildScheduledExpenseImportGraph(
       _method: 'trustee',
       _action: 'syncToAccounting',
       parameters: {
-        documentList: [],
+        documentList: { type: 'ref', nodeId: 'process', path: ['documents'] },
         featureInstanceId: trusteeInstanceId,
       },
       position: { x: 750, y: 0 },
@@ -230,9 +231,9 @@ export function _buildScheduledExpenseImportGraph(
   ];
 
   const connections: TrusteeGraphConnection[] = [
-    { source: 'trigger-schedule', sourcePort: 0, target: 'extract', targetPort: 0 },
-    { source: 'extract', sourcePort: 0, target: 'process', targetPort: 0 },
-    { source: 'process', sourcePort: 0, target: 'sync', targetPort: 0 },
+    { source: 'trigger-schedule', sourceOutput: 0, target: 'extract', targetInput: 0 },
+    { source: 'extract', sourceOutput: 0, target: 'process', targetInput: 0 },
+    { source: 'process', sourceOutput: 0, target: 'sync', targetInput: 0 },
   ];
 
   return { nodes, connections };
diff --git a/src/test/setup.ts b/src/test/setup.ts
new file mode 100644
index 0000000..4177b43
--- /dev/null
+++ b/src/test/setup.ts
@@ -0,0 +1,45 @@
+// Copyright (c) 2025 Patrick Motsch
+// All rights reserved.
+//
+// Vitest global setup: jest-dom matchers + jsdom polyfills required by some
+// of our components (ResizeObserver, matchMedia, scrollIntoView).
+
+import '@testing-library/jest-dom/vitest';
+import { afterEach } from 'vitest';
+import { cleanup } from '@testing-library/react';
+
+afterEach(() => {
+  cleanup();
+});
+
+class _ResizeObserverPolyfill {
+  observe(): void {}
+  unobserve(): void {}
+  disconnect(): void {}
+}
+
+if (!('ResizeObserver' in globalThis)) {
+  (globalThis as unknown as { ResizeObserver: typeof _ResizeObserverPolyfill }).ResizeObserver =
+    _ResizeObserverPolyfill;
+}
+
+if (!('matchMedia' in window)) {
+  Object.defineProperty(window, 'matchMedia', {
+    writable: true,
+    value: (query: string) => ({
+      matches: false,
+      media: query,
+      onchange: null,
+      addListener: () => {},
+      removeListener: () => {},
+      addEventListener: () => {},
+      removeEventListener: () => {},
+      dispatchEvent: () => false,
+    }),
+  });
+}
+
+if (!('scrollIntoView' in HTMLElement.prototype)) {
+  (HTMLElement.prototype as unknown as { scrollIntoView: () => void }).scrollIntoView =
+    function (): void {};
+}
diff --git a/src/test/smoke.test.ts b/src/test/smoke.test.ts
new file mode 100644
index 0000000..256daf9
--- /dev/null
+++ b/src/test/smoke.test.ts
@@ -0,0 +1,23 @@
+// Copyright (c) 2025 Patrick Motsch
+// All rights reserved.
+//
+// Smoke test that validates the Vitest + jsdom setup is wired correctly.
+// If this fails the rest of the suite is meaningless.
+
+import { describe, expect, it } from 'vitest';
+
+describe('vitest smoke', () => {
+  it('runs in jsdom and has window/document', () => {
+    expect(typeof window).toBe('object');
+    expect(typeof document).toBe('object');
+  });
+
+  it('has jest-dom matchers via globals setup', () => {
+    const div = document.createElement('div');
+    div.textContent = 'hello';
+    document.body.appendChild(div);
+    expect(div).toBeInTheDocument();
+    expect(div).toHaveTextContent('hello');
+    document.body.removeChild(div);
+  });
+});
diff --git a/tsconfig.app.json b/tsconfig.app.json
index ef9f469..70e8fff 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -28,5 +28,10 @@
     "src/**/*.tsx",    // Include all .tsx files
     "src/**/*.d.ts",   // Include all declaration files
     "src/global.d.ts"
+  ],
+  "exclude": [
+    "src/**/*.test.ts",
+    "src/**/*.test.tsx",
+    "src/test/**"
   ]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 1ffef60..01490aa 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
   "files": [],
   "references": [
     { "path": "./tsconfig.app.json" },
-    { "path": "./tsconfig.node.json" }
+    { "path": "./tsconfig.node.json" },
+    { "path": "./tsconfig.test.json" }
   ]
 }
diff --git a/tsconfig.test.json b/tsconfig.test.json
new file mode 100644
index 0000000..752ca23
--- /dev/null
+++ b/tsconfig.test.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.app.json",
+  "compilerOptions": {
+    "types": ["vitest/globals", "@testing-library/jest-dom", "node"],
+    "noEmit": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false
+  },
+  "include": [
+    "src/**/*.test.ts",
+    "src/**/*.test.tsx",
+    "src/test/**/*.ts",
+    "vitest.config.ts"
+  ]
+}
diff --git a/vitest.config.ts b/vitest.config.ts
new file mode 100644
index 0000000..22285b3
--- /dev/null
+++ b/vitest.config.ts
@@ -0,0 +1,26 @@
+// Copyright (c) 2025 Patrick Motsch
+// All rights reserved.
+//
+// Vitest config for frontend unit + component tests.
+// Lives next to vite.config.ts; reuses the @vitejs/plugin-react setup.
+
+import { defineConfig } from 'vitest/config';
+import react from '@vitejs/plugin-react';
+
+export default defineConfig({
+  plugins: [react()],
+  test: {
+    environment: 'jsdom',
+    globals: true,
+    setupFiles: ['./src/test/setup.ts'],
+    css: true,
+    include: ['src/**/*.test.{ts,tsx}'],
+    exclude: ['node_modules', 'dist', '.git'],
+    coverage: {
+      provider: 'v8',
+      reporter: ['text', 'html'],
+      include: ['src/**/*.{ts,tsx}'],
+      exclude: ['src/**/*.test.{ts,tsx}', 'src/test/**', 'src/main.tsx'],
+    },
+  },
+});

From c47dc67a8463843f23782cd89199ac8171d4bfcf Mon Sep 17 00:00:00 2001
From: ValueOn AG <p.motsch@valueon.ch>
Date: Sun, 26 Apr 2026 08:31:31 +0200
Subject: [PATCH 3/6] cleanup internal marked exports

---
 .../editor/Automation2FlowEditor.module.css   | 391 +++++++++++++-
 .../editor/Automation2FlowEditor.tsx          |  18 +-
 .../FlowEditor/editor/CanvasHeader.tsx        | 402 +++++++-------
 .../FlowEditor/editor/NodeConfigPanel.tsx     |  89 +++-
 .../FeatureInstancePicker.tsx                 | 158 ++++++
 .../nodes/frontendTypeRenderers/index.tsx     |   2 +
 .../FlowEditor/nodes/shared/DataPicker.tsx    |  58 +--
 .../nodes/shared/RequiredAttributePicker.tsx  |  90 +++-
 .../nodes/shared/paramValidation.test.ts      |  14 +
 .../nodes/shared/paramValidation.ts           |  10 +-
 .../FormGeneratorTable.module.css             |   6 -
 .../FormGeneratorTable/FormGeneratorTable.tsx | 291 ++++-------
 src/hooks/useMandates.ts                      |   5 +-
 src/pages/AutomationsDashboardPage.tsx        |  53 +-
 src/pages/admin/AdminUsersPage.tsx            |   3 +-
 src/pages/basedata/ConnectionsPage.tsx        |   5 +-
 src/pages/basedata/FilesPage.tsx              |   6 +-
 src/pages/basedata/PromptsPage.tsx            |   6 +-
 .../views/commcoach/CommcoachKeepAlive.tsx    |   6 +
 .../GraphicalEditorKeepAlive.test.tsx         |  96 ++++
 .../GraphicalEditorKeepAlive.tsx              |  22 +-
 .../GraphicalEditorTemplatesPage.tsx          |   3 +-
 .../trustee/TrusteePositionDocumentsView.tsx  |  38 +-
 .../trustee/dataTables/TrusteeDataTab.tsx     |   3 +-
 .../views/workspace/WorkspaceKeepAlive.tsx    |  13 +-
 tsc-out.txt                                   | 489 ------------------
 26 files changed, 1246 insertions(+), 1031 deletions(-)
 create mode 100644 src/components/FlowEditor/nodes/frontendTypeRenderers/FeatureInstancePicker.tsx
 create mode 100644 src/pages/views/graphicalEditor/GraphicalEditorKeepAlive.test.tsx
 delete mode 100644 tsc-out.txt

diff --git a/src/components/FlowEditor/editor/Automation2FlowEditor.module.css b/src/components/FlowEditor/editor/Automation2FlowEditor.module.css
index 5f1e938..67a4261 100644
--- a/src/components/FlowEditor/editor/Automation2FlowEditor.module.css
+++ b/src/components/FlowEditor/editor/Automation2FlowEditor.module.css
@@ -256,6 +256,225 @@
   background: var(--bg-primary, #fff);
 }
 
+/* Toolbar: context (load + name) is fluid with ellipsis; actions stay right-aligned. */
+.canvasHeaderRow {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto;
+  gap: 0.75rem;
+  align-items: center;
+  width: 100%;
+}
+
+@media (max-width: 900px) {
+  .canvasHeaderRow {
+    grid-template-columns: 1fr;
+  }
+}
+
+.canvasHeaderContext {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  min-width: 0;
+  flex: 1;
+}
+
+/* Closed <select> width must not follow the longest option label. */
+.canvasHeaderWorkflowSelect {
+  flex: 0 0 auto;
+  width: 12.5rem;
+  max-width: 100%;
+  padding: 0.4rem 0.5rem;
+  min-height: 2rem;
+  font-size: 0.85rem;
+  border: 1px solid var(--border-color, #ccc);
+  border-radius: 6px;
+  background: var(--bg-primary, #fff);
+  color: var(--text-primary, #333);
+}
+
+.canvasHeaderTitleBlock {
+  flex: 1 1 8rem;
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  gap: 0.25rem;
+}
+
+.canvasHeaderTitle,
+.canvasHeaderTitle input {
+  margin: 0;
+  min-width: 0;
+  font-size: 0.95rem;
+  font-weight: 600;
+  color: var(--text-primary, #1a1a1a);
+}
+
+.canvasHeaderTitle {
+  line-height: 1.2;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.canvasHeaderTitleMuted {
+  font-style: italic;
+  font-weight: 500;
+  opacity: 0.65;
+  color: var(--text-secondary, #666);
+}
+
+.canvasHeaderTitle input {
+  width: 100%;
+  max-width: 100%;
+  padding: 0.25rem 0.4rem;
+  border: 1px solid var(--primary-color, #007bff);
+  border-radius: 4px;
+  outline: none;
+  background: var(--bg-primary, #fff);
+  box-sizing: border-box;
+}
+
+.canvasHeaderActionPanel {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 0.4rem;
+  padding: 0.35rem 0.5rem;
+  border-radius: 8px;
+  border: 1px solid var(--border-color, #e0e0e0);
+  background: var(--bg-secondary, #f8f9fa);
+  flex: 0 1 auto;
+  max-width: 100%;
+}
+
+/* .retryButton sets margin-top for legacy error stacks — not wanted in the toolbar. */
+.canvasHeaderActionPanel button {
+  margin-top: 0;
+}
+
+/* Run label switches between "Ausführen", "Ausführen…", "Pflicht-Felder fehlen" — reserve space. */
+.canvasHeaderRunButton {
+  min-width: 12.5rem;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0.25rem;
+}
+
+@media (max-width: 900px) {
+  .canvasHeaderActionPanel {
+    justify-content: flex-start;
+  }
+}
+
+.canvasHeaderVersionRow {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 0.5rem;
+  margin-top: 0.5rem;
+  padding-top: 0.5rem;
+  border-top: 1px solid var(--border-color, #e8e8e8);
+  width: 100%;
+}
+
+.canvasHeaderVersionRow button {
+  margin-top: 0;
+}
+
+.canvasHeaderVersionLabel {
+  font-size: 0.8rem;
+  font-weight: 600;
+  color: var(--text-secondary, #666);
+  flex: 0 0 auto;
+}
+
+.canvasHeaderVersionSelect {
+  width: 11rem;
+  max-width: 100%;
+  padding: 0.3rem 0.45rem;
+  font-size: 0.85rem;
+  min-height: 1.9rem;
+  border: 1px solid var(--border-color, #ccc);
+  border-radius: 4px;
+  background: var(--bg-primary, #fff);
+  color: var(--text-primary, #333);
+}
+
+.canvasHeaderSysadmin {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.35rem;
+  font-size: 0.75rem;
+  color: var(--text-secondary, #666);
+  padding: 0.2rem 0.45rem;
+  border: 1px dashed var(--border-color, #ccc);
+  border-radius: 4px;
+  cursor: pointer;
+  user-select: none;
+  white-space: nowrap;
+  flex: 0 0 auto;
+}
+
+.canvasHeaderNewSplit {
+  position: relative;
+  display: inline-flex;
+  flex: 0 0 auto;
+}
+
+.canvasHeaderSplitPair {
+  display: flex;
+  flex: 0 0 auto;
+}
+
+.canvasHeaderNewSplitMain {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.canvasHeaderNewSplitMenu {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  padding-left: 0.25rem;
+  padding-right: 0.4rem;
+  border-left: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+.canvasHeaderMenuDropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 100;
+  background: var(--bg-primary, #fff);
+  border: 1px solid var(--border-color, #e0e0e0);
+  border-radius: 6px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12);
+  min-width: 11rem;
+  margin-top: 0.25rem;
+}
+
+.canvasHeaderMenuItem {
+  display: block;
+  width: 100%;
+  text-align: left;
+  padding: 0.5rem 0.75rem;
+  border: none;
+  background: transparent;
+  cursor: pointer;
+  font-size: 0.85rem;
+  color: var(--text-primary, #333);
+}
+
+.canvasHeaderMenuItem:hover {
+  background: var(--bg-hover, #e9ecef);
+}
+
+.canvasHeaderMenuItem + .canvasHeaderMenuItem {
+  border-top: 1px solid var(--border-color, #e0e0e0);
+}
+
 .canvasTitle {
   margin: 0;
   font-size: 0.875rem;
@@ -507,20 +726,32 @@
   cursor: copy;
 }
 
-/* Node Config Panel */
+/* Node Config Panel
+ * Fixed-width side panel. The `box-sizing: border-box` + `overflow-x: hidden`
+ * pair acts as a safety net so long unbreakable strings (type names like
+ * `List[ActionDocument]`, hashed IDs, refs like `← node.path → field`) can
+ * never push content out of the panel frame. Children rely on this; e.g.
+ * `RequiredAttributePicker` lays out label/badge so the badge wraps below
+ * a long label rather than escaping to the right.
+ */
 .nodeConfigPanel {
   padding: 1rem;
   background: var(--bg-primary, #fff);
   border-left: 1px solid var(--border-color, #e0e0e0);
   width: 280px;
   flex-shrink: 0;
+  box-sizing: border-box;
   overflow-y: auto;
+  overflow-x: hidden;
   min-width: 0;
+  overflow-wrap: anywhere;
+  word-break: break-word;
 }
 
 .nodeConfigPanel h4 {
   margin: 0 0 0.75rem 0;
   font-size: 0.9rem;
+  overflow-wrap: anywhere;
 }
 
 .nodeConfigNameRow {
@@ -547,6 +778,8 @@
   font-size: 0.75rem;
   color: var(--text-secondary, #666);
   line-height: 1.4;
+  overflow-wrap: anywhere;
+  word-break: break-word;
 }
 
 .nodeConfigPanel label {
@@ -572,7 +805,8 @@
   min-height: 60px;
 }
 
-/* Kein Primär-Button-Stil für Zeitplan-Karten / Wochentage / Monat-Jahr-Chips */
+/* Kein Primär-Button-Stil für Zeitplan-Karten / Wochentage / Monat-Jahr-Chips
+   (DataPicker-Dialog wird per createPortal an document.body gehangen — nicht hier). */
 .nodeConfigPanel
   button:not(.scheduleModeCard):not(.scheduleDayOn):not(.scheduleDayOff):not(.scheduleSubModeBtn) {
   margin-top: 0.5rem;
@@ -1284,53 +1518,112 @@
   min-width: 0;
 }
 
-/* Data Picker */
+/* Data Picker — rendered with createPortal(document.body) so it is not affected
+   by .nodeConfigPanel’s generic CTA `button` styles. */
+
 .dataPickerOverlay {
   position: fixed;
   inset: 0;
-  background: rgba(0, 0, 0, 0.35);
+  background: rgba(0, 0, 0, 0.4);
   display: flex;
   align-items: center;
   justify-content: center;
-  z-index: 1000;
+  z-index: 11000;
+  padding: 1rem;
+  box-sizing: border-box;
 }
 
 .dataPickerModal {
   background: var(--bg-primary, #fff);
-  border-radius: 8px;
-  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
-  max-width: 420px;
-  max-height: 80vh;
+  color: var(--text-primary, #1a1a1a);
+  border-radius: 10px;
+  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.12);
+  border: 1px solid var(--border-color, #e0e0e0);
+  max-width: min(420px, 100vw - 2rem);
+  width: 100%;
+  max-height: min(80vh, 640px);
   display: flex;
   flex-direction: column;
+  min-height: 0;
 }
 
 .dataPickerHeader {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   justify-content: space-between;
-  padding: 1rem 1.25rem;
+  gap: 0.75rem;
+  padding: 1rem 1.15rem;
   border-bottom: 1px solid var(--border-color, #e0e0e0);
+  flex-shrink: 0;
+}
+
+.dataPickerHeaderControls {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  flex-wrap: wrap;
+  justify-content: flex-end;
 }
 
 .dataPickerTitle {
   margin: 0;
   font-size: 1rem;
   font-weight: 600;
+  color: var(--text-primary, #1a1a1a);
+  line-height: 1.35;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 0.5rem 0.4rem;
+  min-width: 0;
+}
+
+.dataPickerTypeBadge {
+  display: inline-block;
+  font-size: 0.7rem;
+  font-weight: 400;
+  font-family: ui-monospace, 'Cascadia Code', monospace;
+  color: var(--text-secondary, #666);
+  background: var(--bg-secondary, #f0f0f0);
+  border: 1px solid var(--border-color, #ddd);
+  border-radius: 4px;
+  padding: 0.1rem 0.45rem;
+  line-height: 1.2;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.dataPickerStrictLabel {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.3rem;
+  font-size: 0.7rem;
+  color: var(--text-secondary, #666);
+  user-select: none;
 }
 
 .dataPickerClose {
-  background: none;
-  border: none;
-  font-size: 1.5rem;
-  cursor: pointer;
-  color: var(--text-secondary, #666);
-  padding: 0 0.25rem;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 2rem;
+  height: 2rem;
+  flex-shrink: 0;
+  background: var(--bg-secondary, #f5f5f5);
+  border: 1px solid var(--border-color, #d0d0d0);
+  border-radius: 6px;
+  font-size: 1.25rem;
   line-height: 1;
+  cursor: pointer;
+  color: var(--text-primary, #333);
 }
 
 .dataPickerClose:hover {
-  color: var(--text-primary, #333);
+  background: var(--bg-hover, #e9ecef);
+  color: var(--text-primary, #1a1a1a);
+  border-color: var(--border-color, #b8b8b8);
 }
 
 .dataPickerBody {
@@ -1345,24 +1638,35 @@
 }
 
 .dataPickerNodeSection {
-  margin-bottom: 0.75rem;
+  margin-bottom: 0.5rem;
 }
 
+/* Expandable source row: neutral “list row”, not a primary CTA. */
 .dataPickerNodeHeader {
   display: flex;
   align-items: center;
   width: 100%;
-  padding: 0.5rem 0;
-  background: none;
-  border: none;
+  box-sizing: border-box;
+  padding: 0.5rem 0.6rem;
+  background: var(--bg-secondary, #f4f5f7);
+  border: 1px solid var(--border-color, #dde1e5);
+  border-radius: 6px;
   cursor: pointer;
-  font-size: 0.875rem;
+  font-size: 0.85rem;
   text-align: left;
+  color: var(--text-primary, #1a1a1a);
+  margin: 0;
+  transition: background 0.12s, border-color 0.12s, box-shadow 0.12s;
 }
 
 .dataPickerNodeHeader:hover {
-  background: var(--bg-hover, #f5f5f5);
-  border-radius: 4px;
+  background: var(--bg-hover, #e9ebef);
+  border-color: var(--border-color, #c8cfd6);
+}
+
+.dataPickerNodeHeader:focus-visible {
+  outline: 2px solid var(--primary-color, #4a6fa5);
+  outline-offset: 1px;
 }
 
 .dataPickerExpandIcon {
@@ -1401,6 +1705,43 @@
   border-color: var(--primary-color, #007bff);
 }
 
+/* Hover safety net: every nested span in a leaf inherits the white text so
+ * type-hints and meta info stay readable on the blue hover background. */
+.dataPickerLeaf:hover * {
+  color: inherit;
+}
+
+/* Inline type-hint after a leaf label, e.g. "documents (List[ActionDocument])". */
+.dataPickerLeafType {
+  color: var(--text-secondary, #666);
+  font-size: 10px;
+  margin-left: 4px;
+}
+
+/* Schema-name hint on the node-section header row. */
+.dataPickerNodeSchemaHint {
+  color: var(--text-secondary, #666);
+  font-size: 10px;
+  margin-left: 4px;
+}
+
+/* "iterieren" affordance — visually distinct (subtle accent), readable on
+ * the picker's white background and on the leaf's blue hover background. */
+.dataPickerIterateBtn {
+  font-size: 10px;
+  padding: 2px 6px;
+  background: var(--bg-secondary, #f5f7fa);
+  color: var(--primary-color, #007bff);
+  border: 1px solid var(--border-color, #e0e0e0);
+  white-space: nowrap;
+}
+
+.dataPickerIterateBtn:hover {
+  background: var(--primary-color, #007bff);
+  color: #fff;
+  border-color: var(--primary-color, #007bff);
+}
+
 /* Dynamic Value Field */
 .dynamicValueField {
   display: flex;
diff --git a/src/components/FlowEditor/editor/Automation2FlowEditor.tsx b/src/components/FlowEditor/editor/Automation2FlowEditor.tsx
index 7cdf7d8..c5c7b85 100644
--- a/src/components/FlowEditor/editor/Automation2FlowEditor.tsx
+++ b/src/components/FlowEditor/editor/Automation2FlowEditor.tsx
@@ -58,6 +58,7 @@ import type { UdbContext, UdbTab } from '../../../components/UnifiedDataBar';
 import styles from './Automation2FlowEditor.module.css';
 
 import { useLanguage } from '../../../providers/language/LanguageContext';
+import { useToast } from '../../../contexts/ToastContext';
 
 const LOG = '[Automation2]';
 
@@ -90,6 +91,7 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
   onSourcesChanged,
 }) => {
   const { t } = useLanguage();
+  const { showError } = useToast();
   const { request } = useApiRequest();
   const { prompt: promptInput, PromptDialog } = usePrompt();
   const [nodeTypes, setNodeTypes] = useState<NodeType[]>([]);
@@ -137,6 +139,15 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
   const [sidebarWidth, setSidebarWidth] = useState(() => {
     try { const v = parseInt(localStorage.getItem('flowEditor.sidebarWidth') ?? ''); return v >= 200 && v <= 500 ? v : 280; } catch { return 280; }
   });
+  // Verbose schema toggle: shows the static type-reference block (input/output
+  // schema) and parameter type-badges in NodeConfigPanel. Only the
+  // CanvasHeader exposes the toggle (sysadmin-only); persisted to localStorage.
+  const [verboseSchema, setVerboseSchema] = useState(() => {
+    try { return localStorage.getItem('flowEditor.verboseSchema') === '1'; } catch { return false; }
+  });
+  useEffect(() => {
+    try { localStorage.setItem('flowEditor.verboseSchema', verboseSchema ? '1' : '0'); } catch { /* ignore */ }
+  }, [verboseSchema]);
   const resizingRef = useRef<{ target: 'left' | 'right'; startX: number; startW: number } | null>(null);
 
   useEffect(() => {
@@ -655,9 +666,11 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
       await updateWorkflow(request, instanceId, workflowId, { label: newName });
       setWorkflows((prev) => prev.map((w) => w.id === workflowId ? { ...w, label: newName } : w));
     } catch (e: unknown) {
+      const msg = e instanceof Error ? e.message : String(e);
       console.error(`${LOG} rename failed`, e);
+      showError(t('Workflow umbenennen fehlgeschlagen: {msg}', { msg }));
     }
-  }, [request, instanceId]);
+  }, [request, instanceId, showError, t]);
 
   const handleAutoLayout = useCallback(() => {
     setCanvasNodes((prev) => computeAutoLayout(prev, canvasConnections));
@@ -821,6 +834,8 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
           onNewFromTemplate={() => setTemplatePickerOpen(true)}
           onWorkflowRename={handleWorkflowRename}
           onAutoLayout={handleAutoLayout}
+          verboseSchema={verboseSchema}
+          onVerboseSchemaChange={setVerboseSchema}
         />
         <div className={styles.canvasArea} style={{ display: 'flex', flex: 1, minWidth: 0 }}>
           <div style={{ flex: 1, minWidth: 0 }}>
@@ -875,6 +890,7 @@ export const Automation2FlowEditor: React.FC<Automation2FlowEditorProps> = ({ in
                 onNodeUpdate={handleNodeUpdate}
                 instanceId={instanceId}
                 request={request}
+                verboseSchema={verboseSchema}
               />
             </Automation2DataFlowProvider>
           )}
diff --git a/src/components/FlowEditor/editor/CanvasHeader.tsx b/src/components/FlowEditor/editor/CanvasHeader.tsx
index d30430e..0d82bff 100644
--- a/src/components/FlowEditor/editor/CanvasHeader.tsx
+++ b/src/components/FlowEditor/editor/CanvasHeader.tsx
@@ -8,6 +8,7 @@ import type { Automation2Workflow, ExecuteGraphResponse, AutoVersion, AutoTempla
 import styles from './Automation2FlowEditor.module.css';
 
 import { useLanguage } from '../../../providers/language/LanguageContext';
+import { getUserDataCache } from '../../../utils/userCache';
 
 interface CanvasHeaderProps {
   workflows: Automation2Workflow[];
@@ -40,6 +41,10 @@ interface CanvasHeaderProps {
   onNewFromTemplate?: () => void;
   onWorkflowRename?: (workflowId: string, newName: string) => void;
   onAutoLayout?: () => void;
+  /** Sysadmin-only: when true, NodeConfigPanel renders the static
+   *  "Schema (Typ-Referenz)" block and per-parameter type-badges. */
+  verboseSchema?: boolean;
+  onVerboseSchemaChange?: (next: boolean) => void;
 }
 
 function _getStatusBadge(t: (key: string) => string): Record<string, { label: string; color: string }> {
@@ -77,8 +82,11 @@ export const CanvasHeader: React.FC<CanvasHeaderProps> = ({ workflows,
   onNewFromTemplate,
   onWorkflowRename,
   onAutoLayout,
+  verboseSchema,
+  onVerboseSchemaChange,
 }) => {
   const { t } = useLanguage();
+  const _isSysAdmin = getUserDataCache()?.isSysAdmin === true;
   const statusBadge = _getStatusBadge(t);
   const currentVersion = versions?.find((v) => v.id === currentVersionId);
   const currentStatus = currentVersion?.status || 'draft';
@@ -137,212 +145,244 @@ export const CanvasHeader: React.FC<CanvasHeaderProps> = ({ workflows,
     [t]
   );
 
+  const _titleHint =
+    onWorkflowRename && currentWorkflow
+      ? `${currentWorkflow.label} — ${t('Klicken zum Umbenennen')}`
+      : currentWorkflow?.label;
+
   return (
     <div className={styles.canvasHeader}>
-      <div style={{ display: 'flex', alignItems: 'center', gap: '0.75rem', flexWrap: 'wrap' }}>
-        {/* Workflow name: inline editable */}
-        {currentWorkflowId && currentWorkflow ? (
-          editingName ? (
-            <input
-              ref={nameInputRef}
-              value={nameValue}
-              onChange={(e) => setNameValue(e.target.value)}
-              onBlur={_commitNameEdit}
-              onKeyDown={(e) => { if (e.key === 'Enter') _commitNameEdit(); if (e.key === 'Escape') setEditingName(false); }}
-              style={{ padding: '0.25rem 0.4rem', fontSize: '0.95rem', fontWeight: 600, border: '1px solid var(--primary-color, #007bff)', borderRadius: 4, outline: 'none', minWidth: 140, maxWidth: 300 }}
-            />
-          ) : (
-            <h4
-              className={styles.canvasTitle}
-              style={{ margin: 0, cursor: onWorkflowRename ? 'pointer' : 'default', fontSize: '0.95rem', fontWeight: 600 }}
-              onClick={_startNameEdit}
-              title={onWorkflowRename ? t('Klicken zum Umbenennen') : undefined}
-            >
-              {currentWorkflow.label}
-            </h4>
-          )
-        ) : (
-          <h4 className={styles.canvasTitle} style={{ margin: 0, fontStyle: 'italic', opacity: 0.6 }}>
-            {t('Neuer Workflow')}
-          </h4>
-        )}
-        {onWorkflowSettings && (
-          <button
-            type="button"
-            className={styles.canvasGearBtn}
-            title={t('Workflowkonfiguration Einstieg/Starts')}
-            aria-label={t('Workflow-Konfiguration')}
-            onClick={onWorkflowSettings}
+      <div className={styles.canvasHeaderRow}>
+        <div className={styles.canvasHeaderContext}>
+          <select
+            className={styles.canvasHeaderWorkflowSelect}
+            value={currentWorkflowId ?? ''}
+            onChange={(e) => {
+              const id = e.target.value ? e.target.value : null;
+              onWorkflowSelect(id);
+            }}
+            aria-label={t('Workflow laden')}
+            title={t('Workflow laden')}
           >
-            <FaCog />
-          </button>
-        )}
-
-        {/* Split "Neu" button */}
-        <div ref={newMenuRef} style={{ position: 'relative', display: 'inline-block' }}>
-          <div style={{ display: 'flex' }}>
-            <button type="button" className={styles.retryButton} onClick={onNew} style={{ borderTopRightRadius: 0, borderBottomRightRadius: 0 }}>
-              {t('Neu')}
-            </button>
+            <option value="">{t('Workflow laden')}</option>
+            {workflows.map((w) => (
+              <option key={w.id} value={w.id}>
+                {w.label}
+              </option>
+            ))}
+          </select>
+          <div className={styles.canvasHeaderTitleBlock}>
+            {currentWorkflowId && currentWorkflow ? (
+              editingName ? (
+                <input
+                  ref={nameInputRef}
+                  className={styles.canvasHeaderTitle}
+                  value={nameValue}
+                  onChange={(e) => setNameValue(e.target.value)}
+                  onBlur={_commitNameEdit}
+                  onKeyDown={(e) => { if (e.key === 'Enter') _commitNameEdit(); if (e.key === 'Escape') setEditingName(false); }}
+                />
+              ) : (
+                <h4
+                  className={styles.canvasHeaderTitle}
+                  style={{ cursor: onWorkflowRename ? 'pointer' : 'default' }}
+                  onClick={_startNameEdit}
+                  title={_titleHint}
+                >
+                  {currentWorkflow.label}
+                </h4>
+              )
+            ) : (
+              <h4 className={`${styles.canvasHeaderTitle} ${styles.canvasHeaderTitleMuted}`}>
+                {t('Neuer Workflow')}
+              </h4>
+            )}
+          </div>
+          {onWorkflowSettings && (
             <button
               type="button"
-              className={styles.retryButton}
-              onClick={() => setNewMenuOpen((p) => !p)}
-              style={{ borderTopLeftRadius: 0, borderBottomLeftRadius: 0, paddingLeft: 4, paddingRight: 6, borderLeft: '1px solid rgba(0,0,0,0.15)' }}
-              title={t('Neu aus Vorlage')}
+              className={styles.canvasGearBtn}
+              title={t('Workflowkonfiguration Einstieg/Starts')}
+              aria-label={t('Workflow-Konfiguration')}
+              onClick={onWorkflowSettings}
             >
-              <FaCaretDown style={{ fontSize: '0.7rem' }} />
+              <FaCog />
             </button>
-          </div>
-          {newMenuOpen && (
-            <div style={{ position: 'absolute', top: '100%', left: 0, zIndex: 100, background: 'var(--bg-primary, #fff)', border: '1px solid var(--border-color, #e0e0e0)', borderRadius: 6, boxShadow: '0 4px 12px rgba(0,0,0,0.15)', minWidth: 180, marginTop: 4 }}>
-              <button
-                type="button"
-                onClick={() => { onNew(); setNewMenuOpen(false); }}
-                style={{ display: 'block', width: '100%', textAlign: 'left', padding: '8px 12px', border: 'none', background: 'transparent', cursor: 'pointer', fontSize: '0.85rem' }}
-              >
-                {t('Leerer Workflow')}
-              </button>
-              {onNewFromTemplate && (
-                <button
-                  type="button"
-                  onClick={() => { onNewFromTemplate(); setNewMenuOpen(false); }}
-                  style={{ display: 'block', width: '100%', textAlign: 'left', padding: '8px 12px', border: 'none', background: 'transparent', cursor: 'pointer', fontSize: '0.85rem', borderTop: '1px solid var(--border-color, #e0e0e0)' }}
-                >
-                  {t('Aus Vorlage…')}
-                </button>
-              )}
-            </div>
           )}
         </div>
 
-        <button
-          type="button"
-          className={styles.retryButton}
-          onClick={onSave}
-          // Phase-4 Schicht-4: Save niemals blockieren — work-in-progress muss
-          // jederzeit persistierbar sein. Nur während des Save-Requests selbst
-          // sperren wir den Button, um Doppelklicks zu verhindern.
-          disabled={saving}
-          title={!hasNodes ? t('Workflow ist leer — Speichern legt einen leeren Workflow an.') : undefined}
-        >
-          {saving ? <FaSpinner className={styles.spinner} /> : t('Speichern')}
-        </button>
-
-        {onAutoLayout && (
-          <button
-            type="button"
-            className={styles.retryButton}
-            onClick={onAutoLayout}
-            disabled={!hasNodes}
-            title={t('Knoten automatisch anordnen')}
-          >
-            <FaSitemap style={{ marginRight: '0.4rem' }} />
-            {t('Anordnen')}
-          </button>
-        )}
-
-        {/* Save as template */}
-        {currentWorkflowId && onSaveAsTemplate && (
-          <div ref={templateMenuRef} style={{ position: 'relative', display: 'inline-block' }}>
-            <button
-              type="button"
-              className={styles.retryButton}
-              onClick={() => setTemplateMenuOpen((p) => !p)}
-              disabled={templateSaving}
-              title={t('Als Vorlage speichern')}
-            >
-              {templateSaving ? <FaSpinner className={styles.spinner} /> : <><FaBookmark style={{ marginRight: 4 }} />{t('Als Vorlage')}</>}
-            </button>
-            {templateMenuOpen && (
-              <div style={{ position: 'absolute', top: '100%', left: 0, zIndex: 100, background: 'var(--bg-primary, #fff)', border: '1px solid var(--border-color, #e0e0e0)', borderRadius: 6, boxShadow: '0 4px 12px rgba(0,0,0,0.15)', minWidth: 180, marginTop: 4 }}>
-                {(['user', 'instance', 'mandate'] as const).map((s) => (
+        <div className={styles.canvasHeaderActionPanel} role="toolbar" aria-label={t('Workflow-Aktionen')}>
+          <div ref={newMenuRef} className={styles.canvasHeaderNewSplit}>
+            <div className={styles.canvasHeaderSplitPair}>
+              <button
+                type="button"
+                className={`${styles.retryButton} ${styles.canvasHeaderNewSplitMain}`}
+                onClick={onNew}
+              >
+                {t('Neu')}
+              </button>
+              <button
+                type="button"
+                className={`${styles.retryButton} ${styles.canvasHeaderNewSplitMenu}`}
+                onClick={() => setNewMenuOpen((p) => !p)}
+                title={t('Neu aus Vorlage')}
+                aria-haspopup="menu"
+                aria-expanded={newMenuOpen}
+              >
+                <FaCaretDown style={{ fontSize: '0.7rem' }} />
+              </button>
+            </div>
+            {newMenuOpen && (
+              <div className={styles.canvasHeaderMenuDropdown} role="menu">
+                <button
+                  type="button"
+                  className={styles.canvasHeaderMenuItem}
+                  onClick={() => { onNew(); setNewMenuOpen(false); }}
+                  role="menuitem"
+                >
+                  {t('Leerer Workflow')}
+                </button>
+                {onNewFromTemplate && (
                   <button
-                    key={s}
                     type="button"
-                    onClick={() => { onSaveAsTemplate(s); setTemplateMenuOpen(false); }}
-                    style={{ display: 'block', width: '100%', textAlign: 'left', padding: '8px 12px', border: 'none', background: 'transparent', cursor: 'pointer', fontSize: '0.85rem', borderTop: s !== 'user' ? '1px solid var(--border-color, #e0e0e0)' : undefined }}
+                    className={styles.canvasHeaderMenuItem}
+                    onClick={() => { onNewFromTemplate(); setNewMenuOpen(false); }}
+                    role="menuitem"
                   >
-                    {scopeLabels[s]}
+                    {t('Aus Vorlage…')}
                   </button>
-                ))}
+                )}
               </div>
             )}
           </div>
-        )}
-        <select
-          value={currentWorkflowId ?? ''}
-          onChange={(e) => {
-            const id = e.target.value ? e.target.value : null;
-            onWorkflowSelect(id);
-          }}
-          style={{ padding: '0.4rem', minWidth: 180 }}
-        >
-          <option value="">{t('Workflow laden')}</option>
-          {workflows.map((w) => (
-            <option key={w.id} value={w.id}>
-              {w.label}
-            </option>
-          ))}
-        </select>
-        <button
-          type="button"
-          className={styles.retryButton}
-          onClick={() => {
-            if (executeBlockedReason) {
-              onExecuteBlockedClick?.();
-              return;
-            }
-            onExecute();
-          }}
-          disabled={executing || !hasNodes}
-          aria-disabled={executing || !hasNodes || !!executeBlockedReason}
-          title={executeBlockedReason ?? undefined}
-          style={
-            executeBlockedReason
-              ? {
-                  background: 'rgba(220,53,69,0.10)',
-                  borderColor: 'var(--danger-color, #dc3545)',
-                  color: 'var(--danger-color, #dc3545)',
-                  cursor: 'help',
-                }
-              : undefined
-          }
-        >
-          {executing ? (
-            <>
-              <FaSpinner className={styles.spinner} style={{ marginRight: '0.5rem', display: 'inline-block' }} />
-              {t('Ausführen…')}
-            </>
-          ) : executeBlockedReason ? (
-            <>
-              <FaPlay style={{ marginRight: '0.5rem', opacity: 0.5 }} />
-              {t('Pflicht-Felder fehlen')}
-            </>
-          ) : (
-            <>
-              <FaPlay style={{ marginRight: '0.5rem' }} />
-              {t('Ausführen')}
-            </>
-          )}
-        </button>
-        {onToggleChat && (
-          <button type="button" className={styles.retryButton} onClick={onToggleChat} title={t('Workspace-Panel: Chats, Dateien, Quellen')}>
-            <FaDatabase style={{ marginRight: '0.4rem' }} />
-            {t('Workspace')}
+
+          <button
+            type="button"
+            className={styles.retryButton}
+            onClick={onSave}
+            disabled={saving}
+            title={!hasNodes ? t('Workflow ist leer — Speichern legt einen leeren Workflow an.') : undefined}
+          >
+            {saving ? <FaSpinner className={styles.spinner} /> : t('Speichern')}
           </button>
-        )}
+
+          {onAutoLayout && (
+            <button
+              type="button"
+              className={styles.retryButton}
+              onClick={onAutoLayout}
+              disabled={!hasNodes}
+              title={t('Knoten automatisch anordnen')}
+            >
+              <FaSitemap style={{ marginRight: '0.4rem' }} />
+              {t('Anordnen')}
+            </button>
+          )}
+
+          {currentWorkflowId && onSaveAsTemplate && (
+            <div ref={templateMenuRef} className={styles.canvasHeaderNewSplit}>
+              <button
+                type="button"
+                className={styles.retryButton}
+                onClick={() => setTemplateMenuOpen((p) => !p)}
+                disabled={templateSaving}
+                title={t('Als Vorlage speichern')}
+                aria-haspopup="menu"
+                aria-expanded={templateMenuOpen}
+              >
+                {templateSaving ? <FaSpinner className={styles.spinner} /> : <><FaBookmark style={{ marginRight: 4 }} />{t('Als Vorlage')}</>}
+              </button>
+              {templateMenuOpen && (
+                <div className={styles.canvasHeaderMenuDropdown} role="menu">
+                  {(['user', 'instance', 'mandate'] as const).map((s) => (
+                    <button
+                      key={s}
+                      type="button"
+                      className={styles.canvasHeaderMenuItem}
+                      onClick={() => { onSaveAsTemplate(s); setTemplateMenuOpen(false); }}
+                      role="menuitem"
+                    >
+                      {scopeLabels[s]}
+                    </button>
+                  ))}
+                </div>
+              )}
+            </div>
+          )}
+
+          <button
+            type="button"
+            className={`${styles.retryButton} ${styles.canvasHeaderRunButton}`}
+            onClick={() => {
+              if (executeBlockedReason) {
+                onExecuteBlockedClick?.();
+                return;
+              }
+              onExecute();
+            }}
+            disabled={executing || !hasNodes}
+            aria-disabled={executing || !hasNodes || !!executeBlockedReason}
+            title={executeBlockedReason ?? undefined}
+            style={
+              executeBlockedReason
+                ? {
+                    background: 'rgba(220,53,69,0.10)',
+                    borderColor: 'var(--danger-color, #dc3545)',
+                    color: 'var(--danger-color, #dc3545)',
+                    cursor: 'help',
+                  }
+                : undefined
+            }
+          >
+            {executing ? (
+              <>
+                <FaSpinner className={styles.spinner} style={{ flexShrink: 0 }} />
+                {t('Ausführen…')}
+              </>
+            ) : executeBlockedReason ? (
+              <>
+                <FaPlay style={{ opacity: 0.5, flexShrink: 0 }} />
+                {t('Pflicht-Felder fehlen')}
+              </>
+            ) : (
+              <>
+                <FaPlay style={{ flexShrink: 0 }} />
+                {t('Ausführen')}
+              </>
+            )}
+          </button>
+          {onToggleChat && (
+            <button type="button" className={styles.retryButton} onClick={onToggleChat} title={t('Workspace-Panel: Chats, Dateien, Quellen')}>
+              <FaDatabase style={{ marginRight: '0.4rem' }} />
+              {t('Workspace')}
+            </button>
+          )}
+          {_isSysAdmin && onVerboseSchemaChange && (
+            <label
+              className={styles.canvasHeaderSysadmin}
+              title={t('Sysadmin-Ansicht: zeigt im Node-Panel das statische Typ-Schema (Eingabe/Ausgabe) und Parameter-Typ-Badges.')}
+            >
+              <input
+                type="checkbox"
+                checked={!!verboseSchema}
+                onChange={(e) => onVerboseSchemaChange(e.target.checked)}
+                style={{ margin: 0 }}
+              />
+              {t('Schema-Details')}
+            </label>
+          )}
+        </div>
       </div>
 
-      {/* Version Selector */}
       {currentWorkflowId && versions && versions.length > 0 && (
-        <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', marginTop: '0.5rem', flexWrap: 'wrap' }}>
-          <span style={{ fontSize: '0.8rem', fontWeight: 600, color: 'var(--text-secondary, #666)' }}>{t('Version:')}</span>
+        <div className={styles.canvasHeaderVersionRow}>
+          <span className={styles.canvasHeaderVersionLabel}>{t('Version:')}</span>
           <select
+            className={styles.canvasHeaderVersionSelect}
             value={currentVersionId ?? ''}
             onChange={(e) => onVersionSelect?.(e.target.value || null)}
-            style={{ padding: '0.3rem', minWidth: 140, fontSize: '0.85rem' }}
             disabled={versionLoading}
+            aria-label={t('Version')}
           >
             <option value="">{t('Aktuelle')}</option>
             {versions.map((v) => (
diff --git a/src/components/FlowEditor/editor/NodeConfigPanel.tsx b/src/components/FlowEditor/editor/NodeConfigPanel.tsx
index 92c37cb..b9799f2 100644
--- a/src/components/FlowEditor/editor/NodeConfigPanel.tsx
+++ b/src/components/FlowEditor/editor/NodeConfigPanel.tsx
@@ -25,6 +25,9 @@ interface NodeConfigPanelProps {
   onNodeUpdate?: (nodeId: string, updates: Partial<Pick<CanvasNode, 'title' | 'comment'>>) => void;
   instanceId?: string;
   request?: ApiRequestFunction;
+  /** When true, render developer-oriented sections (Schema-Typ-Referenz,
+   *  parameter type-badges). Toggle in CanvasHeader, sysadmin-only. */
+  verboseSchema?: boolean;
 }
 
 export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
@@ -35,6 +38,7 @@ export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
   onNodeUpdate,
   instanceId,
   request,
+  verboseSchema = false,
 }) => {
   const { t } = useLanguage();
   const [params, setParams] = useState<Record<string, unknown>>({});
@@ -88,11 +92,28 @@ export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
   }, [nodeType?.parameters]);
 
   // Pre-compute which required params are unbound on this node so we can
-  // surface a panel-level summary banner.
+  // surface a panel-level summary banner. The hidden-param safety net lives
+  // inside `findRequiredErrors` so banner, canvas badges and Run-button stay
+  // in lockstep.
+  // Banner labels are kept short (`param.name`); the full description is
+  // attached as the tooltip below.
   const requiredErrors = useMemo(() => {
     if (!node || !nodeType) return [];
-    return findRequiredErrors(node, nodeType, (p) => getLabel(p.description, language) || p.name);
-  }, [node, nodeType, language]);
+    return findRequiredErrors(node, nodeType, (p) => p.name);
+  }, [node, nodeType]);
+
+  // Resolve full descriptions per missing param (for the banner tooltip).
+  const requiredErrorTooltip = useMemo(() => {
+    if (!requiredErrors.length || !nodeType) return '';
+    const byName = new Map((nodeType.parameters ?? []).map((p) => [p.name, p]));
+    return requiredErrors
+      .map((e) => {
+        const p = byName.get(e.paramName);
+        const desc = p ? (getLabel(p.description, language) || '') : '';
+        return desc ? `${e.paramName}: ${desc}` : e.paramName;
+      })
+      .join('\n');
+  }, [requiredErrors, nodeType, language]);
 
   if (!node || !nodeType) return null;
 
@@ -129,23 +150,23 @@ export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
           {getLabel(nodeType.description, language)}
         </p>
       )}
-      {hasPortInfo && (
+      {hasPortInfo && verboseSchema && (
         <details className={styles.nodeConfigPorts ?? ''} style={{ margin: '0 0 0.75rem', fontSize: '0.7rem' }}>
           <summary
             style={{
               cursor: 'pointer',
-              color: 'var(--text-secondary, #888)',
+              color: 'var(--text-secondary)',
               fontWeight: 500,
               padding: '0.15rem 0',
               fontStyle: 'italic',
             }}
             title={t('Statische Schema-Referenz f\u00fcr diesen Node-Typ \u2014 keine Live-Daten')}
           >
-            {t('Schema (Typ-Referenz)')}
+            {t('Schema (Typ-Referenz, Sysadmin-Ansicht)')}
           </summary>
           {inputPortEntries.length > 0 && (
             <div style={{ marginTop: '0.4rem' }}>
-              <div style={{ color: 'var(--text-secondary, #666)', fontWeight: 600, marginBottom: 2 }}>
+              <div style={{ color: 'var(--text-secondary)', fontWeight: 600, marginBottom: 2 }}>
                 {'\u2B07'} {t('Eingabe')}
               </div>
               {inputPortEntries.map(([idx, def]) => (
@@ -162,7 +183,7 @@ export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
           )}
           {outputPortEntries.length > 0 && (
             <div style={{ marginTop: '0.4rem' }}>
-              <div style={{ color: 'var(--text-secondary, #666)', fontWeight: 600, marginBottom: 2 }}>
+              <div style={{ color: 'var(--text-secondary)', fontWeight: 600, marginBottom: 2 }}>
                 {'\u2B06'} {t('Ausgabe')}
               </div>
               {outputPortEntries.map(([idx, def]) => (
@@ -189,13 +210,19 @@ export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
             borderRadius: 4,
             fontSize: 12,
             color: 'var(--danger-color, #dc3545)',
+            overflowWrap: 'anywhere',
+            wordBreak: 'break-word',
           }}
+          title={requiredErrorTooltip || undefined}
         >
           {t('Pflicht-Felder ohne Quelle:')}{' '}
           <strong>{requiredErrors.map((e) => e.paramLabel).join(', ')}</strong>
         </div>
       )}
       {parameters.map((param: NodeTypeParameter) => {
+        // Safety net: hidden params have no UI footprint at all — no row,
+        // no required-mark, no type-badge. Their value is system-set.
+        if (param.frontendType === 'hidden') return null;
         const useRequiredPicker = _shouldUseRequiredPicker(param);
         if (useRequiredPicker) {
           return (
@@ -212,26 +239,40 @@ export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
         const frontendType = param.frontendType || 'text';
         const Renderer = FRONTEND_TYPE_RENDERERS[frontendType] ?? FRONTEND_TYPE_RENDERERS.text;
         return (
-          <div key={param.name} style={{ marginBottom: 4 }}>
-            <div style={{ display: 'flex', alignItems: 'center', gap: 6, marginBottom: 2 }}>
+          <div key={param.name} style={{ marginBottom: 4, minWidth: 0, maxWidth: '100%' }}>
+            <div
+              style={{
+                display: 'flex',
+                alignItems: 'center',
+                gap: 6,
+                marginBottom: 2,
+                flexWrap: 'wrap',
+                minWidth: 0,
+              }}
+            >
               {param.required && (
                 <span
                   title={t('Pflichtfeld')}
-                  style={{ color: 'var(--danger-color, #dc3545)', fontWeight: 700 }}
+                  style={{ color: 'var(--danger-color, #dc3545)', fontWeight: 700, flexShrink: 0 }}
                 >
                   *
                 </span>
               )}
-              {param.type && (
+              {verboseSchema && param.type && (
                 <span
                   title={t('Parameter-Typ')}
                   style={{
                     fontSize: 10,
                     fontWeight: 600,
-                    color: '#555',
-                    background: '#eee',
+                    color: 'var(--text-secondary)',
+                    background: 'var(--bg-secondary)',
+                    border: '1px solid var(--border-color)',
                     borderRadius: 4,
                     padding: '1px 6px',
+                    maxWidth: '100%',
+                    overflow: 'hidden',
+                    textOverflow: 'ellipsis',
+                    whiteSpace: 'nowrap',
                   }}
                 >
                   {param.type}
@@ -261,6 +302,9 @@ export const NodeConfigPanel: React.FC<NodeConfigPanelProps> = ({ node,
 function _shouldUseRequiredPicker(param: NodeTypeParameter): boolean {
   if (!param.required) return false;
   if (!param.type) return false;
+  // Hidden params never get a picker — they are system-set or rendered to
+  // nothing on purpose. The render loop above also skips hidden rows entirely.
+  if (param.frontendType === 'hidden') return false;
   // Always defer to specialized FE renderers when explicitly chosen.
   if (param.frontendType && _LEGACY_RENDERERS_THAT_HANDLE_BINDINGS.has(param.frontendType)) {
     return false;
@@ -273,6 +317,7 @@ function _shouldUseRequiredPicker(param: NodeTypeParameter): boolean {
 
 const _LEGACY_RENDERERS_THAT_HANDLE_BINDINGS = new Set([
   'userConnection',
+  'featureInstance',
   'sharepointFolder',
   'sharepointFile',
   'clickupList',
@@ -308,7 +353,7 @@ const _PortFieldList: React.FC<_PortFieldListProps> = ({ portIndex, schemaNames,
   if (!schemaNames.length) return null;
   return (
     <div style={{ marginLeft: 4, marginBottom: 4 }}>
-      <div style={{ color: '#888', fontSize: '0.7rem' }}>
+      <div style={{ color: 'var(--text-secondary)', fontSize: '0.7rem' }}>
         {`#${portIndex} `}{schemaNames.join(' | ')}
       </div>
       {schemaNames.map((name) => {
@@ -316,14 +361,14 @@ const _PortFieldList: React.FC<_PortFieldListProps> = ({ portIndex, schemaNames,
         const fields = schema?.fields ?? [];
         if (name === 'Transit') {
           return (
-            <div key={name} style={{ marginLeft: 8, color: '#999', fontStyle: 'italic', fontSize: '0.7rem' }}>
+            <div key={name} style={{ marginLeft: 8, color: 'var(--text-tertiary)', fontStyle: 'italic', fontSize: '0.7rem' }}>
               {'\u00B7 Transit (durchgereichte Daten)'}
             </div>
           );
         }
         if (!fields.length) {
           return (
-            <div key={name} style={{ marginLeft: 8, color: '#bbb', fontSize: '0.7rem' }}>
+            <div key={name} style={{ marginLeft: 8, color: 'var(--text-tertiary)', fontSize: '0.7rem' }}>
               {`\u00B7 ${emptyLabel}`}
             </div>
           );
@@ -331,12 +376,12 @@ const _PortFieldList: React.FC<_PortFieldListProps> = ({ portIndex, schemaNames,
         return (
           <ul key={name} style={{ margin: '2px 0 4px 16px', padding: 0, listStyle: 'none' }}>
             {fields.map((f) => (
-              <li key={f.name} style={{ fontSize: '0.7rem', lineHeight: 1.4, color: '#555' }}>
-                <span style={{ fontFamily: 'monospace', color: '#222' }}>{f.name}</span>
-                <span style={{ color: '#999' }}>{`: ${f.type}`}</span>
-                {!f.required && <span style={{ color: '#bbb' }}>{' (optional)'}</span>}
+              <li key={f.name} style={{ fontSize: '0.7rem', lineHeight: 1.4, color: 'var(--text-secondary)' }}>
+                <span style={{ fontFamily: 'monospace', color: 'var(--text-primary)' }}>{f.name}</span>
+                <span style={{ color: 'var(--text-tertiary)' }}>{`: ${f.type}`}</span>
+                {!f.required && <span style={{ color: 'var(--text-tertiary)' }}>{' (optional)'}</span>}
                 {f.description && (
-                  <div style={{ color: '#888', marginLeft: 4 }}>
+                  <div style={{ color: 'var(--text-secondary)', marginLeft: 4 }}>
                     {getLabel(f.description, language)}
                   </div>
                 )}
diff --git a/src/components/FlowEditor/nodes/frontendTypeRenderers/FeatureInstancePicker.tsx b/src/components/FlowEditor/nodes/frontendTypeRenderers/FeatureInstancePicker.tsx
new file mode 100644
index 0000000..925e310
--- /dev/null
+++ b/src/components/FlowEditor/nodes/frontendTypeRenderers/FeatureInstancePicker.tsx
@@ -0,0 +1,158 @@
+/**
+ * FeatureInstancePicker — renderer for frontendType="featureInstance".
+ *
+ * Modeled on ConnectionPicker. Loads mandate-scoped FeatureInstances filtered
+ * by `frontendOptions.featureCode` (e.g. "trustee", "redmine") via
+ *   GET /api/workflows/{instanceId}/options/feature.instance?featureCode=<code>
+ *
+ * Behavior matches the rest of the editor:
+ *   - 0 results -> hint to create a feature instance for this mandate
+ *   - 1 result  -> auto-pick (no manual click required)
+ *   - N results -> <select>
+ *
+ * The bound value is a plain `<id>` string so backend adapters can keep
+ * using `featureInstanceId` lookups unchanged. Type stays
+ * `FeatureInstanceRef[<code>]` on the parameter so DataPicker / RequiredAttributePicker
+ * filter correctly.
+ */
+
+import React from 'react';
+import { useLanguage } from '../../../../providers/language/LanguageContext';
+import type { FieldRendererProps } from './index';
+
+type FeatureInstanceOption = { id: string; label: string };
+
+export const FeatureInstancePicker: React.FC<FieldRendererProps> = ({
+  param,
+  value,
+  onChange,
+  instanceId,
+  request,
+}) => {
+  const { t } = useLanguage();
+  const featureCode =
+    (param.frontendOptions?.featureCode as string | undefined) || undefined;
+  const [instances, setInstances] = React.useState<FeatureInstanceOption[]>([]);
+  const [loading, setLoading] = React.useState(false);
+  const [loadError, setLoadError] = React.useState<string | null>(null);
+  const autoSingleRef = React.useRef(false);
+
+  React.useEffect(() => {
+    if (!instanceId || !request || !featureCode) return;
+    setLoading(true);
+    setLoadError(null);
+    request({
+      url: `/api/workflows/${instanceId}/options/feature.instance?featureCode=${encodeURIComponent(featureCode)}`,
+      method: 'get',
+    })
+      .then((res: unknown) => {
+        const data = res as { options?: Array<{ value: string; label: string }> };
+        setInstances((data?.options || []).map((o) => ({ id: o.value, label: o.label })));
+      })
+      .catch((err: unknown) => {
+        console.error('FeatureInstancePicker: failed to load instances', err);
+        setInstances([]);
+        setLoadError(err instanceof Error ? err.message : String(err));
+      })
+      .finally(() => setLoading(false));
+  }, [instanceId, request, featureCode]);
+
+  React.useEffect(() => {
+    if (instances.length !== 1 || autoSingleRef.current) return;
+    if (value !== '' && value !== undefined && value !== null) return;
+    autoSingleRef.current = true;
+    onChange(instances[0].id);
+  }, [instances, value, onChange]);
+
+  const strVal = typeof value === 'string' ? value : '';
+  const codeLabel = featureCode ?? t('Feature');
+
+  return (
+    <div style={{ marginBottom: 8, minWidth: 0, maxWidth: '100%' }}>
+      <label
+        style={{
+          display: 'block',
+          fontSize: 12,
+          marginBottom: 2,
+          color: 'var(--text-primary)',
+          overflowWrap: 'anywhere',
+          wordBreak: 'break-word',
+        }}
+      >
+        {param.description || param.name}
+      </label>
+      {loading && (
+        <div style={{ fontSize: 11, color: 'var(--text-secondary)' }}>{t('Lade…')}</div>
+      )}
+      {!loading && instances.length === 0 && !loadError && (
+        <div
+          style={{
+            fontSize: 11,
+            color: 'var(--text-secondary)',
+            marginBottom: 4,
+            overflowWrap: 'anywhere',
+            wordBreak: 'break-word',
+          }}
+        >
+          {t('Keine {code}-Instanz im aktiven Mandanten — bitte in der Admin-Konsole anlegen.', { code: codeLabel })}
+        </div>
+      )}
+      {!loading && instances.length === 1 && (
+        <div
+          style={{
+            fontSize: 12,
+            marginBottom: 4,
+            color: 'var(--text-primary)',
+            background: 'var(--bg-secondary)',
+            border: '1px solid var(--border-color)',
+            borderRadius: 4,
+            padding: '4px 8px',
+            maxWidth: '100%',
+            overflowWrap: 'anywhere',
+            wordBreak: 'break-word',
+            lineHeight: 1.4,
+          }}
+          title={`${t('Einziger {code}-Mandant — automatisch gewählt.', { code: codeLabel })} — ${instances[0].label}`}
+        >
+          {instances[0].label}
+        </div>
+      )}
+      {!loading && instances.length > 1 && (
+        <select
+          value={strVal}
+          onChange={(e) => onChange(e.target.value)}
+          style={{
+            width: '100%',
+            maxWidth: '100%',
+            boxSizing: 'border-box',
+            padding: '4px 8px',
+            borderRadius: 4,
+            border: '1px solid var(--border-color)',
+            background: 'var(--bg-primary)',
+            color: 'var(--text-primary)',
+          }}
+        >
+          <option value="">{t('{code}-Mandant wählen', { code: codeLabel })}</option>
+          {instances.map((c) => (
+            <option key={c.id} value={c.id}>{c.label}</option>
+          ))}
+        </select>
+      )}
+      {loadError && (
+        <div
+          style={{
+            fontSize: 11,
+            color: 'var(--danger-color, #c00)',
+            marginTop: 2,
+            overflowWrap: 'anywhere',
+            wordBreak: 'break-word',
+          }}
+        >
+          {t('Mandanten-Liste konnte nicht geladen werden')}
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default FeatureInstancePicker;
diff --git a/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx b/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx
index a910ca6..fb33a03 100644
--- a/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx
+++ b/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx
@@ -31,6 +31,7 @@ import { toApiGraph } from '../shared/graphUtils';
 import { postUpstreamPaths } from '../../../../api/workflowApi';
 import type { CanvasNode } from '../../editor/FlowCanvas';
 import { DataRefRenderer } from './DataRefRenderer';
+import { FeatureInstancePicker } from './FeatureInstancePicker';
 
 const TextInput: React.FC<FieldRendererProps> = ({ param, value, onChange }) => (
   <div style={{ marginBottom: 8 }}>
@@ -755,6 +756,7 @@ export const FRONTEND_TYPE_RENDERERS: Record<string, FieldRendererComponent> = {
   hidden: HiddenInput,
   dataRef: DataRefRenderer,
   userConnection: ConnectionPicker,
+  featureInstance: FeatureInstancePicker,
   sharepointFolder: SharepointPathPicker,
   sharepointFile: SharepointPathPicker,
   clickupList: FolderPicker,
diff --git a/src/components/FlowEditor/nodes/shared/DataPicker.tsx b/src/components/FlowEditor/nodes/shared/DataPicker.tsx
index c1ea657..4edadc7 100644
--- a/src/components/FlowEditor/nodes/shared/DataPicker.tsx
+++ b/src/components/FlowEditor/nodes/shared/DataPicker.tsx
@@ -6,6 +6,7 @@
  */
 
 import React, { useMemo, useState } from 'react';
+import { createPortal } from 'react-dom';
 import { createRef, createSystemVar, type DataRef, type SystemVarRef, isCompatible } from './dataRef';
 import { useAutomation2DataFlow } from '../../context/Automation2DataFlowContext';
 import type { GraphDefinedSchemaRef, NodeType, PortSchema } from '../../../../api/workflowApi';
@@ -254,33 +255,35 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
     onClose();
   };
 
-  return (
-    <div className={styles.dataPickerOverlay} onClick={onClose}>
-      <div className={styles.dataPickerModal} onClick={(e) => e.stopPropagation()}>
+  const _dialog = (
+    <div
+      className={styles.dataPickerOverlay}
+      onClick={onClose}
+      onKeyDown={(e) => e.key === 'Escape' && onClose()}
+      role="presentation"
+    >
+      <div
+        className={styles.dataPickerModal}
+        onClick={(e) => e.stopPropagation()}
+        role="dialog"
+        aria-modal="true"
+        aria-labelledby="automation2DataPickerTitle"
+      >
         <div className={styles.dataPickerHeader}>
-          <h4 className={styles.dataPickerTitle}>
+          <h4 className={styles.dataPickerTitle} id="automation2DataPickerTitle">
             {t('Datenquelle wählen')}
             {expectedParamType && (
               <span
-                style={{
-                  marginLeft: 8,
-                  fontSize: 11,
-                  fontFamily: 'monospace',
-                  color: '#555',
-                  background: '#eee',
-                  borderRadius: 4,
-                  padding: '1px 6px',
-                  fontWeight: 400,
-                }}
+                className={styles.dataPickerTypeBadge}
                 title={t('Erwarteter Typ')}
               >
                 {expectedParamType}
               </span>
             )}
           </h4>
-          <div style={{ display: 'flex', alignItems: 'center', gap: 8 }}>
+          <div className={styles.dataPickerHeaderControls}>
             {expectedParamType && (
-              <label style={{ fontSize: 11, color: '#666', display: 'flex', alignItems: 'center', gap: 4 }}>
+              <label className={styles.dataPickerStrictLabel}>
                 <input
                   type="checkbox"
                   checked={strictFilter}
@@ -315,7 +318,7 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
                       ];
                   return (
                     <div key={loopId} style={{ marginBottom: 6 }}>
-                      <div style={{ fontSize: 11, color: '#666', marginBottom: 2 }}>{loopLabel}</div>
+                      <div style={{ fontSize: 11, color: 'var(--text-secondary)', marginBottom: 2 }}>{loopLabel}</div>
                       {loopPaths.map((p, i) => {
                         const compat = expectedParamType && p.type
                           ? isCompatible(p.type, expectedParamType)
@@ -330,7 +333,7 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
                           >
                             {p.label}
                             {p.type && (
-                              <span style={{ color: '#888', fontSize: 10, marginLeft: 4 }}>
+                              <span className={styles.dataPickerLeafType}>
                                 ({p.type})
                               </span>
                             )}
@@ -364,7 +367,7 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
                       onClick={() => handlePickSystemVar(key)}
                       title={info.description}
                     >
-                      {key} <span style={{ color: '#888', fontSize: 10 }}>({info.type})</span>
+                      {key} <span className={styles.dataPickerLeafType}>({info.type})</span>
                     </button>
                   ))}
                 </div>
@@ -418,7 +421,7 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
                     <span className={styles.dataPickerExpandIcon}>{isExpanded ? '▼' : '▶'}</span>
                     <span className={styles.dataPickerNodeLabel}>{label}</span>
                     {resolvedSchema && (
-                      <span style={{ color: '#888', fontSize: 10, marginLeft: 4 }}>
+                      <span className={styles.dataPickerNodeSchemaHint}>
                         ({resolvedSchema.name})
                       </span>
                     )}
@@ -426,7 +429,7 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
                   {isExpanded && (
                     <div className={styles.dataPickerTree}>
                       {paths.length === 0 && (
-                        <div style={{ fontSize: 11, color: '#999', padding: '4px 8px' }}>
+                        <div style={{ fontSize: 11, color: 'var(--text-secondary)', padding: '4px 8px' }}>
                           {t('(keine kompatiblen Felder — Filter „Nur kompatible“ deaktivieren)')}
                         </div>
                       )}
@@ -446,7 +449,7 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
                             >
                               {p.label}
                               {p.type && (
-                                <span style={{ color: '#888', fontSize: 10, marginLeft: 4 }}>
+                                <span className={styles.dataPickerLeafType}>
                                   ({p.type})
                                 </span>
                               )}
@@ -454,15 +457,8 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
                             {p.iterable && (
                               <button
                                 type="button"
-                                className={styles.dataPickerLeaf}
+                                className={`${styles.dataPickerLeaf} ${styles.dataPickerIterateBtn}`}
                                 onClick={() => handlePickIterate(nodeId, p.path, expectedParamType)}
-                                style={{
-                                  fontSize: 10,
-                                  padding: '2px 6px',
-                                  background: 'rgba(0,123,255,0.10)',
-                                  color: 'var(--primary-color, #007bff)',
-                                  whiteSpace: 'nowrap',
-                                }}
                                 title={t('Pro Element der Liste iterieren (Loop)')}
                               >
                                 {t('iterieren')}
@@ -481,4 +477,6 @@ export const DataPicker: React.FC<DataPickerProps> = ({ open,
       </div>
     </div>
   );
+
+  return createPortal(_dialog, document.body);
 };
diff --git a/src/components/FlowEditor/nodes/shared/RequiredAttributePicker.tsx b/src/components/FlowEditor/nodes/shared/RequiredAttributePicker.tsx
index 81236c4..13d84c4 100644
--- a/src/components/FlowEditor/nodes/shared/RequiredAttributePicker.tsx
+++ b/src/components/FlowEditor/nodes/shared/RequiredAttributePicker.tsx
@@ -91,9 +91,30 @@ export const RequiredAttributePicker: React.FC<RequiredAttributePickerProps> = (
   };
 
   return (
-    <div className={styles.requiredAttributePicker} style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
-      <div style={{ display: 'flex', alignItems: 'center', gap: 8, flexWrap: 'wrap' }}>
-        <label style={{ fontSize: 12, fontWeight: 600 }}>
+    <div
+      className={styles.requiredAttributePicker}
+      style={{
+        display: 'flex',
+        flexDirection: 'column',
+        gap: 4,
+        minWidth: 0,
+        maxWidth: '100%',
+      }}
+    >
+      {/* Header: label always takes the full row (flex-basis 100 %), badge
+          wraps below — prevents long type names like List[ActionDocument]
+          from escaping the panel frame on the right. */}
+      <div style={{ display: 'flex', alignItems: 'baseline', gap: 6, flexWrap: 'wrap' }}>
+        <label
+          style={{
+            fontSize: 12,
+            fontWeight: 600,
+            flex: '1 1 100%',
+            minWidth: 0,
+            overflowWrap: 'anywhere',
+            wordBreak: 'break-word',
+          }}
+        >
           {label}
           <span style={{ color: 'var(--danger-color, #dc3545)', marginLeft: 2 }}>*</span>
         </label>
@@ -103,10 +124,15 @@ export const RequiredAttributePicker: React.FC<RequiredAttributePickerProps> = (
             style={{
               fontSize: 10,
               fontFamily: 'monospace',
-              color: '#555',
-              background: '#eee',
+              color: 'var(--text-secondary, #555)',
+              background: 'var(--bg-secondary, #eee)',
+              border: '1px solid var(--border-color, #e0e0e0)',
               borderRadius: 4,
               padding: '1px 6px',
+              maxWidth: '100%',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              whiteSpace: 'nowrap',
             }}
           >
             {expectedType}
@@ -115,8 +141,9 @@ export const RequiredAttributePicker: React.FC<RequiredAttributePickerProps> = (
       </div>
 
       {isBoundRef ? (
-        <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
+        <div style={{ display: 'flex', alignItems: 'center', gap: 6, flexWrap: 'wrap', minWidth: 0 }}>
           <span
+            title={typeof boundLabel === 'string' ? boundLabel : undefined}
             style={{
               padding: '2px 8px',
               borderRadius: 12,
@@ -124,6 +151,10 @@ export const RequiredAttributePicker: React.FC<RequiredAttributePickerProps> = (
               color: 'var(--success-color, #28a745)',
               fontSize: 12,
               fontWeight: 500,
+              maxWidth: '100%',
+              overflowWrap: 'anywhere',
+              wordBreak: 'break-word',
+              lineHeight: 1.4,
             }}
           >
             {boundLabel}
@@ -132,7 +163,7 @@ export const RequiredAttributePicker: React.FC<RequiredAttributePickerProps> = (
             type="button"
             className={styles.retryButton}
             onClick={() => setPickerOpen(true)}
-            style={{ fontSize: 11, padding: '2px 8px' }}
+            style={{ fontSize: 11, padding: '2px 8px', flexShrink: 0 }}
           >
             {t('Andere wählen…')}
           </button>
@@ -140,7 +171,7 @@ export const RequiredAttributePicker: React.FC<RequiredAttributePickerProps> = (
             type="button"
             className={styles.retryButton}
             onClick={() => onChange(null)}
-            style={{ fontSize: 11, padding: '2px 8px' }}
+            style={{ fontSize: 11, padding: '2px 8px', flexShrink: 0 }}
             title={t('Bindung entfernen')}
           >
             ×
@@ -150,29 +181,41 @@ export const RequiredAttributePicker: React.FC<RequiredAttributePickerProps> = (
         <div
           style={{
             display: 'flex',
-            alignItems: 'center',
+            alignItems: 'flex-start',
             gap: 6,
             padding: '4px 8px',
             background: 'rgba(220,53,69,0.12)',
             color: 'var(--danger-color, #dc3545)',
             borderRadius: 6,
             fontSize: 12,
+            minWidth: 0,
+            overflowWrap: 'anywhere',
+            wordBreak: 'break-word',
           }}
         >
-          <span aria-hidden="true">⚠</span>
-          <span>
+          <span aria-hidden="true" style={{ flexShrink: 0 }}>⚠</span>
+          <span style={{ minWidth: 0 }}>
             {t('Keine typkompatible Quelle vorhanden — füge zuerst einen Knoten ein, der ')}
-            <code style={{ fontFamily: 'monospace' }}>{expectedType ?? '?'}</code>
+            <code style={{ fontFamily: 'monospace', overflowWrap: 'anywhere' }}>{expectedType ?? '?'}</code>
             {t(' liefert.')}
           </span>
         </div>
       ) : single ? (
-        <div style={{ display: 'flex', alignItems: 'center', gap: 6, flexWrap: 'wrap' }}>
+        <div style={{ display: 'flex', alignItems: 'center', gap: 6, flexWrap: 'wrap', minWidth: 0 }}>
           <button
             type="button"
             className={styles.retryButton}
             onClick={handleAutoBind}
-            style={{ fontSize: 11, padding: '3px 10px' }}
+            style={{
+              fontSize: 11,
+              padding: '3px 10px',
+              maxWidth: '100%',
+              whiteSpace: 'normal',
+              textAlign: 'left',
+              overflowWrap: 'anywhere',
+              wordBreak: 'break-word',
+              lineHeight: 1.4,
+            }}
             title={t('Einzige passende Quelle übernehmen')}
           >
             {t('Vorschlag übernehmen:')}{' '}
@@ -186,25 +229,36 @@ export const RequiredAttributePicker: React.FC<RequiredAttributePickerProps> = (
             type="button"
             className={styles.retryButton}
             onClick={() => setPickerOpen(true)}
-            style={{ fontSize: 11, padding: '3px 10px' }}
+            style={{ fontSize: 11, padding: '3px 10px', flexShrink: 0 }}
           >
             {t('Andere…')}
           </button>
         </div>
       ) : (
-        <div style={{ display: 'flex', alignItems: 'center', gap: 6 }}>
+        <div style={{ display: 'flex', alignItems: 'center', gap: 6, flexWrap: 'wrap', minWidth: 0 }}>
           <button
             type="button"
             className={styles.retryButton}
             onClick={() => setPickerOpen(true)}
-            style={{ fontSize: 11, padding: '3px 10px' }}
+            style={{ fontSize: 11, padding: '3px 10px', maxWidth: '100%' }}
           >
             {t('Quelle wählen…')} <span style={{ opacity: 0.6 }}>({candidateCount})</span>
           </button>
         </div>
       )}
 
-      {description && <div style={{ fontSize: 11, color: '#888' }}>{description}</div>}
+      {description && (
+        <div
+          style={{
+            fontSize: 11,
+            color: 'var(--text-tertiary, #888)',
+            overflowWrap: 'anywhere',
+            wordBreak: 'break-word',
+          }}
+        >
+          {description}
+        </div>
+      )}
 
       {pickerOpen && (
         <DataPicker
diff --git a/src/components/FlowEditor/nodes/shared/paramValidation.test.ts b/src/components/FlowEditor/nodes/shared/paramValidation.test.ts
index 86a7235..abdca6d 100644
--- a/src/components/FlowEditor/nodes/shared/paramValidation.test.ts
+++ b/src/components/FlowEditor/nodes/shared/paramValidation.test.ts
@@ -174,6 +174,20 @@ describe('findRequiredErrors', () => {
     const node = _makeNode('n1', 'ghost.node');
     expect(findRequiredErrors(node, undefined)).toEqual([]);
   });
+
+  it('skips required params with frontendType="hidden" (UI safety net)', () => {
+    // Hidden params have no UI surface, so reporting them as
+    // "Pflichtfeld ohne Quelle" would create a phantom error the user can
+    // not resolve. They are auto-set by adapters / system defaults.
+    const node = _makeNode('n1', 'trustee.extractFromFiles', {});
+    const nodeType = _makeNodeType('trustee.extractFromFiles', 'AiResult', [
+      { name: 'prompt', type: 'str', required: true },
+      { name: 'systemContext', type: 'str', required: true, frontendType: 'hidden' },
+    ]);
+    const errs = findRequiredErrors(node, nodeType);
+    expect(errs).toHaveLength(1);
+    expect(errs[0]!.paramName).toBe('prompt');
+  });
 });
 
 describe('findGraphErrors', () => {
diff --git a/src/components/FlowEditor/nodes/shared/paramValidation.ts b/src/components/FlowEditor/nodes/shared/paramValidation.ts
index 8b8c2d6..14d70af 100644
--- a/src/components/FlowEditor/nodes/shared/paramValidation.ts
+++ b/src/components/FlowEditor/nodes/shared/paramValidation.ts
@@ -64,7 +64,14 @@ export interface RequiredParamError {
   paramType?: string;
 }
 
-/** Walk a node's parameter spec + values and flag every required-but-unbound. */
+/** Walk a node's parameter spec + values and flag every required-but-unbound.
+ *
+ * Safety net: params with `frontendType: 'hidden'` are excluded — they have
+ * no UI surface (the panel skips them entirely), so reporting them as
+ * "Pflichtfeld ohne Quelle" would create a phantom error the user cannot
+ * resolve. Hidden-required params should be auto-set by the adapter or
+ * caught in tests, never surfaced to end users.
+ */
 export function findRequiredErrors(
   node: CanvasNode,
   nodeType: NodeType | undefined,
@@ -75,6 +82,7 @@ export function findRequiredErrors(
   const values = node.parameters ?? {};
   for (const param of nodeType.parameters ?? []) {
     if (!param.required) continue;
+    if (param.frontendType === 'hidden') continue;
     if (isParamBound(values[param.name])) continue;
     errors.push({ paramName: param.name, paramLabel: resolveLabel(param), paramType: param.type });
   }
diff --git a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.module.css b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.module.css
index 991fa8d..bfb9c1f 100644
--- a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.module.css
+++ b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.module.css
@@ -338,12 +338,6 @@
   overflow: visible;
 }
 
-.fkLoading {
-  color: var(--color-text);
-  opacity: 0.6;
-  font-style: italic;
-}
-
 /* Rows */
 .tr {
   transition: background-color 0.12s ease;
diff --git a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
index 49f8e58..38efc96 100644
--- a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
+++ b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
@@ -76,8 +76,11 @@ import type { AttributeType } from '../../../utils/attributeTypeMapper';
 import { FaFilter } from 'react-icons/fa';
 import api from '../../../api';
 
-// FK Cache type: maps fkSource -> { id -> displayLabel }
-type FkCacheType = Record<string, Record<string, string>>;
+/** A filter value can be a plain string, null (for empty/missing), or a
+ *  {value, label} object returned by FK-aware filter-values endpoints. */
+type FilterValue = string | null | { value: string | null; label: string };
+
+const _EMPTY_FILTER_SENTINEL = '__EMPTY__';
 
 /**
  * Stringify any cell value for display.
@@ -111,8 +114,10 @@ export interface ColumnConfig {
   filterOptions?: string[]; // For enum/select filters
   filterLabelResolver?: (value: string) => string; // Map filter value to display label in dropdown
   cellClassName?: (value: any, row: any) => string; // For custom cell styling
-  fkSource?: string; // API endpoint for FK resolution (e.g., "/api/users/")
-  fkDisplayField?: string; // Which field of FK target to display (e.g., "username", "name", "roleLabel")
+
+  /** Backend-enriched label column, e.g. `mandateId` → `mandateIdLabel` (set by `attributeUtils` / API). */
+  displayField?: string;
+
   // Backend-provided render hints (gateway/.../attributeUtils.py).
   // Excel-style format string applied by ``applyFrontendFormat`` to numeric/int
   // values, e.g. "R:#'###.00", "M:b" (bytes), "L:0.000". Empty = default rendering.
@@ -211,9 +216,29 @@ export interface FormGeneratorTableProps<T = any> {
 
 const _FILTER_PAGE_SIZE = 100;
 
+/** Normalize a FilterValue to {value, label}. */
+function _normalizeFilterValue(
+  fv: FilterValue,
+  resolveLabel?: (value: string) => string,
+): { value: string | null; label: string } {
+  if (fv === null) {
+    return { value: null, label: '(Leer)' };
+  }
+  if (typeof fv === 'object' && 'value' in fv && 'label' in fv) {
+    return fv as { value: string | null; label: string };
+  }
+  const str = String(fv);
+  return { value: str, label: resolveLabel ? resolveLabel(str) : str };
+}
+
 /**
  * Renders a scrollable list of filter values with IntersectionObserver-based lazy loading.
  * Shows _FILTER_PAGE_SIZE items initially, loads more as the user scrolls.
+ *
+ * Supports three value formats:
+ *  - `string` — plain value (legacy)
+ *  - `null` — empty/NULL sentinel (rendered as "(Leer)")
+ *  - `{value, label}` — backend-resolved FK with display label
  */
 function FilterValuesList({
   columnKey,
@@ -223,7 +248,7 @@ function FilterValuesList({
   resolveLabel,
 }: {
   columnKey: string;
-  allValues: string[];
+  allValues: FilterValue[];
   activeFilter: any;
   onSelect: (value: string) => void;
   resolveLabel?: (value: string) => string;
@@ -242,14 +267,19 @@ function FilterValuesList({
     searchInputRef.current?.focus();
   }, [columnKey]);
 
+  // Normalize all values to {value, label} pairs, filtering out nulls
+  // (null entries are handled separately as the "(Leer)" option)
+  const normalizedValues = useMemo(() => {
+    return allValues
+      .filter(fv => fv !== null)
+      .map(fv => _normalizeFilterValue(fv, resolveLabel));
+  }, [allValues, resolveLabel]);
+
   const filteredValues = useMemo(() => {
-    if (!searchTerm.trim()) return allValues;
+    if (!searchTerm.trim()) return normalizedValues;
     const term = searchTerm.toLowerCase();
-    return allValues.filter(value => {
-      const label = resolveLabel ? resolveLabel(value) : value;
-      return label.toLowerCase().includes(term);
-    });
-  }, [allValues, searchTerm, resolveLabel]);
+    return normalizedValues.filter(nv => nv.label.toLowerCase().includes(term));
+  }, [normalizedValues, searchTerm]);
 
   useEffect(() => {
     const sentinel = sentinelRef.current;
@@ -293,16 +323,16 @@ function FilterValuesList({
           />
         </div>
       )}
-      {visibleValues.map(value => {
-        const label = resolveLabel ? resolveLabel(value) : value;
+      {visibleValues.map(nv => {
+        const selectValue = nv.value === null ? _EMPTY_FILTER_SENTINEL : nv.value;
         return (
           <div
-            key={value}
-            className={`${styles.filterOption} ${activeFilter === value ? styles.filterOptionSelected : ''}`}
-            onClick={() => onSelect(value)}
-            title={label}
+            key={nv.value ?? '__null__'}
+            className={`${styles.filterOption} ${activeFilter === nv.value ? styles.filterOptionSelected : ''}`}
+            onClick={() => onSelect(selectValue)}
+            title={nv.label}
           >
-            {label.length > 30 ? label.substring(0, 30) + '...' : label}
+            {nv.label.length > 30 ? nv.label.substring(0, 30) + '...' : nv.label}
           </div>
         );
       })}
@@ -519,11 +549,6 @@ export function FormGeneratorTable<T extends Record<string, any>>({
   const [expandedGroups, setExpandedGroups] = useState<Set<string>>(() => new Set());
   const [groupsInitialized, setGroupsInitialized] = useState(false);
   
-  // FK Resolution: Cache for resolved FK values (fkSource -> { id -> displayLabel })
-  const [fkCache, setFkCache] = useState<FkCacheType>({});
-  const [fkLoading, setFkLoading] = useState<Record<string, boolean>>({});
-  const fkLoadedSourcesRef = useRef<Set<string>>(new Set());
-  
   // Generate a storage key based on column names for localStorage persistence
   const storageKey = useMemo(() => {
     if (detectedColumns.length === 0) return null;
@@ -586,7 +611,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
     // Note: Date/timestamp filters are disabled in column config, so they won't appear here
     const activeFilters: Record<string, any> = {};
     Object.entries(filters).forEach(([key, value]) => {
-      if (value !== undefined && value !== '') {
+      if (value !== undefined) {
         activeFilters[key] = value;
       }
     });
@@ -739,133 +764,6 @@ export function FormGeneratorTable<T extends Record<string, any>>({
     }
   }).current;
 
-  const convertToDisplayString = useCallback((fieldValue: any, _language: string): string => {
-    if (fieldValue === null || fieldValue === undefined) {
-      return '-';
-    }
-    
-    // Boolean → language-neutral symbols (✓/✗)
-    if (typeof fieldValue === 'boolean') {
-      return fieldValue ? '✓' : '✗';
-    }
-    
-    // Number → String
-    if (typeof fieldValue === 'number') {
-      return String(fieldValue);
-    }
-    
-    // String → direct
-    if (typeof fieldValue === 'string') {
-      return fieldValue;
-    }
-    
-    if (typeof fieldValue === 'object' && fieldValue !== null) {
-      return _objectToDisplayString(fieldValue as Record<string, unknown>);
-    }
-    
-    // Fallback
-    return String(fieldValue);
-  }, []);
-
-  // FK Resolution: Load FK data in bulk for columns with fkSource
-  useEffect(() => {
-    if (data.length === 0 || detectedColumns.length === 0) return;
-
-    // Find columns with fkSource that haven't been loaded yet
-    const fkColumns = detectedColumns.filter(col => 
-      col.fkSource && !fkLoadedSourcesRef.current.has(col.fkSource)
-    );
-
-    if (fkColumns.length === 0) return;
-
-    // For each FK column, collect unique IDs from data and fetch them
-    const loadFkData = async () => {
-      for (const column of fkColumns) {
-        const fkSource = column.fkSource!;
-        const displayField = column.fkDisplayField; // Explicit field from Pydantic model
-        
-        // Skip if already loading
-        if (fkLoading[fkSource]) continue;
-
-        // Collect unique IDs from data for this column
-        const uniqueIds = new Set<string>();
-        data.forEach(row => {
-          const value = row[column.key];
-          if (value && typeof value === 'string' && value.length > 0) {
-            uniqueIds.add(value);
-          }
-        });
-
-        if (uniqueIds.size === 0) {
-          fkLoadedSourcesRef.current.add(fkSource);
-          continue;
-        }
-
-        // Mark as loading
-        setFkLoading(prev => ({ ...prev, [fkSource]: true }));
-
-        try {
-          // Fetch all items from the FK source endpoint
-          const response = await api.get(fkSource);
-          
-          // Build cache: id -> display label
-          const cacheForSource: Record<string, string> = {};
-          const items = Array.isArray(response.data) ? response.data : response.data?.items || [];
-          
-          items.forEach((item: any) => {
-            if (!item || !item.id) return;
-            
-            let displayLabel = item.id; // Fallback to ID
-            
-            // Use the EXPLICIT display field from Pydantic model (fkDisplayField)
-            if (displayField && item[displayField] != null && item[displayField] !== '') {
-              displayLabel = convertToDisplayString(item[displayField], currentLanguage);
-            } else {
-              // Fallback: if no displayField specified, try common fields
-              // This should rarely happen if models are properly configured
-              const fallbackFields = ['name', 'label', 'username', 'roleLabel', 'title'];
-              for (const field of fallbackFields) {
-                if (item[field] !== undefined) {
-                  displayLabel = convertToDisplayString(item[field], currentLanguage);
-                  break;
-                }
-              }
-            }
-            
-            cacheForSource[item.id] = displayLabel;
-          });
-
-          // Update cache
-          setFkCache(prev => ({
-            ...prev,
-            [fkSource]: { ...(prev[fkSource] || {}), ...cacheForSource }
-          }));
-
-          // Mark as loaded
-          fkLoadedSourcesRef.current.add(fkSource);
-        } catch (error) {
-          console.error(`Failed to load FK data from ${fkSource}:`, error);
-          // Mark as loaded to prevent infinite retries
-          fkLoadedSourcesRef.current.add(fkSource);
-        } finally {
-          setFkLoading(prev => ({ ...prev, [fkSource]: false }));
-        }
-      }
-    };
-
-    loadFkData();
-  }, [data, detectedColumns, currentLanguage, fkLoading, convertToDisplayString]);
-
-  // Helper function to resolve FK value to display label
-  const resolveFkValue = useCallback((value: string, fkSource: string): string => {
-    const sourceCache = fkCache[fkSource];
-    if (sourceCache && sourceCache[value]) {
-      return sourceCache[value];
-    }
-    // Return truncated ID while loading or if not found
-    return value.length > 8 ? `${value.substring(0, 8)}...` : value;
-  }, [fkCache]);
-
   // Data is already filtered, sorted, and paginated by the backend.
   // Client-side only filters out rows that were just optimistically deleted
   // so the UI updates instantly before the server's next refetch response.
@@ -986,8 +884,10 @@ export function FormGeneratorTable<T extends Record<string, any>>({
   const handleFilter = (key: string, value: any, keepOpen = false) => {
     setFilters(prev => {
       const newFilters = { ...prev };
-      if (value === undefined || value === '' || value === null) {
+      if (value === undefined) {
         delete newFilters[key];
+      } else if (value === _EMPTY_FILTER_SENTINEL) {
+        newFilters[key] = null;
       } else {
         newFilters[key] = value;
       }
@@ -1024,7 +924,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
   }, [filters]);
 
   // Track which filter columns show all values (expanded beyond initial 100)
-  const [asyncFilterValues, setAsyncFilterValues] = useState<Record<string, string[]>>({});
+  const [asyncFilterValues, setAsyncFilterValues] = useState<Record<string, FilterValue[]>>({});
   const [filterValuesLoading, setFilterValuesLoading] = useState<Record<string, boolean>>({});
 
   // Invalidate cached filter values when filters change (cross-filtering)
@@ -1045,9 +945,8 @@ export function FormGeneratorTable<T extends Record<string, any>>({
     // Skip if column has static filterOptions (enum) – those are used directly
     if (column?.filterOptions && column.filterOptions.length > 0) return;
 
-    // FK columns with backend pagination: still fetch from backend (data is only one page)
-    // FK columns without backend pagination: skip (data is the full dataset, extracted below)
-    if (column?.fkSource && !supportsBackendPagination) return;
+    // displayField + local full dataset: filter values are derived from `data` (see getUniqueValuesForColumn)
+    if (column?.displayField && !supportsBackendPagination) return;
 
     // Skip if already loaded or currently loading
     if (asyncFilterValues[openFilterColumn] || filterValuesLoading[openFilterColumn]) return;
@@ -1055,7 +954,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
     const _fetchValues = async (columnKey: string) => {
       setFilterValuesLoading(prev => ({ ...prev, [columnKey]: true }));
       try {
-        let values: string[];
+        let values: FilterValue[];
         if (hookData?.fetchFilterValues && typeof hookData.fetchFilterValues === 'function') {
           const crossFilters: Record<string, any> = {};
           Object.entries(filters).forEach(([k, v]) => {
@@ -1089,27 +988,28 @@ export function FormGeneratorTable<T extends Record<string, any>>({
   //          3) data — ONLY when no backend pagination (data = full dataset)
   // With backend pagination, data is a single page, so extracting filter
   // values from it would be incomplete and misleading.
-  const getUniqueValuesForColumn = useCallback((columnKey: string): string[] => {
+  const getUniqueValuesForColumn = useCallback((columnKey: string): FilterValue[] => {
     const column = detectedColumns.find(c => c.key === columnKey);
 
     if (column?.filterOptions && column.filterOptions.length > 0) {
       return column.filterOptions;
     }
 
-    // FK columns without backend pagination: extract from full local data
-    if (column?.fkSource && !supportsBackendPagination) {
-      const seen = new Set<string>();
+    // displayField + local full dataset: { value, label } from enriched rows
+    if (column?.displayField && !supportsBackendPagination) {
+      const showKey = column.displayField;
+      const byVal = new Map<string, string>();
       data.forEach(row => {
         const val = row[columnKey];
-        if (val && typeof val === 'string' && val.trim()) {
-          seen.add(val);
-        }
-      });
-      return Array.from(seen).sort((a, b) => {
-        const labelA = fkCache[column.fkSource!]?.[a] || a;
-        const labelB = fkCache[column.fkSource!]?.[b] || b;
-        return labelA.localeCompare(labelB);
+        if (val == null || val === '') return;
+        const raw = String(val);
+        const d = row[showKey];
+        const label = d != null && d !== '' ? String(d) : `NA(${raw})`;
+        if (!byVal.has(raw)) byVal.set(raw, label);
       });
+      return Array.from(byVal.entries())
+        .sort((a, b) => a[1].localeCompare(b[1]))
+        .map(([value, label]) => ({ value, label }));
     }
 
     if (asyncFilterValues[columnKey] && asyncFilterValues[columnKey].length > 0) {
@@ -1125,7 +1025,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
       );
     }
     return [];
-  }, [detectedColumns, asyncFilterValues, apiEndpoint, hookData, data, fkCache]);
+  }, [detectedColumns, asyncFilterValues, apiEndpoint, hookData, data, supportsBackendPagination]);
 
   // Close filter dropdown when clicking outside
   useEffect(() => {
@@ -1500,10 +1400,11 @@ export function FormGeneratorTable<T extends Record<string, any>>({
         return detectedColumns.map(col => {
           let cellValue = row[col.key];
 
-          // FK resolution
-          if (col.fkSource && typeof cellValue === 'string' && cellValue.length > 0) {
-            const resolved = fkCache[col.fkSource]?.[cellValue];
-            if (resolved) cellValue = resolved;
+          if (col.displayField) {
+            const displayValue = row[col.displayField];
+            if (displayValue != null && displayValue !== '') {
+              cellValue = displayValue;
+            }
           }
 
           // Timestamp formatting
@@ -1541,7 +1442,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
     } finally {
       setCsvExporting(false);
     }
-  }, [csvExporting, detectedColumns, apiEndpoint, currentLanguage, fkCache]);
+  }, [csvExporting, detectedColumns, apiEndpoint, currentLanguage]);
 
   // Check if inline editing is allowed for a column (based on RBAC permissions)
   const canInlineEdit = useMemo(() => {
@@ -1725,6 +1626,15 @@ export function FormGeneratorTable<T extends Record<string, any>>({
       return column.formatter(value, row);
     }
 
+    // displayField: backend-enriched label takes priority over raw value.
+    // Falls back to the raw value when displayField is null/undefined (unresolved FK).
+    if (column.displayField) {
+      const displayValue = row[column.displayField];
+      if (displayValue != null && displayValue !== '') return String(displayValue);
+      if (value != null && value !== '') return `NA(${value})`;
+      return '-';
+    }
+
     if (value === null || value === undefined) {
       return '-';
     }
@@ -1750,19 +1660,6 @@ export function FormGeneratorTable<T extends Record<string, any>>({
       return renderBooleanCell(value, column, row);
     }
 
-    // FK Resolution: If column has fkSource and value is a string (UUID), resolve to display label
-    if (column.fkSource && typeof value === 'string' && value.length > 0) {
-      const resolvedLabel = resolveFkValue(value, column.fkSource);
-      const isLoading = fkLoading[column.fkSource];
-      
-      // Show loading indicator or resolved label
-      if (isLoading && !fkCache[column.fkSource]?.[value]) {
-        return <span className={styles.fkLoading}>{value.substring(0, 8)}...</span>;
-      }
-      
-      return resolvedLabel;
-    }
-
     // Check if this is an ID or hash field that should be truncated and copyable
     // Do this BEFORE checking for custom formatters to ensure IDs/hashes are always copyable
     const isId = isIdField(column.key);
@@ -2098,10 +1995,10 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                       {/* Filter icon */}
                       {filterable && column.filterable !== false && (
                         <button
-                          className={`${styles.filterIcon} ${filters[column.key] ? styles.filterActive : ''}`}
+                          className={`${styles.filterIcon} ${column.key in filters ? styles.filterActive : ''}`}
                           onClick={(e) => toggleFilterDropdown(column.key, e)}
-                          title={filters[column.key] 
-                            ? t('Filter: {value}', { value: String(filters[column.key]) })
+                          title={column.key in filters
+                            ? (filters[column.key] === null ? t('Filter: (Leer)') : t('Filter: {value}', { value: String(filters[column.key]) }))
                             : t('Zum Filtern klicken')
                           }
                         >
@@ -2151,7 +2048,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                       >
                         <div className={styles.filterDropdownHeader}>
                           <span>{t('Filter')}: {column.label}</span>
-                          {filters[column.key] && (
+                          {column.key in filters && (
                             <button
                               className={styles.filterClearBtn}
                               onClick={() => clearFilter(column.key)}
@@ -2244,11 +2141,17 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                             return (
                               <>
                                 <div
-                                  className={`${styles.filterOption} ${!filters[column.key] ? styles.filterOptionSelected : ''}`}
+                                  className={`${styles.filterOption} ${filters[column.key] === undefined ? styles.filterOptionSelected : ''}`}
                                   onClick={() => clearFilter(column.key)}
                                 >
                                   ({t('Alle')})
                                 </div>
+                                <div
+                                  className={`${styles.filterOption} ${filters[column.key] === null ? styles.filterOptionSelected : ''}`}
+                                  onClick={() => handleFilter(column.key, _EMPTY_FILTER_SENTINEL)}
+                                >
+                                  ({t('Leer')})
+                                </div>
                                 {filterValuesLoading[column.key] ? (
                                   <div className={styles.filterOptionMore} style={{ textAlign: 'center', padding: '8px' }}>
                                     {t('Lade Filterwerte...')}
@@ -2259,7 +2162,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                                     allValues={getUniqueValuesForColumn(column.key)}
                                     activeFilter={filters[column.key]}
                                     onSelect={(value) => handleFilter(column.key, value)}
-                                    resolveLabel={column.filterLabelResolver || (column.fkSource ? (val) => fkCache[column.fkSource!]?.[val] || val : undefined)}
+                                    resolveLabel={column.filterLabelResolver}
                                   />
                                 )}
                               </>
diff --git a/src/hooks/useMandates.ts b/src/hooks/useMandates.ts
index ebb31f9..6b56420 100644
--- a/src/hooks/useMandates.ts
+++ b/src/hooks/useMandates.ts
@@ -153,7 +153,7 @@ export function useAdminMandates() {
     return await fetchMandateByIdApi(request, mandateId);
   }, [request]);
 
-  // Generate columns from attributes (including fkSource/fkDisplayField for FK resolution)
+  // Generate columns from attributes (displayField = backend {field}Label for FK columns)
   const columns = attributes.map(attr => ({
     key: attr.name,
     label: attr.label || attr.name,
@@ -164,8 +164,7 @@ export function useAdminMandates() {
     width: attr.width || 150,
     minWidth: attr.minWidth || 100,
     maxWidth: attr.maxWidth || 400,
-    fkSource: (attr as any).fkSource, // API endpoint for FK data
-    fkDisplayField: (attr as any).fkDisplayField, // Which field of FK target to display
+    displayField: (attr as any).displayField,
   }));
 
   // Create mandate
diff --git a/src/pages/AutomationsDashboardPage.tsx b/src/pages/AutomationsDashboardPage.tsx
index d3a23d3..d8c19b1 100644
--- a/src/pages/AutomationsDashboardPage.tsx
+++ b/src/pages/AutomationsDashboardPage.tsx
@@ -436,10 +436,12 @@ const _DashboardTab: React.FC = () => {
     try {
       const resp = await api.get('/api/system/workflow-runs/metrics');
       setMetrics(resp.data);
-    } catch (e) {
+    } catch (e: any) {
+      const msg = e?.response?.data?.detail || e?.message || String(e);
       console.error('[automations] metrics load failed', e);
+      showError(t('Metriken konnten nicht geladen werden: {msg}', { msg }));
     }
-  }, []);
+  }, [showError, t]);
 
   const _loadRuns = useCallback(async (paginationParams?: any) => {
     if (paginationParams !== undefined) {
@@ -543,8 +545,7 @@ const _DashboardTab: React.FC = () => {
       width: 140,
       sortable: true,
       filterable: true,
-      fkSource: '/api/mandates/',
-      fkDisplayField: 'label',
+      displayField: 'mandateLabel',
     },
     {
       key: 'featureInstanceId',
@@ -553,8 +554,7 @@ const _DashboardTab: React.FC = () => {
       width: 140,
       sortable: true,
       filterable: true,
-      fkSource: '/api/features/instances',
-      fkDisplayField: 'label',
+      displayField: 'instanceLabel',
     },
     {
       key: 'status',
@@ -818,30 +818,45 @@ const _WorkflowsTab: React.FC = () => {
   const _handleExecute = useCallback(async (row: SystemWorkflow) => {
     if (!row.featureInstanceId) return;
     setExecutingId(row.id);
+    // Track outcome of the fire-and-forget executeGraph promise so the
+    // intermediate "Workflow gestartet" toast is only shown when the call has
+    // not already failed/finished within the 1s observation window. Without
+    // this we always toasted "gestartet" — even when the run had already
+    // errored — producing contradictory toasts and hiding real failures.
+    let observedFailure = false;
+    let observedSuccess = false;
     try {
       const invs = row.invocations || [];
       const primary =
         invs.find((i) => i.enabled && i.kind === 'manual') ||
         invs.find((i) => i.enabled && (i.kind === 'form' || i.kind === 'api'));
       const emptyGraph = { nodes: [], connections: [] };
-      executeGraph(request, row.featureInstanceId, emptyGraph as any, row.id, {
+      const exec = executeGraph(request, row.featureInstanceId, emptyGraph as any, row.id, {
         ...(primary ? { entryPointId: primary.id } : {}),
       }).then((result) => {
         if (result?.success) {
+          observedSuccess = true;
           showSuccess(result?.paused
             ? t('Workflow pausiert bei Human Task.')
             : t('Workflow abgeschlossen'));
         } else {
+          observedFailure = true;
           showError(result?.error || t('Ausführung fehlgeschlagen'));
         }
         _load();
       }).catch((e: any) => {
+        observedFailure = true;
         showError(t('Fehler: {msg}', { msg: e?.message || t('Ausführung fehlgeschlagen') }));
         _load();
       });
-      await new Promise((r) => setTimeout(r, 1000));
+      await Promise.race([
+        exec,
+        new Promise((r) => setTimeout(r, 1000)),
+      ]);
       await _load();
-      showSuccess(t('Workflow gestartet'));
+      if (!observedFailure && !observedSuccess) {
+        showSuccess(t('Workflow gestartet'));
+      }
     } finally {
       setExecutingId(null);
     }
@@ -870,8 +885,24 @@ const _WorkflowsTab: React.FC = () => {
 
   const _columns: ColumnConfig[] = useMemo(() => [
     { key: 'label', label: t('Workflow'), type: 'string', width: 200, sortable: true, filterable: true },
-    { key: 'mandateId', label: t('Mandant'), type: 'string', width: 140, sortable: true, filterable: true, fkSource: '/api/mandates/', fkDisplayField: 'label' },
-    { key: 'featureInstanceId', label: t('Instanz'), type: 'string', width: 140, sortable: true, filterable: true, fkSource: '/api/features/instances', fkDisplayField: 'label' },
+    {
+      key: 'mandateId',
+      label: t('Mandant'),
+      type: 'string',
+      width: 140,
+      sortable: true,
+      filterable: true,
+      displayField: 'mandateLabel',
+    },
+    {
+      key: 'featureInstanceId',
+      label: t('Instanz'),
+      type: 'string',
+      width: 140,
+      sortable: true,
+      filterable: true,
+      displayField: 'instanceLabel',
+    },
     {
       key: 'active',
       label: t('Aktiv'),
diff --git a/src/pages/admin/AdminUsersPage.tsx b/src/pages/admin/AdminUsersPage.tsx
index 88b3881..fcac187 100644
--- a/src/pages/admin/AdminUsersPage.tsx
+++ b/src/pages/admin/AdminUsersPage.tsx
@@ -69,8 +69,7 @@ export const AdminUsersPage: React.FC = () => {
       width: attr.width || 150,
       minWidth: attr.minWidth || 100,
       maxWidth: attr.maxWidth || 400,
-      fkSource: (attr as any).fkSource,
-      fkDisplayField: (attr as any).fkDisplayField,
+      displayField: (attr as any).displayField,
     }));
   }, [attributes]);
 
diff --git a/src/pages/basedata/ConnectionsPage.tsx b/src/pages/basedata/ConnectionsPage.tsx
index 0baa236..774b7e6 100644
--- a/src/pages/basedata/ConnectionsPage.tsx
+++ b/src/pages/basedata/ConnectionsPage.tsx
@@ -67,15 +67,12 @@ export const ConnectionsPage: React.FC = () => {
           width: attr.width || 150,
           minWidth: attr.minWidth || 100,
           maxWidth: attr.maxWidth || 400,
-          fkSource: (attr as any).fkSource,
-          fkDisplayField: (attr as any).fkDisplayField,
+          displayField: (attr as any).displayField,
           frontendFormat: (attr as any).frontendFormat,
           frontendFormatLabels: (attr as any).frontendFormatLabels,
         };
 
         if (attr.name === 'userId') {
-          col.fkSource = '/api/users/';
-          col.fkDisplayField = 'username';
           col.label = t('Benutzer');
         }
 
diff --git a/src/pages/basedata/FilesPage.tsx b/src/pages/basedata/FilesPage.tsx
index 78f3cbb..b7b4fe4 100644
--- a/src/pages/basedata/FilesPage.tsx
+++ b/src/pages/basedata/FilesPage.tsx
@@ -210,8 +210,7 @@ export const FilesPage: React.FC = () => {
         width: attr.width || 150,
         minWidth: attr.minWidth || 100,
         maxWidth: attr.maxWidth || 400,
-        fkSource: (attr as any).fkSource,
-        fkDisplayField: (attr as any).fkDisplayField,
+        displayField: (attr as any).displayField,
         frontendFormat: (attr as any).frontendFormat,
         frontendFormatLabels: (attr as any).frontendFormatLabels,
       }));
@@ -225,8 +224,7 @@ export const FilesPage: React.FC = () => {
       width: 150,
       minWidth: 100,
       maxWidth: 250,
-      fkSource: '/api/users/',
-      fkDisplayField: 'username',
+      displayField: 'sysCreatedByLabel',
     } as any);
     return cols;
   }, [attributes, t]);
diff --git a/src/pages/basedata/PromptsPage.tsx b/src/pages/basedata/PromptsPage.tsx
index ae55350..e274393 100644
--- a/src/pages/basedata/PromptsPage.tsx
+++ b/src/pages/basedata/PromptsPage.tsx
@@ -83,8 +83,7 @@ export const PromptsPage: React.FC = () => {
         width: attr.name === 'content' ? 300 : attr.width || 150,
         minWidth: attr.minWidth || 100,
         maxWidth: attr.name === 'content' ? 500 : attr.maxWidth || 400,
-        fkSource: (attr as any).fkSource,
-        fkDisplayField: (attr as any).fkDisplayField,
+        displayField: (attr as any).displayField,
         frontendFormat: (attr as any).frontendFormat,
         frontendFormatLabels: (attr as any).frontendFormatLabels,
       }));
@@ -100,8 +99,7 @@ export const PromptsPage: React.FC = () => {
       width: 150,
       minWidth: 100,
       maxWidth: 250,
-      fkSource: '/api/users/',
-      fkDisplayField: 'username',
+      displayField: 'sysCreatedByLabel',
       frontendFormat: undefined,
       frontendFormatLabels: undefined,
     });
diff --git a/src/pages/views/commcoach/CommcoachKeepAlive.tsx b/src/pages/views/commcoach/CommcoachKeepAlive.tsx
index 81f1ae0..16025ac 100644
--- a/src/pages/views/commcoach/CommcoachKeepAlive.tsx
+++ b/src/pages/views/commcoach/CommcoachKeepAlive.tsx
@@ -4,6 +4,10 @@
  * Keeps the CommCoach dossier/coaching page mounted across route changes.
  * Visibility is toggled via CSS so session state, messages, and input state
  * stay alive when the user leaves and later returns.
+ *
+ * Persistence is scoped per `(mandateId, instanceId)` — switching to a
+ * different mandate or instance via the navigator unmounts the previous
+ * view and mounts a fresh one.
  */
 
 import React, { useRef } from 'react';
@@ -30,6 +34,7 @@ export const CommcoachKeepAlive: React.FC<CommcoachKeepAliveProps> = ({ isVisibl
   const mandateId = cachedMandateIdRef.current;
   const instanceId = cachedInstanceIdRef.current;
   if (!mandateId || !instanceId) return null;
+  const scopeKey = `${mandateId}:${instanceId}`;
 
   return (
     <div
@@ -44,6 +49,7 @@ export const CommcoachKeepAlive: React.FC<CommcoachKeepAliveProps> = ({ isVisibl
       }}
     >
       <CommcoachDossierView
+        key={scopeKey}
         persistentInstanceId={instanceId}
         persistentMandateId={mandateId}
       />
diff --git a/src/pages/views/graphicalEditor/GraphicalEditorKeepAlive.test.tsx b/src/pages/views/graphicalEditor/GraphicalEditorKeepAlive.test.tsx
new file mode 100644
index 0000000..c7a73b5
--- /dev/null
+++ b/src/pages/views/graphicalEditor/GraphicalEditorKeepAlive.test.tsx
@@ -0,0 +1,96 @@
+// Copyright (c) 2025 Patrick Motsch
+// All rights reserved.
+//
+// Persistence is per (mandateId, instanceId): switching to a different mandate
+// or instance must remount the editor page so its internal state (loaded
+// workflow, currentWorkflowId, …) is reset and saves go to the right tenant.
+
+import React from 'react';
+import { describe, expect, it, vi } from 'vitest';
+import { render, screen, act } from '@testing-library/react';
+import { MemoryRouter, useNavigate } from 'react-router-dom';
+
+const _mountCount = { value: 0 };
+
+vi.mock('./GraphicalEditorPage', () => ({
+  GraphicalEditorPage: ({ persistentMandateId, persistentInstanceId }: { persistentMandateId?: string; persistentInstanceId?: string }) => {
+    React.useEffect(() => {
+      _mountCount.value += 1;
+    }, []);
+    return <div data-testid="ge-page">{persistentMandateId}::{persistentInstanceId}</div>;
+  },
+}));
+
+import { GraphicalEditorKeepAlive } from './GraphicalEditorKeepAlive';
+
+let _navigateTo: ((path: string) => void) | null = null;
+const _NavCapture: React.FC = () => {
+  _navigateTo = useNavigate();
+  return null;
+};
+
+function _renderHarness(initialPath: string) {
+  return render(
+    <MemoryRouter initialEntries={[initialPath]}>
+      <_NavCapture />
+      <GraphicalEditorKeepAlive isVisible />
+    </MemoryRouter>,
+  );
+}
+
+function _navigate(path: string) {
+  act(() => {
+    _navigateTo?.(path);
+  });
+}
+
+describe('GraphicalEditorKeepAlive — persistence per (mandate, instance)', () => {
+  it('remounts the page when the mandate changes', () => {
+    _mountCount.value = 0;
+    _renderHarness('/mandates/mA/graphicalEditor/iA/editor');
+    expect(_mountCount.value).toBe(1);
+    expect(screen.getByTestId('ge-page').textContent).toBe('mA::iA');
+
+    _navigate('/mandates/mB/graphicalEditor/iA/editor');
+
+    expect(_mountCount.value).toBe(2);
+    expect(screen.getByTestId('ge-page').textContent).toBe('mB::iA');
+  });
+
+  it('remounts the page when the instance changes', () => {
+    _mountCount.value = 0;
+    _renderHarness('/mandates/mA/graphicalEditor/iA/editor');
+    expect(_mountCount.value).toBe(1);
+
+    _navigate('/mandates/mA/graphicalEditor/iZ/editor');
+
+    expect(_mountCount.value).toBe(2);
+    expect(screen.getByTestId('ge-page').textContent).toBe('mA::iZ');
+  });
+
+  it('does NOT remount when the route stays on the same (mandate, instance)', () => {
+    _mountCount.value = 0;
+    _renderHarness('/mandates/mA/graphicalEditor/iA/editor');
+    expect(_mountCount.value).toBe(1);
+
+    _navigate('/mandates/mA/graphicalEditor/iA/editor');
+
+    expect(_mountCount.value).toBe(1);
+  });
+
+  it('keeps the cached page mounted (no remount) when the user navigates AWAY and BACK to the same scope', () => {
+    _mountCount.value = 0;
+    _renderHarness('/mandates/mA/graphicalEditor/iA/editor');
+    expect(_mountCount.value).toBe(1);
+
+    // Away to a non-editor route: the regex match fails, refs keep their
+    // previous values — the cached page must not remount.
+    _navigate('/admin/languages');
+    expect(_mountCount.value).toBe(1);
+    expect(screen.getByTestId('ge-page').textContent).toBe('mA::iA');
+
+    // Back to the same (mandate, instance) — still no remount.
+    _navigate('/mandates/mA/graphicalEditor/iA/editor');
+    expect(_mountCount.value).toBe(1);
+  });
+});
diff --git a/src/pages/views/graphicalEditor/GraphicalEditorKeepAlive.tsx b/src/pages/views/graphicalEditor/GraphicalEditorKeepAlive.tsx
index 0730802..fdf5b78 100644
--- a/src/pages/views/graphicalEditor/GraphicalEditorKeepAlive.tsx
+++ b/src/pages/views/graphicalEditor/GraphicalEditorKeepAlive.tsx
@@ -4,9 +4,16 @@
  * Keeps the GraphicalEditorPage mounted across route changes so the canvas
  * state, SSE connections, and editor context survive navigation to ANY page
  * (other features, admin, settings, etc.).
- * Visibility is toggled via CSS `display` instead of mount / unmount.
- * Cached mandateId/instanceId are passed as props so the page does not
- * depend on URL params (which disappear on non-feature routes).
+ *
+ * Persistence is scoped per `(mandateId, instanceId)`: when the user switches
+ * to a DIFFERENT mandate or instance via the navigator, the previous editor
+ * mount is discarded and a fresh page is mounted. Otherwise stale state from
+ * mandate A leaks into mandate B and saves end up hitting the wrong tenant
+ * (HTTP 404 / "not found").
+ *
+ * Implementation: feeds the cached `(mandate, instance)` tuple into both
+ * `props` and `key`. React reuses the mount as long as the tuple stays
+ * identical and unmounts/remounts on change.
  */
 
 import React, { useRef } from 'react';
@@ -34,6 +41,10 @@ export const GraphicalEditorKeepAlive: React.FC<GraphicalEditorKeepAliveProps> =
 
   if (!hasEverMountedRef.current) return null;
 
+  const mandateId = cachedMandateIdRef.current;
+  const instanceId = cachedInstanceIdRef.current;
+  const scopeKey = `${mandateId}:${instanceId}`;
+
   return (
     <div
       style={{
@@ -48,8 +59,9 @@ export const GraphicalEditorKeepAlive: React.FC<GraphicalEditorKeepAliveProps> =
       }}
     >
       <GraphicalEditorPage
-        persistentInstanceId={cachedInstanceIdRef.current}
-        persistentMandateId={cachedMandateIdRef.current}
+        key={scopeKey}
+        persistentInstanceId={instanceId}
+        persistentMandateId={mandateId}
       />
     </div>
   );
diff --git a/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx b/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx
index 2cc4b2e..9737eab 100644
--- a/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx
+++ b/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx
@@ -200,8 +200,7 @@ export const GraphicalEditorTemplatesPage: React.FC = () => {
       label: t('Erstellt von'),
       type: 'string',
       width: 140,
-      fkSource: '/api/users/',
-      fkDisplayField: 'username',
+      displayField: 'sysCreatedByLabel',
     },
     {
       key: 'sysCreatedAt',
diff --git a/src/pages/views/trustee/TrusteePositionDocumentsView.tsx b/src/pages/views/trustee/TrusteePositionDocumentsView.tsx
index 42557a5..749fc41 100644
--- a/src/pages/views/trustee/TrusteePositionDocumentsView.tsx
+++ b/src/pages/views/trustee/TrusteePositionDocumentsView.tsx
@@ -50,8 +50,6 @@ export const TrusteePositionDocumentsView: React.FC = () => {
     }
   }, [instanceId]);
 
-  // Generate columns from attributes (like TrusteePositionsView)
-  // Map frontend_options to fkSource for FK resolution
   const columns = useMemo(() => {
     if (!attributes || attributes.length === 0) return [];
     
@@ -60,29 +58,19 @@ export const TrusteePositionDocumentsView: React.FC = () => {
     
     return attributes
       .filter((attr: any) => !excludedFields.includes(attr.name))
-      .map((attr: any) => {
-        // Replace {instanceId} placeholder in options URL
-        let fkSource = attr.options;
-        if (typeof fkSource === 'string' && instanceId) {
-          fkSource = fkSource.replace('{instanceId}', instanceId);
-        }
-        
-        return {
-          key: attr.name,
-          label: attr.label || attr.name,
-          type: attr.type as any,
-          sortable: attr.sortable !== false,
-          filterable: attr.filterable !== false,
-          searchable: attr.searchable !== false,
-          width: attr.width || 200,
-          minWidth: attr.minWidth || 100,
-          maxWidth: attr.maxWidth || 400,
-          // Use frontend_options as fkSource for FK resolution
-          fkSource: typeof fkSource === 'string' ? fkSource : undefined,
-          fkDisplayField: 'label',
-        };
-      });
-  }, [attributes, instanceId]);
+      .map((attr: any) => ({
+        key: attr.name,
+        label: attr.label || attr.name,
+        type: attr.type as any,
+        sortable: attr.sortable !== false,
+        filterable: attr.filterable !== false,
+        searchable: attr.searchable !== false,
+        width: attr.width || 200,
+        minWidth: attr.minWidth || 100,
+        maxWidth: attr.maxWidth || 400,
+        displayField: attr.displayField,
+      }));
+  }, [attributes]);
 
   // Check permissions (general level)
   // Row-level permissions are handled automatically by FormGeneratorTable
diff --git a/src/pages/views/trustee/dataTables/TrusteeDataTab.tsx b/src/pages/views/trustee/dataTables/TrusteeDataTab.tsx
index 874e74a..1b6f5bf 100644
--- a/src/pages/views/trustee/dataTables/TrusteeDataTab.tsx
+++ b/src/pages/views/trustee/dataTables/TrusteeDataTab.tsx
@@ -129,8 +129,7 @@ export const TrusteeDataTab: React.FC<TrusteeDataTabProps> = ({
         width: attr.width || 150,
         minWidth: attr.minWidth || 100,
         maxWidth: attr.maxWidth || 400,
-        fkSource: attr.fkSource,
-        fkDisplayField: attr.fkDisplayField,
+        displayField: attr.displayField,
         frontendFormat: attr.frontendFormat,
         frontendFormatLabels: attr.frontendFormatLabels,
       }));
diff --git a/src/pages/views/workspace/WorkspaceKeepAlive.tsx b/src/pages/views/workspace/WorkspaceKeepAlive.tsx
index 7c8fc1c..7cb7575 100644
--- a/src/pages/views/workspace/WorkspaceKeepAlive.tsx
+++ b/src/pages/views/workspace/WorkspaceKeepAlive.tsx
@@ -5,6 +5,11 @@
  * survives route changes.  Visibility is toggled via CSS `display`
  * instead of mount / unmount, preserving messages, SSE connections,
  * files, and all other workspace state.
+ *
+ * Persistence is scoped per `(mandateId, instanceId)` — switching to a
+ * different mandate or instance via the navigator unmounts the previous
+ * page and mounts a fresh one (otherwise stale state from tenant A
+ * leaks into tenant B).
  */
 
 import React, { useRef } from 'react';
@@ -19,15 +24,19 @@ interface WorkspaceKeepAliveProps {
 
 export const WorkspaceKeepAlive: React.FC<WorkspaceKeepAliveProps> = ({ isVisible }) => {
   const location = useLocation();
+  const cachedMandateIdRef = useRef<string>('');
   const cachedInstanceIdRef = useRef<string>('');
 
   const match = location.pathname.match(_WORKSPACE_ROUTE_RE);
-  if (match?.[2]) {
+  if (match?.[1] && match?.[2]) {
+    cachedMandateIdRef.current = match[1];
     cachedInstanceIdRef.current = match[2];
   }
 
+  const mandateId = cachedMandateIdRef.current;
   const instanceId = cachedInstanceIdRef.current;
   if (!instanceId) return null;
+  const scopeKey = `${mandateId}:${instanceId}`;
 
   return (
     <div
@@ -42,7 +51,7 @@ export const WorkspaceKeepAlive: React.FC<WorkspaceKeepAliveProps> = ({ isVisibl
         overflow: 'hidden',
       }}
     >
-      <WorkspacePage persistentInstanceId={instanceId} />
+      <WorkspacePage key={scopeKey} persistentInstanceId={instanceId} />
     </div>
   );
 };
diff --git a/tsc-out.txt b/tsc-out.txt
deleted file mode 100644
index 9c4f81a..0000000
--- a/tsc-out.txt
+++ /dev/null
@@ -1,489 +0,0 @@
-src/components/FlowEditor/nodes/configs/CommentNodeConfig.tsx(8,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/configs/CommentNodeConfig.tsx(17,22): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/ConfirmationNodeConfig.tsx(8,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/configs/ConfirmationNodeConfig.tsx(17,22): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/ConfirmationNodeConfig.tsx(21,15): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(9,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(61,39): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(61,70): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(78,72): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(78,114): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(96,48): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(97,51): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(98,48): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(115,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(119,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(123,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(127,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(131,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(135,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(139,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(143,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(147,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(151,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(161,51): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(176,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(180,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(184,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(188,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(198,45): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(217,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(225,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(230,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/EmailNodeConfig.tsx(234,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/FileCreateNodeConfig.tsx(12,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/configs/FileCreateNodeConfig.tsx(46,17): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/FileCreateNodeConfig.tsx(52,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/FileCreateNodeConfig.tsx(58,22): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/FileCreateNodeConfig.tsx(59,27): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/FileCreateNodeConfig.tsx(96,17): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/FileCreateNodeConfig.tsx(109,17): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/SharePointNodeConfig.tsx(13,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/configs/SharePointNodeConfig.tsx(157,50): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/SharePointNodeConfig.tsx(157,86): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/SharePointNodeConfig.tsx(168,19): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/SharePointNodeConfig.tsx(179,19): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/SharePointNodeConfig.tsx(194,19): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/SharePointNodeConfig.tsx(195,19): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/SharePointNodeConfig.tsx(213,19): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/SharePointNodeConfig.tsx(217,26): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/SharePointNodeConfig.tsx(225,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/SharePointNodeConfig.tsx(233,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/TrusteeNodeConfig.tsx(10,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/configs/TrusteeNodeConfig.tsx(36,17): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/TrusteeNodeConfig.tsx(40,24): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/TrusteeNodeConfig.tsx(47,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/TrusteeNodeConfig.tsx(53,43): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/TrusteeNodeConfig.tsx(53,74): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/TrusteeNodeConfig.tsx(62,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/TrusteeNodeConfig.tsx(70,21): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/TrusteeNodeConfig.tsx(74,28): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/TrusteeNodeConfig.tsx(83,19): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/TrusteeNodeConfig.tsx(87,26): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/UploadNodeConfig.tsx(11,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/configs/UploadNodeConfig.tsx(42,17): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/configs/UploadNodeConfig.tsx(60,17): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/form/FormNodeConfig.tsx(11,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/form/FormNodeConfig.tsx(78,24): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/form/FormNodeConfig.tsx(135,48): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/form/FormNodeConfig.tsx(136,49): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/form/FormNodeConfig.tsx(153,24): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/form/FormNodeConfig.tsx(200,32): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(28,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(157,13): error TS2345: Argument of type 'string' is not assignable to parameter of type 'ApiRequestOptions<any>'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(172,27): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(216,34): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(218,33): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(219,33): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(225,141): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(260,142): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(284,140): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(296,20): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(299,68): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(312,32): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(313,31): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(314,31): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(316,34): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(317,38): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(318,36): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(319,37): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(341,43): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(343,43): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(347,144): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(362,32): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(364,39): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(365,36): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(366,39): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(367,31): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx(368,31): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/ifElse/IfElseNodeConfig.tsx(15,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/ifElse/IfElseNodeConfig.tsx(102,78): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/ifElse/IfElseNodeConfig.tsx(122,33): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/ifElse/IfElseNodeConfig.tsx(144,25): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/ifElse/IfElseNodeConfig.tsx(145,25): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/shared/DataPicker.tsx(14,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/shared/DataPicker.tsx(142,51): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/shared/DataPicker.tsx(143,98): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/shared/DataPicker.tsx(184,61): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/shared/DataPicker.tsx(192,43): error TS2345: Argument of type 'CanvasConnection[]' is not assignable to parameter of type '{ source: string; target: string; sourceOutput?: number | undefined; }[]'.
-  Type 'CanvasConnection' is missing the following properties from type '{ source: string; target: string; sourceOutput?: number | undefined; }': source, target
-src/components/FlowEditor/nodes/shared/DynamicValueField.tsx(17,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/shared/DynamicValueField.tsx(59,54): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/shared/DynamicValueField.tsx(104,26): error TS2345: Argument of type 'DataRef | SystemVarRef' is not assignable to parameter of type 'DataRef | null'.
-  Type 'SystemVarRef' is missing the following properties from type 'DataRef': nodeId, path
-src/components/FlowEditor/nodes/shared/HybridStaticRefField.tsx(16,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/shared/HybridStaticRefField.tsx(87,26): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/shared/LoopItemsSelect.tsx(12,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/shared/LoopItemsSelect.tsx(186,15): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/switch/SwitchNodeConfig.tsx(15,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/FlowEditor/nodes/switch/SwitchNodeConfig.tsx(116,29): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/switch/SwitchNodeConfig.tsx(156,29): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/switch/SwitchNodeConfig.tsx(157,33): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/switch/SwitchNodeConfig.tsx(158,34): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/switch/SwitchNodeConfig.tsx(191,24): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/switch/SwitchNodeConfig.tsx(197,19): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/switch/SwitchNodeConfig.tsx(202,26): error TS2304: Cannot find name 't'.
-src/components/FlowEditor/nodes/switch/SwitchNodeConfig.tsx(208,17): error TS2304: Cannot find name 't'.
-src/components/NotificationBell/NotificationBell.tsx(13,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/NotificationBell/NotificationBell.tsx(161,18): error TS2304: Cannot find name 't'.
-src/components/NotificationBell/NotificationBell.tsx(175,48): error TS2304: Cannot find name 't'.
-src/components/NotificationBell/NotificationBell.tsx(185,21): error TS2304: Cannot find name 't'.
-src/components/NotificationBell/NotificationBell.tsx(255,33): error TS2304: Cannot find name 't'.
-src/components/OnboardingWizard.tsx(4,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/OnboardingWizard.tsx(26,18): error TS2304: Cannot find name 't'.
-src/components/OnboardingWizard.tsx(48,64): error TS2304: Cannot find name 't'.
-src/components/OnboardingWizard.tsx(62,24): error TS2304: Cannot find name 't'.
-src/components/OnboardingWizard.tsx(77,24): error TS2304: Cannot find name 't'.
-src/components/OnboardingWizard.tsx(92,26): error TS2304: Cannot find name 't'.
-src/components/OnboardingWizard.tsx(116,24): error TS2304: Cannot find name 't'.
-src/components/OnboardingWizard.tsx(116,65): error TS2304: Cannot find name 't'.
-src/components/ProviderSelector/ProviderSelector.tsx(21,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/ProviderSelector/ProviderSelector.tsx(145,27): error TS2304: Cannot find name 't'.
-src/components/ProviderSelector/ProviderSelector.tsx(283,16): error TS2304: Cannot find name 't'.
-src/components/ProviderSelector/ProviderSelector.tsx(304,46): error TS2304: Cannot find name 't'.
-src/components/ProviderSelector/ProviderSelector.tsx(348,51): error TS2304: Cannot find name 't'.
-src/components/RbacExportImport/RbacExportImport.tsx(90,53): error TS2304: Cannot find name 't'.
-src/components/UiComponents/AddressAutocomplete/AddressAutocomplete.tsx(7,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/UiComponents/AddressAutocomplete/AddressAutocomplete.tsx(278,55): error TS2304: Cannot find name 't'.
-src/components/UiComponents/AddressAutocomplete/AddressAutocomplete.tsx(288,57): error TS2304: Cannot find name 't'.
-src/components/UiComponents/AutoScroll/AutoScroll.tsx(4,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/UiComponents/AutoScroll/AutoScroll.tsx(152,23): error TS2304: Cannot find name 't'.
-src/components/UiComponents/BauvorschriftenSection/BauvorschriftenSection.tsx(5,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/UiComponents/BauvorschriftenSection/BauvorschriftenSection.tsx(44,49): error TS2304: Cannot find name 't'.
-src/components/UiComponents/BauvorschriftenSection/BauvorschriftenSection.tsx(56,49): error TS2304: Cannot find name 't'.
-src/components/UiComponents/BauvorschriftenSection/BauvorschriftenSection.tsx(68,49): error TS2304: Cannot find name 't'.
-src/components/UiComponents/BauvorschriftenSection/BauvorschriftenSection.tsx(74,49): error TS2304: Cannot find name 't'.
-src/components/UiComponents/BauvorschriftenSection/BauvorschriftenSection.tsx(80,49): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ConnectedFilesList/ConnectedFilesList.tsx(15,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/UiComponents/ConnectedFilesList/ConnectedFilesList.tsx(186,39): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ConnectedFilesList/ConnectedFilesList.tsx(233,52): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ConnectedFilesList/ConnectedFilesList.tsx(233,100): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ConnectedFilesList/ConnectedFilesList.tsx(240,42): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ConnectedFilesList/ConnectedFilesList.tsx(240,82): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ConnectedFilesList/ConnectedFilesList.tsx(250,60): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ConnectedFilesList/ConnectedFilesList.tsx(250,95): error TS2304: Cannot find name 't'.
-src/components/UiComponents/MapView/MapViewLeaflet.tsx(28,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/UiComponents/MapView/MapViewLeaflet.tsx(196,47): error TS2304: Cannot find name 't'.
-src/components/UiComponents/MapView/MapViewLeaflet.tsx(196,107): error TS2304: Cannot find name 't'.
-src/components/UiComponents/MapView/MapViewLeaflet.tsx(209,45): error TS2304: Cannot find name 't'.
-src/components/UiComponents/MapView/MapViewLeaflet.tsx(209,105): error TS2304: Cannot find name 't'.
-src/components/UiComponents/Messages/ChatMessages/ChatMessage.tsx(12,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/UiComponents/Messages/ChatMessages/ChatMessage.tsx(83,20): error TS2304: Cannot find name 't'.
-src/components/UiComponents/Messages/ChatMessages/ChatMessage.tsx(203,28): error TS2304: Cannot find name 't'.
-src/components/UiComponents/Messages/ChatMessages/ChatMessage.tsx(211,28): error TS2304: Cannot find name 't'.
-src/components/UiComponents/Messages/ChatMessages/ChatMessage.tsx(221,26): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(10,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(229,59): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(268,34): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(319,59): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(332,59): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(346,60): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(364,44): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(382,38): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(406,73): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(423,73): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(442,73): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(493,74): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(534,34): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(585,59): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(598,59): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(612,60): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(630,44): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(648,38): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(672,73): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(689,73): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(708,73): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(757,74): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(844,47): error TS2304: Cannot find name 't'.
-src/components/UiComponents/ParcelInfoPanel/ParcelInfoPanel.tsx(1083,47): error TS2304: Cannot find name 't'.
-src/components/UiComponents/Toast/Toast.tsx(23,11): error TS6133: 't' is declared but its value is never read.
-src/components/UiComponents/Toast/Toast.tsx(57,21): error TS2304: Cannot find name 't'.
-src/components/UiComponents/WorkflowStatus/WorkflowStatus.tsx(36,11): error TS6133: 't' is declared but its value is never read.
-src/components/UiComponents/WorkflowStatus/WorkflowStatus.tsx(73,55): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/ChatsTab.tsx(6,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/UnifiedDataBar/ChatsTab.tsx(311,26): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/ChatsTab.tsx(333,56): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/ChatsTab.tsx(341,24): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/ChatsTab.tsx(346,119): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/ChatsTab.tsx(438,36): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/ChatsTab.tsx(438,75): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/FilesTab.tsx(9,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/UnifiedDataBar/FilesTab.tsx(235,56): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/FilesTab.tsx(263,20): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/FilesTab.tsx(286,22): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/FilesTab.tsx(327,28): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/FilesTab.tsx(327,65): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(23,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/components/UnifiedDataBar/SourcesTab.tsx(855,42): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(855,90): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(862,26): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(958,32): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(988,53): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(988,84): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(995,36): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(1031,49): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(1031,80): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(1038,32): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(1168,20): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(1174,82): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(1431,18): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(1437,80): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(1577,20): error TS2304: Cannot find name 't'.
-src/components/UnifiedDataBar/SourcesTab.tsx(1583,82): error TS2304: Cannot find name 't'.
-src/hooks/usePlayground.ts(2,3): error TS2305: Module '"../api/workflowApi"' has no exported member 'Workflow'.
-src/hooks/usePlayground.ts(3,3): error TS2305: Module '"../api/workflowApi"' has no exported member 'WorkflowMessage'.
-src/hooks/usePlayground.ts(4,3): error TS2305: Module '"../api/workflowApi"' has no exported member 'WorkflowLog'.
-src/hooks/usePlayground.ts(5,3): error TS2305: Module '"../api/workflowApi"' has no exported member 'StartWorkflowRequest'.
-src/hooks/usePlayground.ts(6,3): error TS2305: Module '"../api/workflowApi"' has no exported member 'StartWorkflowResponse'.
-src/hooks/usePlayground.ts(7,3): error TS2305: Module '"../api/workflowApi"' has no exported member 'ChatDataResponse'.
-src/hooks/useWorkflows.ts(4,3): error TS2724: '"../api/workflowApi"' has no exported member named 'deleteWorkflowApi'. Did you mean 'deleteWorkflow'?
-src/hooks/useWorkflows.ts(5,3): error TS2724: '"../api/workflowApi"' has no exported member named 'deleteWorkflowsApi'. Did you mean 'deleteWorkflow'?
-src/hooks/useWorkflows.ts(6,3): error TS2724: '"../api/workflowApi"' has no exported member named 'updateWorkflowApi'. Did you mean 'updateWorkflow'?
-src/hooks/useWorkflows.ts(9,3): error TS2305: Module '"../api/workflowApi"' has no exported member 'fetchAttributes'.
-src/hooks/useWorkflows.ts(10,3): error TS2305: Module '"../api/workflowApi"' has no exported member 'startWorkflowApi'.
-src/hooks/useWorkflows.ts(11,3): error TS2305: Module '"../api/workflowApi"' has no exported member 'stopWorkflowApi'.
-src/hooks/useWorkflows.ts(12,3): error TS2305: Module '"../api/workflowApi"' has no exported member 'deleteMessageApi'.
-src/hooks/useWorkflows.ts(13,3): error TS2305: Module '"../api/workflowApi"' has no exported member 'deleteFileFromMessageApi'.
-src/hooks/useWorkflows.ts(14,8): error TS2305: Module '"../api/workflowApi"' has no exported member 'Workflow'.
-src/hooks/useWorkflows.ts(15,8): error TS2305: Module '"../api/workflowApi"' has no exported member 'AttributeDefinition'.
-src/hooks/useWorkflows.ts(16,8): error TS2305: Module '"../api/workflowApi"' has no exported member 'StartWorkflowRequest'.
-src/hooks/useWorkflows.ts(32,15): error TS2305: Module '"../api/workflowApi"' has no exported member 'AttributeDefinition'.
-src/hooks/useWorkflows.ts(132,49): error TS2345: Argument of type 'undefined' is not assignable to parameter of type 'string'.
-src/hooks/useWorkflows.ts(195,72): error TS2345: Argument of type 'string | undefined' is not assignable to parameter of type 'string'.
-  Type 'undefined' is not assignable to type 'string'.
-src/hooks/useWorkflows.ts(196,14): error TS2352: Conversion of type 'Automation2Workflow' to type 'UserWorkflow' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first.
-  Type 'Automation2Workflow' is missing the following properties from type 'UserWorkflow': mandateId, status
-src/hooks/useWorkflows.ts(247,40): error TS7006: Parameter 'opt' implicitly has an 'any' type.
-src/hooks/useWorkflows.ts(263,40): error TS7006: Parameter 'opt' implicitly has an 'any' type.
-src/layouts/FeatureLayout.tsx(23,9): error TS2304: Cannot find name 't'.
-src/layouts/FeatureLayout.tsx(39,10): error TS2304: Cannot find name 't'.
-src/layouts/FeatureLayout.tsx(62,11): error TS6133: 't' is declared but its value is never read.
-src/pages/admin/AdminFeatureInstanceUsersPage.tsx(13,26): error TS6133: 'FaUsers' is declared but its value is never read.
-src/pages/admin/AdminInvitationsPage.tsx(13,26): error TS6133: 'FaEnvelopeOpenText' is declared but its value is never read.
-src/pages/admin/AdminMandatesPage.tsx(20,26): error TS6133: 'FaBuilding' is declared but its value is never read.
-src/pages/admin/AdminUserMandatesPage.tsx(12,26): error TS6133: 'FaUsers' is declared but its value is never read.
-src/pages/admin/AdminUsersPage.tsx(12,26): error TS6133: 'FaUsers' is declared but its value is never read.
-src/pages/basedata/ConnectionsPage.tsx(12,18): error TS6133: 'FaPlug' is declared but its value is never read.
-src/pages/basedata/FilesPage.tsx(17,18): error TS6133: 'FaFolder' is declared but its value is never read.
-src/pages/billing/BillingDashboard.tsx(12,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/pages/billing/BillingDashboard.tsx(69,56): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(73,44): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(87,14): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(89,43): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(109,14): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(111,43): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(131,14): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(133,43): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(189,14): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(190,41): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(197,46): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(199,55): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingDashboard.tsx(201,43): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(19,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/pages/billing/BillingMandateView.tsx(47,18): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(48,18): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(49,18): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(72,62): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(72,89): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(134,18): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(136,18): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(140,49): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(218,45): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(229,55): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(231,43): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(254,55): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(256,43): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(268,30): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingMandateView.tsx(268,58): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingTransactions.tsx(12,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/pages/billing/BillingTransactions.tsx(98,14): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingTransactions.tsx(99,41): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingTransactions.tsx(106,55): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingTransactions.tsx(108,43): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingTransactions.tsx(116,26): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingTransactions.tsx(118,26): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingTransactions.tsx(122,57): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingTransactions.tsx(140,30): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingTransactions.tsx(140,63): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(20,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/pages/billing/BillingUserView.tsx(93,31): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(108,31): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(121,20): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(122,20): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(123,51): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(125,20): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(144,70): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(227,18): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(228,18): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(230,18): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(234,49): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(314,41): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(323,55): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(325,43): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(350,55): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(352,43): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(368,30): error TS2304: Cannot find name 't'.
-src/pages/billing/BillingUserView.tsx(368,55): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(413,11): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(414,11): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(416,39): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(416,79): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(417,46): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(417,81): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(418,45): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(418,80): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(448,56): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(475,46): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(481,29): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(481,75): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(499,48): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(503,20): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(513,46): error TS2304: Cannot find name 't'.
-src/pages/billing/SubscriptionTab.tsx(515,43): error TS2304: Cannot find name 't'.
-src/pages/Dashboard.tsx(18,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/pages/Dashboard.tsx(74,16): error TS2304: Cannot find name 't'.
-src/pages/Dashboard.tsx(75,43): error TS2304: Cannot find name 't'.
-src/pages/Dashboard.tsx(84,14): error TS2304: Cannot find name 't'.
-src/pages/FeatureView.tsx(54,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/pages/FeatureView.tsx(69,27): error TS2304: Cannot find name 't'.
-src/pages/FeatureView.tsx(69,72): error TS2304: Cannot find name 't'.
-src/pages/FeatureView.tsx(73,46): error TS2304: Cannot find name 't'.
-src/pages/FeatureView.tsx(77,27): error TS2304: Cannot find name 't'.
-src/pages/FeatureView.tsx(84,27): error TS2304: Cannot find name 't'.
-src/pages/FeatureView.tsx(84,75): error TS2304: Cannot find name 't'.
-src/pages/FeatureView.tsx(90,10): error TS2304: Cannot find name 't'.
-src/pages/FeatureView.tsx(91,9): error TS2304: Cannot find name 't'.
-src/pages/FeatureView.tsx(97,10): error TS2304: Cannot find name 't'.
-src/pages/FeatureView.tsx(98,9): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(29,11): error TS6133: 't' is declared but its value is never read.
-src/pages/GDPR.tsx(165,48): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(168,20): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(169,19): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(190,20): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(191,19): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(212,20): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(213,19): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(282,48): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(283,65): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(288,22): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(298,22): error TS2304: Cannot find name 't'.
-src/pages/GDPR.tsx(308,22): error TS2304: Cannot find name 't'.
-src/pages/Register.tsx(47,11): error TS6133: 't' is declared but its value is never read.
-src/pages/Register.tsx(142,26): error TS2304: Cannot find name 't'.
-src/pages/Register.tsx(195,115): error TS2304: Cannot find name 't'.
-src/pages/Register.tsx(199,25): error TS2304: Cannot find name 't'.
-src/pages/Register.tsx(219,24): error TS2304: Cannot find name 't'.
-src/pages/Reset.tsx(40,11): error TS6133: 't' is declared but its value is never read.
-src/pages/Reset.tsx(111,45): error TS2304: Cannot find name 't'.
-src/pages/Reset.tsx(123,26): error TS2304: Cannot find name 't'.
-src/pages/Reset.tsx(151,43): error TS2304: Cannot find name 't'.
-src/pages/Reset.tsx(163,57): error TS2304: Cannot find name 't'.
-src/pages/Reset.tsx(178,106): error TS2304: Cannot find name 't'.
-src/pages/Reset.tsx(196,120): error TS2304: Cannot find name 't'.
-src/pages/Reset.tsx(210,24): error TS2304: Cannot find name 't'.
-src/pages/Store.tsx(140,38): error TS2304: Cannot find name 't'.
-src/pages/Store.tsx(140,65): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(32,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/pages/views/commcoach/CommcoachDossierView.tsx(252,46): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(263,35): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(263,82): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(295,18): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(306,26): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(314,26): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(320,41): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(323,43): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(326,47): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(330,53): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(330,90): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(332,95): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(340,16): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(341,15): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(342,90): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(358,162): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(359,163): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(363,54): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(363,93): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(376,38): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(388,21): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(391,61): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(419,58): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(433,44): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(433,91): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(435,38): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(435,74): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(438,63): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(438,105): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(441,63): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(441,103): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(490,86): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(490,131): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(603,36): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(617,34): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(642,148): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(672,34): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(699,152): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(776,30): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(782,57): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(782,98): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(786,49): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(815,49): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(822,95): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(822,125): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(832,47): error TS2304: Cannot find name 't'.
-src/pages/views/commcoach/CommcoachDossierView.tsx(850,49): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(120,29): error TS2339: Property 'filter' does not exist on type 'Automation2Workflow[] | { items: Automation2Workflow[]; pagination: any; }'.
-  Property 'filter' does not exist on type '{ items: Automation2Workflow[]; pagination: any; }'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(121,14): error TS7006: Parameter 'w' implicitly has an 'any' type.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(376,47): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(391,38): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(476,83): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(486,29): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(600,39): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(634,22): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(648,33): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(648,83): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(855,41): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(855,94): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(871,29): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(871,79): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(879,17): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(920,47): error TS2304: Cannot find name 't'.
-src/pages/views/graphicalEditor/GraphicalEditorWorkflowsTasksPage.tsx(926,47): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(368,58): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(368,110): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(485,44): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(492,19): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(507,31): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(507,64): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(527,40): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(533,26): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(557,19): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(567,32): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(574,46): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(574,85): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(588,32): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(595,46): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(595,85): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(614,39): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(614,72): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(621,48): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(657,46): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(667,35): error TS2304: Cannot find name 't'.
-src/pages/views/neutralization/NeutralizationView.tsx(682,50): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/ChatStream.tsx(16,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/pages/views/workspace/ChatStream.tsx(377,85): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/FilePreview.tsx(16,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/pages/views/workspace/FilePreview.tsx(102,91): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/NeutralizationPanel.tsx(4,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/pages/views/workspace/NeutralizationPanel.tsx(295,92): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/NeutralizationPanel.tsx(439,26): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/NeutralizationPanel.tsx(452,15): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/NeutralizationPanel.tsx(453,15): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/WorkspaceGeneralSettings.tsx(11,1): error TS6133: 'useLanguage' is declared but its value is never read.
-src/pages/views/workspace/WorkspaceGeneralSettings.tsx(69,18): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/WorkspaceGeneralSettings.tsx(83,18): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/WorkspaceGeneralSettings.tsx(97,45): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/WorkspaceGeneralSettings.tsx(104,39): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/WorkspaceGeneralSettings.tsx(132,24): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/WorkspaceGeneralSettings.tsx(153,19): error TS2304: Cannot find name 't'.
-src/pages/views/workspace/WorkspaceGeneralSettings.tsx(153,61): error TS2304: Cannot find name 't'.

From d8ff3a84d91362d992f073c10c2a95dc2815f346 Mon Sep 17 00:00:00 2001
From: ValueOn AG <p.motsch@valueon.ch>
Date: Sun, 26 Apr 2026 08:57:47 +0200
Subject: [PATCH 4/6] fixed user references

---
 .../FormGeneratorTable/FormGeneratorTable.tsx | 19 ++++++++++++-------
 .../realestate/RealEstateParcelsView.tsx      |  1 +
 .../realestate/RealEstateProjectsView.tsx     |  1 +
 .../views/trustee/TrusteeDocumentsView.tsx    |  1 +
 .../views/trustee/TrusteePositionsView.tsx    |  1 +
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
index 38efc96..71843d9 100644
--- a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
+++ b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
@@ -2138,6 +2138,9 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                               );
                             }
 
+                            const columnFilterValues = getUniqueValuesForColumn(column.key);
+                            const hasEmptyOption = columnFilterValues.some(v => v === null);
+
                             return (
                               <>
                                 <div
@@ -2146,12 +2149,14 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                                 >
                                   ({t('Alle')})
                                 </div>
-                                <div
-                                  className={`${styles.filterOption} ${filters[column.key] === null ? styles.filterOptionSelected : ''}`}
-                                  onClick={() => handleFilter(column.key, _EMPTY_FILTER_SENTINEL)}
-                                >
-                                  ({t('Leer')})
-                                </div>
+                                {hasEmptyOption && (
+                                  <div
+                                    className={`${styles.filterOption} ${filters[column.key] === null ? styles.filterOptionSelected : ''}`}
+                                    onClick={() => handleFilter(column.key, _EMPTY_FILTER_SENTINEL)}
+                                  >
+                                    ({t('Leer')})
+                                  </div>
+                                )}
                                 {filterValuesLoading[column.key] ? (
                                   <div className={styles.filterOptionMore} style={{ textAlign: 'center', padding: '8px' }}>
                                     {t('Lade Filterwerte...')}
@@ -2159,7 +2164,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                                 ) : (
                                   <FilterValuesList
                                     columnKey={column.key}
-                                    allValues={getUniqueValuesForColumn(column.key)}
+                                    allValues={columnFilterValues}
                                     activeFilter={filters[column.key]}
                                     onSelect={(value) => handleFilter(column.key, value)}
                                     resolveLabel={column.filterLabelResolver}
diff --git a/src/pages/views/realestate/RealEstateParcelsView.tsx b/src/pages/views/realestate/RealEstateParcelsView.tsx
index 174c50e..80fc0dd 100644
--- a/src/pages/views/realestate/RealEstateParcelsView.tsx
+++ b/src/pages/views/realestate/RealEstateParcelsView.tsx
@@ -64,6 +64,7 @@ export const RealEstateParcelsView: React.FC = () => {
       width: attr.width || 150,
       minWidth: attr.minWidth || 100,
       maxWidth: attr.maxWidth || 400,
+      displayField: (attr as any).displayField,
     }));
   }, [attributes]);
 
diff --git a/src/pages/views/realestate/RealEstateProjectsView.tsx b/src/pages/views/realestate/RealEstateProjectsView.tsx
index 07f425f..4d25a4b 100644
--- a/src/pages/views/realestate/RealEstateProjectsView.tsx
+++ b/src/pages/views/realestate/RealEstateProjectsView.tsx
@@ -62,6 +62,7 @@ export const RealEstateProjectsView: React.FC = () => {
       width: attr.width || 150,
       minWidth: attr.minWidth || 100,
       maxWidth: attr.maxWidth || 400,
+      displayField: (attr as any).displayField,
     }));
   }, [attributes]);
 
diff --git a/src/pages/views/trustee/TrusteeDocumentsView.tsx b/src/pages/views/trustee/TrusteeDocumentsView.tsx
index 90ca654..4bbdd3b 100644
--- a/src/pages/views/trustee/TrusteeDocumentsView.tsx
+++ b/src/pages/views/trustee/TrusteeDocumentsView.tsx
@@ -77,6 +77,7 @@ export const TrusteeDocumentsView: React.FC = () => {
       width: attr.width || 150,
       minWidth: attr.minWidth || 100,
       maxWidth: attr.maxWidth || 400,
+      displayField: attr.displayField,
     }));
     const byKey = new Map(allCols.map(c => [c.key, c]));
     const ordered: typeof allCols = [];
diff --git a/src/pages/views/trustee/TrusteePositionsView.tsx b/src/pages/views/trustee/TrusteePositionsView.tsx
index 3fedbf7..66122c2 100644
--- a/src/pages/views/trustee/TrusteePositionsView.tsx
+++ b/src/pages/views/trustee/TrusteePositionsView.tsx
@@ -292,6 +292,7 @@ export const TrusteePositionsView: React.FC = () => {
           width: attr.width || 150,
           minWidth: attr.minWidth || 100,
           maxWidth: attr.maxWidth || 400,
+          displayField: attr.displayField,
         };
         if (amountFields.has(attr.name)) {
           col.formatter = (v: unknown) => formatAmount(v);

From 8679cdffcb8a92858294d5496a4ef68aa515ec9f Mon Sep 17 00:00:00 2001
From: ValueOn AG <p.motsch@valueon.ch>
Date: Sun, 26 Apr 2026 18:11:52 +0200
Subject: [PATCH 5/6] datamodel sctirc fk logic in one place

---
 src/api/attributesApi.ts                      |   5 +-
 src/api/billingApi.ts                         |   2 +-
 .../FlowEditor/nodes/form/FormNodeConfig.tsx  | 122 +-----
 .../nodes/frontendTypeRenderers/index.tsx     |  15 +-
 .../nodes/shared/RefSourceSelect.tsx          |   2 -
 .../nodes/shared/clickupFormSync.ts           | 294 -------------
 .../FlowEditor/nodes/shared/types.ts          |  10 +-
 .../nodes/start/FormStartNodeConfig.tsx       |  49 +--
 .../FormGeneratorTable.module.css             | 185 ++++++--
 .../FormGeneratorTable/FormGeneratorTable.tsx | 408 ++++++++++++++----
 .../PeriodPicker/PeriodPickerPopover.tsx      |  32 +-
 src/hooks/useInvitations.ts                   |   4 +-
 src/hooks/useMandates.ts                      |  30 +-
 src/pages/AutomationsDashboardPage.tsx        |  47 +-
 src/pages/ComplianceAuditPage.tsx             | 145 +++++--
 src/pages/admin/AdminFeatureAccessPage.tsx    |  31 +-
 .../admin/AdminFeatureInstanceUsersPage.tsx   |  27 +-
 src/pages/admin/AdminFeatureRolesPage.tsx     |  60 ++-
 src/pages/admin/AdminInvitationsPage.tsx      | 108 ++---
 src/pages/admin/AdminLanguagesPage.tsx        |  90 ++--
 src/pages/admin/AdminMandateRolesPage.tsx     |  63 +--
 src/pages/admin/AdminUserMandatesPage.tsx     | 119 +++--
 src/pages/admin/AdminUsersPage.tsx            |   7 +-
 src/pages/basedata/ConnectionsPage.tsx        |  12 +-
 src/pages/basedata/FilesPage.tsx              |   5 +-
 src/pages/basedata/PromptsPage.tsx            |   5 +-
 src/pages/billing/AdminSubscriptionsPage.tsx  |  55 ++-
 src/pages/billing/BillingDataView.tsx         |  38 +-
 src/pages/billing/BillingMandateView.tsx      |   2 +-
 src/pages/billing/BillingTransactions.tsx     |   2 +-
 src/pages/billing/BillingUserView.tsx         |   2 +-
 .../GraphicalEditorTemplatesPage.tsx          |  23 +-
 .../GraphicalEditorWorkflowsPage.tsx          |  29 +-
 .../realestate/RealEstateParcelsView.tsx      |   5 +-
 .../realestate/RealEstateProjectsView.tsx     |   5 +-
 .../views/trustee/TrusteeDocumentsView.tsx    |   4 +-
 .../trustee/TrusteePositionDocumentsView.tsx  |   5 +-
 .../views/trustee/TrusteePositionsView.tsx    |   4 +-
 .../trustee/dataTables/TrusteeDataTab.tsx     |   5 +-
 src/utils/attributeTypeMapper.ts              |  37 +-
 src/utils/columnTypeResolver.ts               |  57 +++
 41 files changed, 1220 insertions(+), 930 deletions(-)
 delete mode 100644 src/components/FlowEditor/nodes/shared/clickupFormSync.ts
 create mode 100644 src/utils/columnTypeResolver.ts

diff --git a/src/api/attributesApi.ts b/src/api/attributesApi.ts
index 1776fb9..b01f5b9 100644
--- a/src/api/attributesApi.ts
+++ b/src/api/attributesApi.ts
@@ -1,4 +1,7 @@
 import { ApiRequestOptions } from '../hooks/useApi';
+import type { AttributeType } from '../utils/attributeTypeMapper';
+
+export type { AttributeType };
 
 // ============================================================================
 // TYPES & INTERFACES
@@ -7,7 +10,7 @@ import { ApiRequestOptions } from '../hooks/useApi';
 export interface AttributeDefinition {
   name: string;
   label: string;
-  type: 'string' | 'number' | 'date' | 'boolean' | 'enum' | 'text' | 'email' | 'checkbox' | 'select' | 'multiselect' | 'textarea';
+  type: AttributeType;
   sortable?: boolean;
   filterable?: boolean;
   searchable?: boolean;
diff --git a/src/api/billingApi.ts b/src/api/billingApi.ts
index 930749d..cc05e44 100644
--- a/src/api/billingApi.ts
+++ b/src/api/billingApi.ts
@@ -29,7 +29,7 @@ export interface BillingTransaction {
   aicoreProvider?: string;
   aicoreModel?: string;
   createdByUserId?: string;
-  createdAt?: string;
+  sysCreatedAt?: string;
   mandateId?: string;
   mandateName?: string;
   userId?: string;
diff --git a/src/components/FlowEditor/nodes/form/FormNodeConfig.tsx b/src/components/FlowEditor/nodes/form/FormNodeConfig.tsx
index 3bb88f5..fbb8dc3 100644
--- a/src/components/FlowEditor/nodes/form/FormNodeConfig.tsx
+++ b/src/components/FlowEditor/nodes/form/FormNodeConfig.tsx
@@ -2,45 +2,17 @@
  * Form node config - draggable fields, types, required toggle
  */
 
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import { FaGripVertical, FaTimes } from 'react-icons/fa';
 import type { FormField, NodeConfigRendererProps } from '../shared/types';
-import { fetchConnections, type UserConnection } from '../../../../api/workflowApi';
+import { FORM_FIELD_TYPES, FORM_FIELD_TYPE_LABELS } from '../../../../utils/attributeTypeMapper';
 import styles from '../../editor/Automation2FlowEditor.module.css';
 
 import { useLanguage } from '../../../../providers/language/LanguageContext';
 
-export const FormNodeConfig: React.FC<NodeConfigRendererProps> = ({ params,
-  updateParam,
-  instanceId,
-  request,
-}) => {
+export const FormNodeConfig: React.FC<NodeConfigRendererProps> = ({ params, updateParam }) => {
   const { t } = useLanguage();
   const fields = (params.fields as FormField[]) ?? [];
-  const [connections, setConnections] = useState<UserConnection[]>([]);
-  const [connectionsLoading, setConnectionsLoading] = useState(false);
-
-  useEffect(() => {
-    if (!instanceId || !request) {
-      setConnections([]);
-      return;
-    }
-    let cancelled = false;
-    setConnectionsLoading(true);
-    fetchConnections(request, instanceId)
-      .then((rows) => {
-        if (!cancelled) setConnections(rows.filter((c) => c.authority === 'clickup'));
-      })
-      .catch(() => {
-        if (!cancelled) setConnections([]);
-      })
-      .finally(() => {
-        if (!cancelled) setConnectionsLoading(false);
-      });
-    return () => {
-      cancelled = true;
-    };
-  }, [instanceId, request]);
 
   const moveField = (fromIndex: number, toIndex: number) => {
     if (fromIndex < 0 || toIndex < 0 || fromIndex >= fields.length || toIndex >= fields.length) return;
@@ -108,33 +80,17 @@ export const FormNodeConfig: React.FC<NodeConfigRendererProps> = ({ params,
             </div>
             <div className={styles.formFieldRowFooter}>
               <select
-                value={f.type ?? 'string'}
+                value={f.type ?? 'text'}
                 onChange={(e) => {
                   const next = [...fields];
-                  const fieldType = e.target.value;
-                  next[i] = {
-                    ...next[i],
-                    type: fieldType,
-                    ...(fieldType === 'clickup_tasks'
-                      ? { clickupStatusOptions: undefined }
-                      : fieldType === 'clickup_status'
-                        ? { clickupConnectionId: undefined, clickupListId: undefined }
-                        : {
-                            clickupConnectionId: undefined,
-                            clickupListId: undefined,
-                            clickupStatusOptions: undefined,
-                          }),
-                  };
+                  next[i] = { name: f.name, label: f.label, type: e.target.value as FormField['type'], required: f.required };
                   updateParam('fields', next);
                 }}
                 style={{ width: 'auto', minWidth: 90 }}
               >
-                <option value="string">{t('Text')}</option>
-                <option value="number">{t('Zahl')}</option>
-                <option value="date">{t('Datum')}</option>
-                <option value="boolean">{t('Kontrollkästchen')}</option>
-                <option value="clickup_tasks">{t('ClickUp-Aufgabe Referenz')}</option>
-                <option value="clickup_status">{t('ClickUp-Status Liste')}</option>
+                {FORM_FIELD_TYPES.map(ft => (
+                  <option key={ft} value={ft}>{t(FORM_FIELD_TYPE_LABELS[ft])}</option>
+                ))}
               </select>
               <label className={styles.formFieldRequiredLabel}>
                 <input
@@ -157,72 +113,12 @@ export const FormNodeConfig: React.FC<NodeConfigRendererProps> = ({ params,
                 <FaTimes />
               </button>
             </div>
-            {f.type === 'clickup_status' ? (
-              <div style={{ marginTop: 8, paddingLeft: 4, width: '100%', fontSize: '0.8rem', color: 'var(--text-secondary, #666)' }}>
-                {Array.isArray(f.clickupStatusOptions) && f.clickupStatusOptions.length > 0 ? (
-                  <p style={{ margin: '0 0 6px' }}>
-                    {t(
-                      'Dropdown mit {count} Status aus der ClickUp-Liste (Wert = exakter Status-Name für die API).',
-                      { count: String(f.clickupStatusOptions.length) }
-                    )}
-                  </p>
-                ) : (
-                  <p style={{ margin: '0 0 6px' }}>
-                    {t(
-                      'Keine Optionen — im ClickUp-Knoten „Aufgabe erstellen“ Liste wählen und „Formular mit Liste abgleichen“.'
-                    )}
-                  </p>
-                )}
-              </div>
-            ) : null}
-            {f.type === 'clickup_tasks' ? (
-              <div style={{ marginTop: 8, paddingLeft: 4, width: '100%' }}>
-                <label style={{ display: 'block', fontSize: '0.8rem', marginBottom: 4 }}>
-                  {t('ClickUp-Verbindung')}
-                </label>
-                <select
-                  value={f.clickupConnectionId ?? ''}
-                  onChange={(e) => {
-                    const next = [...fields];
-                    next[i] = { ...next[i], clickupConnectionId: e.target.value };
-                    updateParam('fields', next);
-                  }}
-                  disabled={connectionsLoading || !instanceId}
-                  style={{ width: '100%', marginBottom: 8 }}
-                >
-                  <option value="">{connectionsLoading ? t('Lade…') : t('Verbindung wählen…')}</option>
-                  {connections.map((c) => (
-                    <option key={c.id} value={c.id}>
-                      {c.externalUsername ?? c.id}
-                    </option>
-                  ))}
-                </select>
-                <label style={{ display: 'block', fontSize: '0.8rem', marginBottom: 4 }}>
-                  {t('Listen-ID (verknüpfte Liste / Ziel-Liste)')}
-                </label>
-                <input
-                  placeholder={t('z.B. aus ClickUp-URL: list/123456789')}
-                  value={f.clickupListId ?? ''}
-                  onChange={(e) => {
-                    const next = [...fields];
-                    next[i] = { ...next[i], clickupListId: e.target.value };
-                    updateParam('fields', next);
-                  }}
-                  style={{ width: '100%' }}
-                />
-                <p style={{ fontSize: '0.75rem', color: 'var(--text-secondary, #666)', marginTop: 6 }}>
-                  {t('Liefert beim Ausfüllen denselben Wert wie ein ClickUp-Relationship-Feld:')}{' '}
-                  <code>{'{ add: [taskId], rem: [] }'}</code>{' '}
-                  {t('— im ClickUp-Node per Datenquelle auf das Formularfeld mappen.')}
-                </p>
-              </div>
-            ) : null}
           </div>
         ))}
         <button
           type="button"
           onClick={() =>
-            updateParam('fields', [...fields, { name: '', type: 'string', label: '', required: false }])
+            updateParam('fields', [...fields, { name: '', type: 'text', label: '', required: false }])
           }
         >
           + {t('Feld')}
diff --git a/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx b/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx
index fb33a03..595850f 100644
--- a/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx
+++ b/src/components/FlowEditor/nodes/frontendTypeRenderers/index.tsx
@@ -6,6 +6,7 @@
 import type { ComponentType } from 'react';
 import type { NodeTypeParameter } from '../../../../api/workflowApi';
 import type { ApiRequestFunction } from '../../../../api/workflowApi';
+import { FORM_FIELD_TYPES, FORM_FIELD_TYPE_LABELS } from '../../../../utils/attributeTypeMapper';
 
 export interface FieldRendererProps {
   param: NodeTypeParameter;
@@ -547,12 +548,9 @@ const FieldBuilderEditor: React.FC<FieldRendererProps> = ({ param, value, onChan
         <div key={i} style={{ display: 'flex', gap: 4, marginBottom: 4, alignItems: 'center' }}>
           <input type="text" placeholder={t('Name')} value={String(f.name ?? '')} onChange={(e) => updateField(i, 'name', e.target.value)} style={{ flex: 1, padding: '2px 4px', borderRadius: 4, border: '1px solid #ccc' }} />
           <select value={String(f.type ?? 'text')} onChange={(e) => updateField(i, 'type', e.target.value)} style={{ flex: 1, padding: '2px 4px', borderRadius: 4, border: '1px solid #ccc' }}>
-            <option value="text">{t('Text')}</option>
-            <option value="number">{t('Zahl')}</option>
-            <option value="date">{t('Datum')}</option>
-            <option value="checkbox">{t('Kontrollkästchen')}</option>
-            <option value="select">{t('Auswahl')}</option>
-            <option value="textarea">{t('Mehrzeilig')}</option>
+            {FORM_FIELD_TYPES.map(ft => (
+              <option key={ft} value={ft}>{t(FORM_FIELD_TYPE_LABELS[ft])}</option>
+            ))}
             <option value="group">{t('Gruppe')}</option>
           </select>
           <input type="text" placeholder={t('Bezeichnung')} value={String(f.label ?? '')} onChange={(e) => updateField(i, 'label', e.target.value)} style={{ flex: 1, padding: '2px 4px', borderRadius: 4, border: '1px solid #ccc' }} />
@@ -585,8 +583,9 @@ const FieldBuilderEditor: React.FC<FieldRendererProps> = ({ param, value, onChan
                     }}
                     style={{ flex: 1, minWidth: 80, padding: '2px 4px', borderRadius: 4, border: '1px solid #ccc' }}
                   >
-                    <option value="text">{t('Text')}</option>
-                    <option value="number">{t('Zahl')}</option>
+                    {FORM_FIELD_TYPES.map(ft => (
+                      <option key={ft} value={ft}>{t(FORM_FIELD_TYPE_LABELS[ft])}</option>
+                    ))}
                   </select>
                   <button
                     type="button"
diff --git a/src/components/FlowEditor/nodes/shared/RefSourceSelect.tsx b/src/components/FlowEditor/nodes/shared/RefSourceSelect.tsx
index 62e8dc1..e1d39ff 100644
--- a/src/components/FlowEditor/nodes/shared/RefSourceSelect.tsx
+++ b/src/components/FlowEditor/nodes/shared/RefSourceSelect.tsx
@@ -358,8 +358,6 @@ function getFormFieldType(
   if (rawFieldType === 'email') return 'email';
   if (rawFieldType === 'date' || rawFieldType === 'datetime') return 'date';
   if (rawFieldType === 'boolean' || rawFieldType === 'checkbox') return 'boolean';
-  if (rawFieldType === 'clickup_tasks') return 'string';
-  if (rawFieldType === 'clickup_status') return 'string';
   return 'string';
 }
 
diff --git a/src/components/FlowEditor/nodes/shared/clickupFormSync.ts b/src/components/FlowEditor/nodes/shared/clickupFormSync.ts
deleted file mode 100644
index 5aab3d3..0000000
--- a/src/components/FlowEditor/nodes/shared/clickupFormSync.ts
+++ /dev/null
@@ -1,294 +0,0 @@
-/**
- * Sync input.form / trigger.form fields + ClickUp "Aufgabe erstellen" refs from a selected ClickUp list.
- */
-
-import type { CanvasConnection, CanvasNode } from '../../editor/FlowCanvas';
-import type { FormField } from './types';
-import { createRef } from './dataRef';
-
-export type ClickUpFieldLike = Record<string, unknown>;
-
-function buildReverseAdjacency(connections: CanvasConnection[]): Record<string, string[]> {
-  const rev: Record<string, string[]> = {};
-  for (const c of connections) {
-    if (!rev[c.targetId]) rev[c.targetId] = [];
-    rev[c.targetId].push(c.sourceId);
-  }
-  return rev;
-}
-
-/** Nearest form node upstream (toward triggers) of the ClickUp node. */
-export function findClosestUpstreamFormNode(
-  targetNodeId: string,
-  nodes: CanvasNode[],
-  connections: CanvasConnection[]
-): CanvasNode | null {
-  const nodeById = new Map(nodes.map((n) => [n.id, n]));
-  const rev = buildReverseAdjacency(connections);
-  const queue: string[] = [...(rev[targetNodeId] ?? [])];
-  const visited = new Set<string>();
-  while (queue.length > 0) {
-    const nid = queue.shift()!;
-    if (visited.has(nid)) continue;
-    visited.add(nid);
-    const n = nodeById.get(nid);
-    if (!n) continue;
-    if (n.type === 'input.form' || n.type === 'trigger.form') return n;
-    for (const p of rev[nid] ?? []) {
-      if (!visited.has(p)) queue.push(p);
-    }
-  }
-  return null;
-}
-
-export function normalizeClickUpFieldType(raw: unknown): string {
-  return String(raw ?? 'short_text')
-    .trim()
-    .toLowerCase()
-    .replace(/-/g, '_')
-    .replace(/\s+/g, '_');
-}
-
-function linkedListIdFromRelationshipField(field: ClickUpFieldLike): string | null {
-  const tc = (field.type_config ?? {}) as Record<string, unknown>;
-  const asId = (v: unknown): string | null => {
-    if (typeof v === 'string' && v.trim()) return v.trim();
-    if (typeof v === 'number' && Number.isFinite(v)) return String(v);
-    return null;
-  };
-  const keys = [
-    'linked_list_id',
-    'list_id',
-    'related_list_id',
-    'relationship_list_id',
-    'resource_id',
-  ];
-  for (const k of keys) {
-    const raw = tc[k];
-    const id = asId(raw);
-    if (id) return id;
-    if (raw && typeof raw === 'object' && raw !== null) {
-      const nested = asId((raw as Record<string, unknown>).id);
-      if (nested) return nested;
-    }
-  }
-  const rel = tc.relationship;
-  if (rel && typeof rel === 'object' && rel !== null) {
-    const r = rel as Record<string, unknown>;
-    const fromRel = asId(r.list_id ?? r.id ?? r.target_id ?? r.linked_list_id ?? r.resource_id);
-    if (fromRel) return fromRel;
-  }
-  return null;
-}
-
-function fieldUnsupported(ft: string): boolean {
-  return ['tasks', 'user', 'users'].includes(ft);
-}
-
-function mapCuToInputFormField(
-  field: ClickUpFieldLike,
-  connectionId: string,
-  parentListId: string
-): FormField | null {
-  const fid = String(field.id ?? '');
-  if (!fid) return null;
-  const fname = String(field.name ?? fid);
-  const ft = normalizeClickUpFieldType(field.type);
-  if (fieldUnsupported(ft)) return null;
-  const name = `cf_${fid.replace(/[^a-zA-Z0-9_]/g, '_')}`;
-  const label = fname || name;
-
-  if (ft === 'list_relationship') {
-    const lid = linkedListIdFromRelationshipField(field) ?? parentListId;
-    return {
-      name,
-      label,
-      type: 'clickup_tasks',
-      required: false,
-      clickupConnectionId: connectionId,
-      clickupListId: lid,
-    };
-  }
-  if (
-    ft === 'drop_down' ||
-    ft === 'dropdown' ||
-    ft === 'text' ||
-    ft === 'long_text' ||
-    ft === 'short_text' ||
-    ft === 'email' ||
-    ft === 'phone' ||
-    ft === 'url'
-  ) {
-    return { name, label, type: 'string', required: false };
-  }
-  if (ft === 'number' || ft === 'currency') {
-    return { name, label, type: 'number', required: false };
-  }
-  if (ft === 'date') {
-    return { name, label, type: 'date', required: false };
-  }
-  if (ft === 'checkbox') {
-    return { name, label, type: 'boolean', required: false };
-  }
-  return { name, label, type: 'string', required: false };
-}
-
-/** trigger.form row; `clickup_status` carries options from the same list API as the ClickUp node dropdown. */
-export type TriggerFormFieldRow = {
-  name: string;
-  label: string;
-  type: 'text' | 'number' | 'email' | 'date' | 'boolean' | 'clickup_status';
-  statusOptions?: Array<{ value: string; label: string }>;
-};
-
-function mapCuToTriggerFormField(field: ClickUpFieldLike, _connectionId: string, _parentListId: string): TriggerFormFieldRow | null {
-  const fid = String(field.id ?? '');
-  if (!fid) return null;
-  const fname = String(field.name ?? fid);
-  const ft = normalizeClickUpFieldType(field.type);
-  if (fieldUnsupported(ft)) return null;
-  const name = `cf_${fid.replace(/[^a-zA-Z0-9_]/g, '_')}`;
-  const label = fname || name;
-  if (ft === 'list_relationship') {
-    return { name, label, type: 'text' };
-  }
-  if (ft === 'number' || ft === 'currency') {
-    return { name, label, type: 'number' };
-  }
-  if (ft === 'date') {
-    return { name, label, type: 'date' };
-  }
-  if (ft === 'checkbox') {
-    return { name, label, type: 'boolean' };
-  }
-  if (ft === 'email') {
-    return { name, label, type: 'email' };
-  }
-  return { name, label, type: 'text' };
-}
-
-export const PAYLOAD_TITLE = 'title';
-export const PAYLOAD_DESCRIPTION = 'description';
-export const PAYLOAD_STATUS = 'clickup_status';
-export const PAYLOAD_PRIORITY = 'clickup_priority';
-export const PAYLOAD_DUE = 'clickup_due_date';
-export const PAYLOAD_TIME_H = 'clickup_time_estimate_h';
-
-/** Same ordering as ClickUp list `statuses` (GET /list/{id}). */
-export function statusOptionsFromListStatuses(
-  listStatuses: Array<{ status: string; orderindex: number }>
-): Array<{ value: string; label: string }> {
-  return [...listStatuses]
-    .sort((a, b) => a.orderindex - b.orderindex)
-    .map((s) => ({ value: s.status, label: s.status }));
-}
-
-export interface SyncFromListResult {
-  inputFormFields: FormField[];
-  triggerFormFields: TriggerFormFieldRow[];
-  clickupPatch: Record<string, unknown>;
-}
-
-/**
- * Build form field rows + ClickUp createTask parameter patch (refs → payload.*).
- */
-export function buildSyncFromClickUpList(args: {
-  formNodeId: string;
-  listFields: ClickUpFieldLike[];
-  /** From GET /list/{id} → list.statuses (same source as the ClickUp node status dropdown). */
-  listStatuses: Array<{ status: string; orderindex: number }>;
-  connectionId: string;
-  teamId: string;
-  listId: string;
-}): SyncFromListResult {
-  const { formNodeId, listFields, listStatuses, connectionId, teamId, listId } = args;
-  const ref = (key: string) => createRef(formNodeId, ['payload', key]);
-
-  const statusOpts = statusOptionsFromListStatuses(listStatuses);
-
-  const standardInput: FormField[] = [
-    { name: PAYLOAD_TITLE, label: 'Titel', type: 'string', required: true },
-    { name: PAYLOAD_DESCRIPTION, label: 'Beschreibung', type: 'string', required: false },
-    ...(statusOpts.length > 0
-      ? [
-          {
-            name: PAYLOAD_STATUS,
-            label: 'Status',
-            type: 'clickup_status',
-            required: false,
-            clickupStatusOptions: statusOpts,
-          } as FormField,
-        ]
-      : []),
-    { name: PAYLOAD_PRIORITY, label: 'Priorität (1–4)', type: 'number', required: false },
-    { name: PAYLOAD_DUE, label: 'Fälligkeit', type: 'date', required: false },
-    { name: PAYLOAD_TIME_H, label: 'Zeitschätzung (Stunden)', type: 'number', required: false },
-  ];
-
-  const statusTriggerRow: TriggerFormFieldRow | null =
-    statusOpts.length > 0
-      ? {
-          name: PAYLOAD_STATUS,
-          label: 'Status',
-          type: 'clickup_status',
-          statusOptions: statusOpts,
-        }
-      : null;
-
-  const standardTrigger: TriggerFormFieldRow[] = [
-    { name: PAYLOAD_TITLE, label: 'Titel', type: 'text' },
-    { name: PAYLOAD_DESCRIPTION, label: 'Beschreibung', type: 'text' },
-    ...(statusTriggerRow ? [statusTriggerRow] : []),
-    { name: PAYLOAD_PRIORITY, label: 'Priorität (1–4)', type: 'number' },
-    { name: PAYLOAD_DUE, label: 'Fälligkeit', type: 'date' },
-    { name: PAYLOAD_TIME_H, label: 'Zeitschätzung (Stunden)', type: 'number' },
-  ];
-  if (statusOpts.length > 0) {
-    standardTrigger.splice(2, 0, {
-      name: PAYLOAD_STATUS,
-      label: 'Status',
-      type: 'clickup_status',
-      statusOptions: statusOpts,
-    });
-  }
-
-  const customInput: FormField[] = [];
-  const customTrigger: TriggerFormFieldRow[] = [];
-  const customRefs: Record<string, unknown> = {};
-
-  for (const f of listFields) {
-    if (!f || typeof f !== 'object') continue;
-    const inf = mapCuToInputFormField(f as ClickUpFieldLike, connectionId, listId);
-    const tr = mapCuToTriggerFormField(f as ClickUpFieldLike, connectionId, listId);
-    if (inf) customInput.push(inf);
-    if (tr) customTrigger.push(tr);
-    const fid = String((f as ClickUpFieldLike).id ?? '');
-    const payloadKey = inf?.name;
-    if (fid && payloadKey) {
-      customRefs[fid] = createRef(formNodeId, ['payload', payloadKey]);
-    }
-  }
-
-  const inputFormFields = [...standardInput, ...customInput];
-  const triggerFormFields = [...standardTrigger, ...customTrigger];
-
-  const clickupPatch: Record<string, unknown> = {
-    connectionId,
-    teamId,
-    listId,
-    path: `/team/${teamId}/list/${listId}`,
-    name: ref(PAYLOAD_TITLE),
-    description: ref(PAYLOAD_DESCRIPTION),
-    taskPriority: ref(PAYLOAD_PRIORITY),
-    taskDueDateMs: ref(PAYLOAD_DUE),
-    taskTimeEstimateHours: ref(PAYLOAD_TIME_H),
-  };
-  if (statusOpts.length > 0) {
-    clickupPatch.taskStatus = ref(PAYLOAD_STATUS);
-  }
-  if (Object.keys(customRefs).length) {
-    clickupPatch.customFieldValues = customRefs;
-  }
-
-  return { inputFormFields, triggerFormFields, clickupPatch };
-}
diff --git a/src/components/FlowEditor/nodes/shared/types.ts b/src/components/FlowEditor/nodes/shared/types.ts
index 7113d59..44e4ba0 100644
--- a/src/components/FlowEditor/nodes/shared/types.ts
+++ b/src/components/FlowEditor/nodes/shared/types.ts
@@ -3,17 +3,15 @@
  */
 
 import type { ApiRequestFunction } from '../../../../api/workflowApi';
+import type { AttributeType } from '../../../../utils/attributeTypeMapper';
 
-/** input.form / trigger.form field row. `clickup_tasks` needs connection + list id; value at runtime is `{ add: [taskId], rem: [] }` (ClickUp relationship). */
+/** input.form / trigger.form field row. */
 export type FormField = {
   name?: string;
-  type?: string;
+  type?: AttributeType;
   label?: string;
   required?: boolean;
-  clickupConnectionId?: string;
-  clickupListId?: string;
-  /** ClickUp list status names from GET /list/{id} — only for type `clickup_status`. */
-  clickupStatusOptions?: Array<{ value: string; label: string }>;
+  options?: Array<{ value: string; label: string }>;
 };
 
 export interface NodeConfigRendererProps {
diff --git a/src/components/FlowEditor/nodes/start/FormStartNodeConfig.tsx b/src/components/FlowEditor/nodes/start/FormStartNodeConfig.tsx
index 57cb7da..44cccdc 100644
--- a/src/components/FlowEditor/nodes/start/FormStartNodeConfig.tsx
+++ b/src/components/FlowEditor/nodes/start/FormStartNodeConfig.tsx
@@ -4,40 +4,23 @@
 
 import React, { useMemo } from 'react';
 import type { NodeConfigRendererProps } from '../shared/types';
+import type { FormField } from '../shared/types';
+import { FORM_FIELD_TYPES, FORM_FIELD_TYPE_LABELS } from '../../../../utils/attributeTypeMapper';
 import styles from '../../editor/Automation2FlowEditor.module.css';
 
 import { useLanguage } from '../../../../providers/language/LanguageContext';
 
-type FormField = {
-  name: string;
-  label: string;
-  type: 'text' | 'number' | 'email' | 'date' | 'boolean' | 'clickup_status';
-  statusOptions?: Array<{ value: string; label: string }>;
-};
-
-const FORM_FIELD_TYPES = ['text', 'number', 'email', 'date', 'boolean', 'clickup_status'] as const;
-
 function _parseFields(params: Record<string, unknown>, t: (key: string) => string): FormField[] {
   const raw = params.formFields;
   if (!Array.isArray(raw)) return [{ name: 'field1', label: t('Feld 1'), type: 'text' }];
   return raw.map((f, i) => {
     if (f && typeof f === 'object' && !Array.isArray(f)) {
       const o = f as Record<string, unknown>;
-      const fieldType = String(o.type ?? 'text');
+      const rawType = String(o.type ?? 'text');
       const name = String(o.name ?? `field${i + 1}`);
       const label = String(o.label ?? `${t('Feld')} ${i + 1}`);
-      const type = (
-        FORM_FIELD_TYPES.includes(fieldType as (typeof FORM_FIELD_TYPES)[number]) ? fieldType : 'text'
-      ) as FormField['type'];
-      if (type === 'clickup_status' && Array.isArray(o.statusOptions)) {
-        return {
-          name,
-          label,
-          type: 'clickup_status',
-          statusOptions: o.statusOptions as Array<{ value: string; label: string }>,
-        };
-      }
-      return { name, label, type };
+      const type = (FORM_FIELD_TYPES as readonly string[]).includes(rawType) ? rawType : 'text';
+      return { name, label, type } as FormField;
     }
     return { name: `field${i + 1}`, label: `${t('Feld')} ${i + 1}`, type: 'text' as const };
   });
@@ -64,7 +47,7 @@ export const FormStartNodeConfig: React.FC<NodeConfigRendererProps> = ({ params,
             <input
               className={styles.startsInput}
               placeholder={t('Name (Payload-Key)')}
-              value={f.name}
+              value={f.name ?? ''}
               onChange={(e) => {
                 const next = [...fields];
                 next[idx] = { ...f, name: e.target.value };
@@ -74,7 +57,7 @@ export const FormStartNodeConfig: React.FC<NodeConfigRendererProps> = ({ params,
             <input
               className={styles.startsInput}
               placeholder={t('Beschriftung')}
-              value={f.label}
+              value={f.label ?? ''}
               onChange={(e) => {
                 const next = [...fields];
                 next[idx] = { ...f, label: e.target.value };
@@ -83,24 +66,16 @@ export const FormStartNodeConfig: React.FC<NodeConfigRendererProps> = ({ params,
             />
             <select
               className={styles.startsSelect}
-              value={f.type}
+              value={f.type ?? 'text'}
               onChange={(e) => {
                 const next = [...fields];
-                const fieldType = e.target.value as FormField['type'];
-                if (fieldType === 'clickup_status') {
-                  next[idx] = { name: f.name, label: f.label, type: 'clickup_status', statusOptions: f.statusOptions };
-                } else {
-                  next[idx] = { name: f.name, label: f.label, type: fieldType };
-                }
+                next[idx] = { name: f.name, label: f.label, type: e.target.value as FormField['type'] };
                 setFields(next);
               }}
             >
-              <option value="text">{t('Text')}</option>
-              <option value="number">{t('Zahl')}</option>
-              <option value="email">{t('E-Mail')}</option>
-              <option value="date">{t('Datum')}</option>
-              <option value="boolean">{t('Ja/Nein')}</option>
-              <option value="clickup_status">{t('ClickUp-Status Liste')}</option>
+              {FORM_FIELD_TYPES.map(ft => (
+                <option key={ft} value={ft}>{t(FORM_FIELD_TYPE_LABELS[ft])}</option>
+              ))}
             </select>
             <button
               type="button"
diff --git a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.module.css b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.module.css
index bfb9c1f..274fe2c 100644
--- a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.module.css
+++ b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.module.css
@@ -133,20 +133,26 @@
 }
 
 .table thead tr {
-  background: var(--table-header-bg, #f8f9fa);
+  background: var(--table-header-bg, #edf0f5);
 }
 
 .th {
-  background: var(--table-header-bg, #f8f9fa);
+  background: var(--table-header-bg, #edf0f5);
   padding: 10px 12px;
   text-align: left;
   font-weight: 600;
-  font-size: 13px;
-  color: var(--color-text-secondary, #64748b);
+  font-size: 11px;
+  letter-spacing: 0.02em;
+  color: var(--color-text-secondary, #475569);
   white-space: nowrap;
   overflow: visible;
   user-select: none;
-  border-bottom: 2px solid var(--color-border, #e2e8f0);
+  border-bottom: 2px solid rgba(124, 109, 216, 0.35);
+  border-right: 1px solid #dde2ea;
+}
+
+.th:last-child {
+  border-right: none;
 }
 
 .th.actionsColumn {
@@ -159,14 +165,13 @@
 }
 
 .th.sortable:hover {
-  background: #eef0f3;
+  background: #e4e8ef;
   color: var(--color-text, #334155);
 }
 
 .headerContent {
   display: flex;
   align-items: center;
-  justify-content: left;
   gap: 4px;
 }
 
@@ -230,8 +235,8 @@
   position: absolute;
   top: 100%;
   left: 0;
-  min-width: 180px;
-  max-width: 300px;
+  min-width: 200px;
+  max-width: 320px;
   background: var(--color-bg);
   border: 1px solid var(--color-border, #e2e8f0);
   border-radius: 8px;
@@ -303,6 +308,116 @@
   font-style: italic;
 }
 
+/* Numeric column filter (operator + value / range) */
+.filterNumericPanel {
+  padding: 6px 8px 8px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.filterNumericRow {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.filterNumericLabel {
+  font-size: 11px;
+  font-weight: 500;
+  color: var(--color-text-secondary, #64748b);
+}
+
+.filterOperatorSelect,
+.filterNumericInput {
+  width: 100%;
+  padding: 6px 8px;
+  font-size: 13px;
+  font-family: var(--font-family);
+  border: 1px solid var(--color-border, #e2e8f0);
+  border-radius: 6px;
+  background: var(--color-bg);
+  color: var(--color-text);
+  box-sizing: border-box;
+}
+
+.filterOperatorSelect:focus,
+.filterNumericInput:focus {
+  outline: none;
+  border-color: var(--color-secondary);
+  box-shadow: 0 0 0 2px rgba(var(--color-secondary-rgb), 0.15);
+}
+
+.filterNumericActions {
+  padding-top: 2px;
+}
+
+.filterApplyBtn {
+  width: 100%;
+  padding: 6px 10px;
+  font-size: 12px;
+  font-weight: 600;
+  font-family: var(--font-family);
+  cursor: pointer;
+  border: none;
+  border-radius: 6px;
+  background: var(--color-secondary);
+  color: #fff;
+}
+
+.filterApplyBtn:hover {
+  opacity: 0.92;
+}
+
+/* PeriodPicker wrapper inside filter dropdown (date columns).
+   Rendered as sibling to .filterDropdownOptions so the PeriodPicker
+   popover (position: absolute, ~720 px) is not clipped by overflow. */
+.filterDatePickerWrap {
+  padding: 6px 8px 8px;
+  overflow: visible;
+}
+.filterDatePickerWrap + .filterDropdownOptions {
+  display: none;
+}
+
+/* Date column filter (from / to) — legacy fallback */
+.filterDatePanel {
+  padding: 6px 8px 8px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.filterDateRow {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.filterDateLabel {
+  font-size: 11px;
+  font-weight: 500;
+  color: var(--color-text-secondary, #64748b);
+}
+
+.filterDateInput {
+  width: 100%;
+  padding: 6px 8px;
+  font-size: 12px;
+  font-family: var(--font-family);
+  border: 1px solid var(--color-border, #e2e8f0);
+  border-radius: 6px;
+  background: var(--color-bg);
+  color: var(--color-text);
+  box-sizing: border-box;
+}
+
+.filterDateInput:focus {
+  outline: none;
+  border-color: var(--color-secondary);
+  box-shadow: 0 0 0 2px rgba(var(--color-secondary-rgb), 0.15);
+}
+
 .resizeHandle {
   position: absolute;
   top: 0;
@@ -326,7 +441,8 @@
 /* Table cells */
 .td {
   padding: 8px 12px;
-  border-top: 1px solid var(--color-border, #f1f5f9);
+  border-top: 1px solid var(--color-border, #e5e9ef);
+  border-right: 1px solid #eef0f4;
   color: var(--color-text);
   font-weight: 400;
   font-size: 13px;
@@ -338,21 +454,27 @@
   overflow: visible;
 }
 
+.td:last-child {
+  border-right: none;
+}
+
 /* Rows */
 .tr {
-  transition: background-color 0.12s ease;
+  transition: background-color 0.12s ease, box-shadow 0.12s ease;
 }
 
 .tr:hover {
-  background: var(--color-gray-disabled, #f8fafc);
+  background: #f0f4ff;
+  box-shadow: inset 3px 0 0 0 var(--color-secondary);
 }
 
 .tr:nth-child(even) {
-  background: rgba(0, 0, 0, 0.015);
+  background: rgba(0, 0, 0, 0.025);
 }
 
 .tr:nth-child(even):hover {
-  background: var(--color-gray-disabled, #f8fafc);
+  background: #f0f4ff;
+  box-shadow: inset 3px 0 0 0 var(--color-secondary);
 }
 
 .tr.selected {
@@ -372,7 +494,7 @@
 }
 
 thead .selectColumn {
-  background: var(--table-header-bg, #f8f9fa);
+  background: var(--table-header-bg, #edf0f5);
 }
 
 tbody .selectColumn {
@@ -423,7 +545,7 @@ tbody .selectColumn {
 }
 
 thead .actionsColumn {
-  background: var(--table-header-bg, #f8f9fa);
+  background: var(--table-header-bg, #edf0f5);
 }
 
 tbody .actionsColumn {
@@ -708,7 +830,11 @@ tbody .actionsColumn {
     height: auto;
   }
 
-  .th,
+  .th {
+    padding: 6px 8px;
+    font-size: 10px;
+  }
+
   .td {
     padding: 6px 8px;
     font-size: 12px;
@@ -758,29 +884,40 @@ tbody .actionsColumn {
 /* Dark theme */
 @media (prefers-color-scheme: dark) {
   .table thead tr {
-    background: #2a2d31;
+    background: #2d3038;
   }
 
   .th {
-    background: #2a2d31;
-    border-bottom-color: rgba(255, 255, 255, 0.12);
+    background: #2d3038;
+    border-bottom: 2px solid rgba(124, 109, 216, 0.3);
+    border-right-color: rgba(255, 255, 255, 0.08);
+  }
+
+  .td {
+    border-right-color: rgba(255, 255, 255, 0.06);
   }
 
   thead .selectColumn,
   thead .actionsColumn {
-    background: #2a2d31;
+    background: #2d3038;
   }
 
   .th.sortable:hover {
-    background: #32363b;
+    background: #363a42;
   }
 
   .tr:hover {
-    background: rgba(255, 255, 255, 0.04);
+    background: rgba(124, 109, 216, 0.08);
+    box-shadow: inset 3px 0 0 0 var(--color-secondary);
   }
 
   .tr:nth-child(even) {
-    background: rgba(255, 255, 255, 0.02);
+    background: rgba(255, 255, 255, 0.03);
+  }
+
+  .tr:nth-child(even):hover {
+    background: rgba(124, 109, 216, 0.08);
+    box-shadow: inset 3px 0 0 0 var(--color-secondary);
   }
 
   .tr.selected {
diff --git a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
index 71843d9..d7303f8 100644
--- a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
+++ b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
@@ -31,7 +31,8 @@
  *   3. GET {apiEndpoint}?mode=filterValues&column=xxx&pagination={currentFilters}
  *   Cross-filtering is supported: changing a filter invalidates the cache,
  *   so re-opening another column's dropdown re-fetches with current filters.
- *   Boolean columns render as "Ja"/"Nein"; date columns render as range picker.
+ *   Boolean columns render as "Ja"/"Nein"; date columns render as range picker;
+ *   numeric columns render as operator + value (eq, gt, gte, lt, lte, between).
  *
  * BACKEND RESPONSE FORMAT (for refetch):
  *   { items: T[], pagination: PaginationMetadata | null }
@@ -53,7 +54,7 @@
  *
  * See useOrgUsers / AdminUsersPage for a full reference implementation.
  */
-import React, { useState, useMemo, useRef, useEffect, useCallback } from 'react';
+import React, { useState, useMemo, useRef, useEffect, useLayoutEffect, useCallback } from 'react';
 import type { IconType } from 'react-icons';
 import { useLanguage } from '../../../providers/language/LanguageContext';
 import styles from './FormGeneratorTable.module.css';
@@ -70,11 +71,14 @@ import { FormGeneratorControls } from '../FormGeneratorControls';
 import { CopyableTruncatedValue } from '../../UiComponents/CopyableTruncatedValue';
 import {
   isDateTimeType,
-  isCheckboxType
+  isCheckboxType,
+  isNumberType,
 } from '../../../utils/attributeTypeMapper';
 import type { AttributeType } from '../../../utils/attributeTypeMapper';
 import { FaFilter } from 'react-icons/fa';
 import api from '../../../api';
+import { PeriodPicker } from '../../PeriodPicker';
+import type { PeriodValue } from '../../PeriodPicker';
 
 /** A filter value can be a plain string, null (for empty/missing), or a
  *  {value, label} object returned by FK-aware filter-values endpoints. */
@@ -348,6 +352,188 @@ function FilterValuesList({
   );
 }
 
+/** PowerOn audit / booking timestamps stored as float (unix) but ``frontend_type`` is ``timestamp``. */
+function _auditTimestampColumnKey(key: string): boolean {
+  const k = key.toLowerCase();
+  const exact = new Set([
+    'syscreatedat', 'sysmodifiedat', 'createdat', 'updatedat', 'modifiedat',
+    'deletedat', 'syncedat', 'bookingdate', 'chartcachedat',
+  ]);
+  if (exact.has(k)) return true;
+  if (k.endsWith('timestamp')) return true;
+  return false;
+}
+
+type _NumericUiOp = 'eq' | 'gt' | 'gte' | 'lt' | 'lte' | 'between';
+
+function _parseNumericFilter(activeFilter: any): { op: _NumericUiOp; single: string; from: string; to: string } {
+  if (activeFilter === undefined || activeFilter === null || activeFilter === '') {
+    return { op: 'eq', single: '', from: '', to: '' };
+  }
+  if (typeof activeFilter === 'string' || typeof activeFilter === 'number') {
+    return { op: 'eq', single: String(activeFilter), from: '', to: '' };
+  }
+  if (typeof activeFilter === 'object' && activeFilter !== null && 'operator' in activeFilter) {
+    const opRaw = activeFilter.operator;
+    const val = activeFilter.value;
+    if (opRaw === 'between' && val && typeof val === 'object' && !Array.isArray(val)) {
+      return {
+        op: 'between',
+        single: '',
+        from: val.from != null ? String(val.from) : '',
+        to: val.to != null ? String(val.to) : '',
+      };
+    }
+    if (opRaw === 'equals' || opRaw === 'eq') {
+      return { op: 'eq', single: val != null && val !== '' ? String(val) : '', from: '', to: '' };
+    }
+    if (opRaw === 'gt' || opRaw === 'gte' || opRaw === 'lt' || opRaw === 'lte') {
+      return { op: opRaw, single: val != null && val !== '' ? String(val) : '', from: '', to: '' };
+    }
+  }
+  return { op: 'eq', single: '', from: '', to: '' };
+}
+
+/** Column filter UI for numeric types (operator + value / range). */
+function NumericFilterPanel({
+  columnKey,
+  activeFilter,
+  onFilter,
+  onClear,
+  t,
+}: {
+  columnKey: string;
+  activeFilter: any;
+  onFilter: (payload: { operator: string; value: any }, keepOpen?: boolean) => void;
+  onClear: () => void;
+  t: (key: string, params?: Record<string, string | number | boolean>) => string;
+}) {
+  const parsed = _parseNumericFilter(activeFilter);
+  const [op, setOp] = useState<_NumericUiOp>(parsed.op);
+  const [single, setSingle] = useState(parsed.single);
+  const [from, setFrom] = useState(parsed.from);
+  const [to, setTo] = useState(parsed.to);
+
+  useEffect(() => {
+    const p = _parseNumericFilter(activeFilter);
+    setOp(p.op);
+    setSingle(p.single);
+    setFrom(p.from);
+    setTo(p.to);
+  }, [columnKey, activeFilter]);
+
+  const _apply = () => {
+    if (op === 'between') {
+      const f = from.trim();
+      const t0 = to.trim();
+      if (!f && !t0) {
+        onClear();
+        return;
+      }
+      onFilter({ operator: 'between', value: { from: f, to: t0 } }, true);
+      return;
+    }
+    const trimmed = single.trim().replace(/'/g, '').replace(/\s/g, '');
+    if (trimmed === '') {
+      onClear();
+      return;
+    }
+    const n = Number(trimmed);
+    if (Number.isNaN(n)) {
+      return;
+    }
+    const apiOp = op === 'eq' ? 'equals' : op;
+    onFilter({ operator: apiOp, value: n }, true);
+  };
+
+  const hasActive = activeFilter !== undefined && activeFilter !== null && activeFilter !== '';
+
+  return (
+    <div className={styles.filterNumericPanel}>
+      <div
+        className={`${styles.filterOption} ${!hasActive ? styles.filterOptionSelected : ''}`}
+        onClick={onClear}
+      >
+        ({t('Alle')})
+      </div>
+      <div className={styles.filterNumericRow}>
+        <label className={styles.filterNumericLabel} htmlFor={`fg-num-op-${columnKey}`}>
+          {t('Vergleich')}
+        </label>
+        <select
+          id={`fg-num-op-${columnKey}`}
+          className={styles.filterOperatorSelect}
+          value={op}
+          onChange={(e) => setOp(e.target.value as _NumericUiOp)}
+          onClick={(e) => e.stopPropagation()}
+        >
+          <option value="eq">=</option>
+          <option value="gt">&gt;</option>
+          <option value="gte">≥</option>
+          <option value="lt">&lt;</option>
+          <option value="lte">≤</option>
+          <option value="between">{t('Zwischen')}</option>
+        </select>
+      </div>
+      {op === 'between' ? (
+        <>
+          <div className={styles.filterNumericRow}>
+            <label className={styles.filterNumericLabel} htmlFor={`fg-num-from-${columnKey}`}>
+              {t('Von')}
+            </label>
+            <input
+              id={`fg-num-from-${columnKey}`}
+              type="number"
+              className={styles.filterNumericInput}
+              value={from}
+              onChange={(e) => setFrom(e.target.value)}
+              onClick={(e) => e.stopPropagation()}
+            />
+          </div>
+          <div className={styles.filterNumericRow}>
+            <label className={styles.filterNumericLabel} htmlFor={`fg-num-to-${columnKey}`}>
+              {t('Bis')}
+            </label>
+            <input
+              id={`fg-num-to-${columnKey}`}
+              type="number"
+              className={styles.filterNumericInput}
+              value={to}
+              onChange={(e) => setTo(e.target.value)}
+              onClick={(e) => e.stopPropagation()}
+            />
+          </div>
+        </>
+      ) : (
+        <div className={styles.filterNumericRow}>
+          <label className={styles.filterNumericLabel} htmlFor={`fg-num-val-${columnKey}`}>
+            {t('Wert')}
+          </label>
+          <input
+            id={`fg-num-val-${columnKey}`}
+            type="number"
+            className={styles.filterNumericInput}
+            value={single}
+            onChange={(e) => setSingle(e.target.value)}
+            onKeyDown={(e) => {
+              if (e.key === 'Enter') {
+                e.preventDefault();
+                _apply();
+              }
+            }}
+            onClick={(e) => e.stopPropagation()}
+          />
+        </div>
+      )}
+      <div className={styles.filterNumericActions}>
+        <button type="button" className={styles.filterApplyBtn} onClick={(e) => { e.stopPropagation(); _apply(); }}>
+          {t('Anwenden')}
+        </button>
+      </div>
+    </div>
+  );
+}
+
 export function FormGeneratorTable<T extends Record<string, any>>({
   data,
   columns: providedColumns,
@@ -544,6 +730,41 @@ export function FormGeneratorTable<T extends Record<string, any>>({
   const [currentPageSize, setCurrentPageSize] = useState(pageSize);
   const [openFilterColumn, setOpenFilterColumn] = useState<string | null>(null);
   const filterDropdownRef = useRef<HTMLDivElement>(null);
+
+  useLayoutEffect(() => {
+    if (!openFilterColumn) return;
+    const dd = filterDropdownRef.current;
+    if (!dd) return;
+    const positionDropdown = () => {
+      const th = dd.closest('th');
+      if (!th) return;
+      const r = th.getBoundingClientRect();
+      const margin = 8;
+      const maxW = 320;
+      const w = Math.min(Math.max(dd.offsetWidth || maxW, 200), maxW, window.innerWidth - 2 * margin);
+      let left = r.left;
+      if (left + w > window.innerWidth - margin) {
+        left = window.innerWidth - margin - w;
+      }
+      if (left < margin) left = margin;
+      const approxH = dd.offsetHeight || 280;
+      let top = r.bottom + 4;
+      if (top + approxH > window.innerHeight - margin) {
+        top = Math.max(margin, r.top - 4 - approxH);
+      }
+      dd.style.position = 'fixed';
+      dd.style.left = `${left}px`;
+      dd.style.top = `${top}px`;
+      dd.style.right = 'auto';
+      dd.style.bottom = 'auto';
+      dd.style.width = `${w}px`;
+      dd.style.maxWidth = `${maxW}px`;
+      dd.style.zIndex = '2000';
+    };
+    positionDropdown();
+    const id = requestAnimationFrame(() => positionDropdown());
+    return () => cancelAnimationFrame(id);
+  }, [openFilterColumn]);
   
   // Grouping: Track expanded groups
   const [expandedGroups, setExpandedGroups] = useState<Set<string>>(() => new Set());
@@ -945,6 +1166,21 @@ export function FormGeneratorTable<T extends Record<string, any>>({
     // Skip if column has static filterOptions (enum) – those are used directly
     if (column?.filterOptions && column.filterOptions.length > 0) return;
 
+    // Boolean / date / number columns use dedicated filter UIs — no distinct-value fetch
+    const colT = column?.type as AttributeType | undefined;
+    const auditTs = column?.key ? _auditTimestampColumnKey(column.key) : false;
+    const treatAsDate = !!colT && (
+      isDateTimeType(colT)
+      || (isNumberType(colT) && auditTs)
+    );
+    if (column?.type && (
+      isCheckboxType(colT as AttributeType)
+      || treatAsDate
+      || (isNumberType(colT as AttributeType) && !auditTs)
+    )) {
+      return;
+    }
+
     // displayField + local full dataset: filter values are derived from `data` (see getUniqueValuesForColumn)
     if (column?.displayField && !supportsBackendPagination) return;
 
@@ -1619,6 +1855,15 @@ export function FormGeneratorTable<T extends Record<string, any>>({
     return false;
   };
 
+  const _columnAlignStyle = (column: ColumnConfig): React.CSSProperties => {
+    const isNumeric = column.type === 'number' || column.type === 'float' || column.type === 'integer';
+    const formatAlign = column.frontendFormat && column.frontendFormat[1] === ':' ? column.frontendFormat[0] : '';
+    if (formatAlign === 'R') return { textAlign: 'right' };
+    if (formatAlign === 'M') return { textAlign: 'center' };
+    if (formatAlign === 'L') return { textAlign: 'left' };
+    return isNumeric ? { textAlign: 'right' } : {};
+  };
+
   // Format cell value
   const formatCellValue = (value: any, column: ColumnConfig, row: T) => {
     // Custom formatter must run even when value is null/undefined (e.g. synthetic columns like _documentRefs)
@@ -1980,7 +2225,11 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                     )}
                   </th>
                 )}
-                {detectedColumns.map(column => (
+                {detectedColumns.map(column => {
+                  const colAlign = _columnAlignStyle(column);
+                  const headerJustify = colAlign.textAlign === 'right' ? 'flex-end'
+                    : colAlign.textAlign === 'center' ? 'center' : 'flex-start';
+                  return (
                   <th
                     key={column.key}
                     className={`${styles.th} ${sortable && column.sortable ? styles.sortable : ''}`}
@@ -1988,10 +2237,11 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                       width: columnWidths[column.key] || column.width || 150,
                       minWidth: columnWidths[column.key] || column.width || 150,
                       maxWidth: columnWidths[column.key] || column.width || 150,
-                      position: 'relative'
+                      position: 'relative',
+                      ...colAlign,
                     }}
                   >
-                    <div className={styles.headerContent}>
+                    <div className={styles.headerContent} style={{ justifyContent: headerJustify }}>
                       {/* Filter icon */}
                       {filterable && column.filterable !== false && (
                         <button
@@ -2034,6 +2284,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                       <span 
                         className={styles.columnLabel}
                         onClick={() => column.sortable && handleSort(column.key)}
+                        title={column.label}
                       >
                         {column.label}
                       </span>
@@ -2058,11 +2309,77 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                             </button>
                           )}
                         </div>
+                        {(() => {
+                          const colType = column.type || 'text';
+                          const auditTs = _auditTimestampColumnKey(column.key);
+                          const isDateCol = isDateTimeType(colType as AttributeType)
+                            || (isNumberType(colType as AttributeType) && auditTs);
+
+                          if (isDateCol) {
+                            const filterVal = filters[column.key];
+                            const periodVal: PeriodValue | null = (() => {
+                              if (!filterVal || typeof filterVal !== 'object') return null;
+                              const v = (filterVal as any).value;
+                              if (!v || typeof v !== 'object') return null;
+                              const { from, to } = v as { from?: string; to?: string };
+                              if (!from && !to) return null;
+                              const storedPresetKind = (filterVal as any).presetKind;
+                              let preset: PeriodValue['preset'];
+                              if (storedPresetKind === 'lastN' || storedPresetKind === 'nextN') {
+                                const amount = (filterVal as any).presetAmount ?? 7;
+                                const unit = (filterVal as any).presetUnit ?? 'day';
+                                preset = { kind: storedPresetKind, amount, unit };
+                              } else if (storedPresetKind) {
+                                preset = { kind: storedPresetKind } as PeriodValue['preset'];
+                              } else {
+                                preset = { kind: 'custom' as const };
+                              }
+                              return { preset, fromDate: from || '', toDate: to || '' };
+                            })();
+                            return (
+                              <div className={styles.filterDatePickerWrap}>
+                                <PeriodPicker
+                                  value={periodVal}
+                                  onChange={(next: PeriodValue) => {
+                                    if (next.preset.kind === 'allTime') {
+                                      clearFilter(column.key);
+                                    } else {
+                                      const filterPayload: any = {
+                                        operator: 'between',
+                                        value: { from: next.fromDate, to: next.toDate },
+                                        presetKind: next.preset.kind,
+                                      };
+                                      if (next.preset.kind === 'lastN' || next.preset.kind === 'nextN') {
+                                        filterPayload.presetAmount = (next.preset as any).amount;
+                                        filterPayload.presetUnit = (next.preset as any).unit;
+                                      }
+                                      handleFilter(column.key, filterPayload, true);
+                                    }
+                                  }}
+                                  direction="past"
+                                  enabledPresets={[
+                                    'allTime', 'ytd', 'lastYear', 'last12Months',
+                                    'thisMonth', 'lastMonth', 'thisQuarter', 'lastQuarter',
+                                    'lastN', 'custom',
+                                  ]}
+                                  placeholder={t('Zeitraum wählen')}
+                                />
+                              </div>
+                            );
+                          }
+
+                          return null;
+                        })()}
                         <div className={styles.filterDropdownOptions}>
                           {(() => {
                             const colType = column.type || 'text';
                             const isBool = isCheckboxType(colType as AttributeType);
-                            const isDate = isDateTimeType(colType as AttributeType);
+                            const auditTs = _auditTimestampColumnKey(column.key);
+                            const isDateCol = isDateTimeType(colType as AttributeType)
+                              || (isNumberType(colType as AttributeType) && auditTs);
+                            const isNum = isNumberType(colType as AttributeType) && !auditTs;
+
+                            if (isDateCol) return null;
 
                             if (isBool) {
                               const currentVal = filters[column.key];
@@ -2090,51 +2407,15 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                               );
                             }
 
-                            if (isDate) {
-                              const rangeVal = (typeof filters[column.key] === 'object' && filters[column.key]?.value) || {};
+                            if (isNum) {
                               return (
-                                <div style={{ padding: '6px 8px', display: 'flex', flexDirection: 'column', gap: '6px' }}>
-                                  <div
-                                    className={`${styles.filterOption} ${!filters[column.key] ? styles.filterOptionSelected : ''}`}
-                                    onClick={() => clearFilter(column.key)}
-                                  >
-                                    ({t('Alle')})
-                                  </div>
-                                  <label style={{ fontSize: '11px', color: 'var(--text-muted, #64748b)' }}>
-                                    {t('Von')}
-                                  </label>
-                                  <input
-                                    type="date"
-                                    value={rangeVal.from || ''}
-                                    style={{ width: '100%', padding: '4px 6px', fontSize: '12px', border: '1px solid var(--color-border, #ddd)', borderRadius: '4px' }}
-                                    onChange={(e) => {
-                                      const from = e.target.value;
-                                      const to = rangeVal.to || '';
-                                      if (!from && !to) {
-                                        clearFilter(column.key);
-                                      } else {
-                                        handleFilter(column.key, { operator: 'between', value: { from, to } }, true);
-                                      }
-                                    }}
-                                  />
-                                  <label style={{ fontSize: '11px', color: 'var(--text-muted, #64748b)' }}>
-                                    {t('Bis')}
-                                  </label>
-                                  <input
-                                    type="date"
-                                    value={rangeVal.to || ''}
-                                    style={{ width: '100%', padding: '4px 6px', fontSize: '12px', border: '1px solid var(--color-border, #ddd)', borderRadius: '4px' }}
-                                    onChange={(e) => {
-                                      const to = e.target.value;
-                                      const from = rangeVal.from || '';
-                                      if (!from && !to) {
-                                        clearFilter(column.key);
-                                      } else {
-                                        handleFilter(column.key, { operator: 'between', value: { from, to } }, true);
-                                      }
-                                    }}
-                                  />
-                                </div>
+                                <NumericFilterPanel
+                                  columnKey={column.key}
+                                  activeFilter={filters[column.key]}
+                                  onFilter={(payload, keepOpen = true) => handleFilter(column.key, payload, keepOpen)}
+                                  onClear={() => clearFilter(column.key)}
+                                  t={t}
+                                />
                               );
                             }
 
@@ -2184,7 +2465,8 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                       />
                     )}
                   </th>
-                ))}
+                  );
+                })}
               </tr>
             </thead>
               <tbody>
@@ -2362,15 +2644,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                                 const cellValue = row[column.key];
                                 const customClassName = column.cellClassName ? column.cellClassName(cellValue, row) : '';
                                 const combinedClassName = `${styles.td} ${customClassName}`.trim();
-                                const isNumeric = column.type === 'number' || column.type === 'float' || column.type === 'integer';
-                                const formatAlign = column.frontendFormat && column.frontendFormat[1] === ':' ? column.frontendFormat[0] : '';
-                                const alignStyle: React.CSSProperties = formatAlign === 'R'
-                                  ? { textAlign: 'right' }
-                                  : formatAlign === 'M'
-                                    ? { textAlign: 'center' }
-                                    : formatAlign === 'L'
-                                      ? { textAlign: 'left' }
-                                      : isNumeric ? { textAlign: 'right' } : {};
+                                const alignStyle = _columnAlignStyle(column);
                                 return (
                                   <td key={column.key} className={combinedClassName}
                                     style={{ width: columnWidths[column.key] || column.width || 150, minWidth: columnWidths[column.key] || column.width || 150, maxWidth: columnWidths[column.key] || column.width || 150, ...alignStyle }}>
@@ -2486,17 +2760,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                           const cellValue = row[column.key];
                           const customClassName = column.cellClassName ? column.cellClassName(cellValue, row) : '';
                           const combinedClassName = `${styles.td} ${customClassName}`.trim();
-                          const isNumeric = column.type === 'number' || column.type === 'float' || column.type === 'integer';
-                          // ``frontendFormat`` may carry an explicit alignment prefix
-                          // ("L:", "M:", "R:") that overrides the numeric default.
-                          const formatAlign = column.frontendFormat && column.frontendFormat[1] === ':' ? column.frontendFormat[0] : '';
-                          const alignStyle: React.CSSProperties = formatAlign === 'R'
-                            ? { textAlign: 'right' }
-                            : formatAlign === 'M'
-                              ? { textAlign: 'center' }
-                              : formatAlign === 'L'
-                                ? { textAlign: 'left' }
-                                : isNumeric ? { textAlign: 'right' } : {};
+                          const alignStyle = _columnAlignStyle(column);
                           return (
                             <td key={column.key} className={combinedClassName}
                               style={{ width: columnWidths[column.key] || column.width || 150, minWidth: columnWidths[column.key] || column.width || 150, maxWidth: columnWidths[column.key] || column.width || 150, ...alignStyle }}>
diff --git a/src/components/PeriodPicker/PeriodPickerPopover.tsx b/src/components/PeriodPicker/PeriodPickerPopover.tsx
index f21dd67..d1c5aec 100644
--- a/src/components/PeriodPicker/PeriodPickerPopover.tsx
+++ b/src/components/PeriodPicker/PeriodPickerPopover.tsx
@@ -5,7 +5,7 @@
  * actual commit to the parent via `onApply` / `onCancel`.
  */
 
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { useLanguage } from '../../providers/language/LanguageContext';
 import PeriodPickerCalendar from './PeriodPickerCalendar';
 import {
@@ -200,6 +200,36 @@ const PeriodPickerPopover: React.FC<PeriodPickerPopoverProps> = (props) => {
     return () => window.removeEventListener('keydown', _onKey);
   }, [draft, onApply, onCancel]);
 
+  useLayoutEffect(() => {
+    const pop = popRef.current;
+    if (!pop) return;
+    const _clamp = () => {
+      const parent = pop.parentElement;
+      if (!parent) return;
+      const pRect = parent.getBoundingClientRect();
+      const margin = 8;
+      const popW = pop.offsetWidth || 720;
+      const popH = pop.offsetHeight || 400;
+      let left = pRect.left;
+      let top = pRect.bottom + 6;
+      if (left + popW > window.innerWidth - margin) {
+        left = window.innerWidth - margin - popW;
+      }
+      if (left < margin) left = margin;
+      if (top + popH > window.innerHeight - margin) {
+        top = Math.max(margin, pRect.top - 6 - popH);
+      }
+      pop.style.position = 'fixed';
+      pop.style.left = `${left}px`;
+      pop.style.top = `${top}px`;
+      pop.style.right = 'auto';
+      pop.style.zIndex = '2001';
+    };
+    _clamp();
+    const id = requestAnimationFrame(() => _clamp());
+    return () => cancelAnimationFrame(id);
+  }, []);
+
   return (
     <div ref={popRef} className={styles.popover}>
       <div className={styles.body}>
diff --git a/src/hooks/useInvitations.ts b/src/hooks/useInvitations.ts
index caf9d41..61a6fd9 100644
--- a/src/hooks/useInvitations.ts
+++ b/src/hooks/useInvitations.ts
@@ -32,8 +32,8 @@ export interface Invitation {
   roleIds: string[];
   targetUsername: string;
   email?: string;
-  createdBy: string;
-  createdAt: number;
+  sysCreatedBy: string;
+  sysCreatedAt: number;
   expiresAt: number;
   usedBy?: string;
   usedAt?: number;
diff --git a/src/hooks/useMandates.ts b/src/hooks/useMandates.ts
index 6b56420..9444acd 100644
--- a/src/hooks/useMandates.ts
+++ b/src/hooks/useMandates.ts
@@ -24,6 +24,8 @@ import {
 import type { AttributeDefinition as FormGenAttr } from '../components/FormGenerator/FormGeneratorForm';
 import { getMandateBillingFormAttributes } from '../utils/mandateBillingFormMerge';
 import { validateMandateName } from '../utils/mandateNameUtils';
+import { resolveColumnTypes } from '../utils/columnTypeResolver';
+import type { ColumnConfig } from '../components/FormGenerator/FormGeneratorTable';
 
 // Re-export types
 export type { Mandate, MandateCreateData, MandateUpdateData, PaginationParams };
@@ -153,19 +155,21 @@ export function useAdminMandates() {
     return await fetchMandateByIdApi(request, mandateId);
   }, [request]);
 
-  // Generate columns from attributes (displayField = backend {field}Label for FK columns)
-  const columns = attributes.map(attr => ({
-    key: attr.name,
-    label: attr.label || attr.name,
-    type: attr.type as any,
-    sortable: attr.sortable !== false,
-    filterable: attr.filterable !== false,
-    searchable: attr.searchable !== false,
-    width: attr.width || 150,
-    minWidth: attr.minWidth || 100,
-    maxWidth: attr.maxWidth || 400,
-    displayField: (attr as any).displayField,
-  }));
+  // Generate columns from attributes (types merged via resolveColumnTypes)
+  const columns: ColumnConfig[] = useMemo(() => {
+    const raw = attributes.map(attr => ({
+      key: attr.name,
+      label: attr.label || attr.name,
+      sortable: attr.sortable !== false,
+      filterable: attr.filterable !== false,
+      searchable: attr.searchable !== false,
+      width: attr.width || 150,
+      minWidth: attr.minWidth || 100,
+      maxWidth: attr.maxWidth || 400,
+      displayField: (attr as any).displayField,
+    }));
+    return resolveColumnTypes(raw, attributes);
+  }, [attributes]);
 
   // Create mandate
   const handleCreate = useCallback(async (mandateData: Partial<Mandate>): Promise<Mandate | null> => {
diff --git a/src/pages/AutomationsDashboardPage.tsx b/src/pages/AutomationsDashboardPage.tsx
index d8c19b1..e0923f7 100644
--- a/src/pages/AutomationsDashboardPage.tsx
+++ b/src/pages/AutomationsDashboardPage.tsx
@@ -16,6 +16,9 @@ import { usePrompt } from '../hooks/usePrompt';
 import { useApiRequest } from '../hooks/useApi';
 import { formatUnixTimestamp } from '../utils/time';
 import { updateWorkflow, executeGraph, deleteSystemWorkflow } from '../api/workflowApi';
+import { fetchAttributes } from '../api/attributesApi';
+import type { AttributeDefinition } from '../api/attributesApi';
+import { resolveColumnTypes } from '../utils/columnTypeResolver';
 import api from '../api';
 import { useLanguage } from '../providers/language/LanguageContext';
 import { useNavigation, type DynamicBlock } from '../hooks/useNavigation';
@@ -423,6 +426,7 @@ const _RunTracingModal: React.FC<_RunTracingModalProps> = ({ run, onClose }) =>
 
 const _DashboardTab: React.FC = () => {
   const { t } = useLanguage();
+  const { request } = useApiRequest();
   const { showError } = useToast();
 
   const [metrics, setMetrics] = useState<WorkflowRunMetrics | null>(null);
@@ -431,6 +435,13 @@ const _DashboardTab: React.FC = () => {
   const [paginationMeta, setPaginationMeta] = useState<any>(null);
   const [tracingRun, setTracingRun] = useState<WorkflowRun | null>(null);
   const lastPaginationParamsRef = useRef<any>(null);
+  const [backendAttributes, setBackendAttributes] = useState<AttributeDefinition[]>([]);
+
+  useEffect(() => {
+    fetchAttributes(request, 'AutoRun')
+      .then(setBackendAttributes)
+      .catch(() => {});
+  }, [request]);
 
   const _loadMetrics = useCallback(async () => {
     try {
@@ -529,11 +540,10 @@ const _DashboardTab: React.FC = () => {
     stopped: t('Gestoppt'),
   }), [t]);
 
-  const _runColumns: ColumnConfig[] = useMemo(() => [
+  const _rawRunColumns: ColumnConfig[] = useMemo(() => [
     {
       key: 'workflowLabel',
       label: t('Workflow'),
-      type: 'string',
       width: 200,
       sortable: true,
       formatter: (v: string, row: WorkflowRun) => v || row.workflowId || t('—'),
@@ -541,7 +551,6 @@ const _DashboardTab: React.FC = () => {
     {
       key: 'mandateId',
       label: t('Mandant'),
-      type: 'string',
       width: 140,
       sortable: true,
       filterable: true,
@@ -550,7 +559,6 @@ const _DashboardTab: React.FC = () => {
     {
       key: 'featureInstanceId',
       label: t('Instanz'),
-      type: 'string',
       width: 140,
       sortable: true,
       filterable: true,
@@ -559,7 +567,6 @@ const _DashboardTab: React.FC = () => {
     {
       key: 'status',
       label: t('Status'),
-      type: 'string',
       width: 110,
       sortable: true,
       filterable: true,
@@ -574,7 +581,6 @@ const _DashboardTab: React.FC = () => {
     {
       key: 'sysCreatedAt',
       label: t('Gestartet'),
-      type: 'number',
       width: 150,
       sortable: true,
       formatter: (v: number) => _formatTs(v),
@@ -582,13 +588,17 @@ const _DashboardTab: React.FC = () => {
     {
       key: 'sysModifiedAt',
       label: t('Beendet'),
-      type: 'number',
       width: 150,
       sortable: true,
       formatter: (v: number) => _formatTs(v),
     },
   ], [t, _STATUS_LABELS]);
 
+  const _runColumns = useMemo(
+    () => resolveColumnTypes(_rawRunColumns, backendAttributes),
+    [_rawRunColumns, backendAttributes],
+  );
+
   const _hookData = useMemo(() => ({
     refetch: _loadRuns,
     pagination: paginationMeta,
@@ -711,6 +721,13 @@ const _WorkflowsTab: React.FC = () => {
   const [activeFilter, setActiveFilter] = useState<'all' | 'active' | 'inactive'>('all');
   const [paginationMeta, setPaginationMeta] = useState<any>(null);
   const lastPaginationParamsRef = useRef<any>(null);
+  const [backendAttributes, setBackendAttributes] = useState<AttributeDefinition[]>([]);
+
+  useEffect(() => {
+    fetchAttributes(request, 'Automation2Workflow')
+      .then(setBackendAttributes)
+      .catch(() => {});
+  }, [request]);
 
   const _load = useCallback(async (paginationParams?: any) => {
     if (paginationParams !== undefined) {
@@ -883,12 +900,11 @@ const _WorkflowsTab: React.FC = () => {
     return invs.some((i) => i.enabled && (i.kind === 'manual' || i.kind === 'api'));
   }, []);
 
-  const _columns: ColumnConfig[] = useMemo(() => [
-    { key: 'label', label: t('Workflow'), type: 'string', width: 200, sortable: true, filterable: true },
+  const _rawColumns: ColumnConfig[] = useMemo(() => [
+    { key: 'label', label: t('Workflow'), width: 200, sortable: true, filterable: true },
     {
       key: 'mandateId',
       label: t('Mandant'),
-      type: 'string',
       width: 140,
       sortable: true,
       filterable: true,
@@ -897,7 +913,6 @@ const _WorkflowsTab: React.FC = () => {
     {
       key: 'featureInstanceId',
       label: t('Instanz'),
-      type: 'string',
       width: 140,
       sortable: true,
       filterable: true,
@@ -906,7 +921,6 @@ const _WorkflowsTab: React.FC = () => {
     {
       key: 'active',
       label: t('Aktiv'),
-      type: 'boolean',
       width: 80,
       sortable: true,
       filterable: true,
@@ -914,13 +928,11 @@ const _WorkflowsTab: React.FC = () => {
     {
       key: 'isRunning',
       label: t('Läuft'),
-      type: 'boolean',
       width: 80,
     },
     {
       key: 'sysCreatedAt',
       label: t('Erstellt'),
-      type: 'number',
       width: 140,
       sortable: true,
       formatter: (v: number) => _formatTs(v),
@@ -928,19 +940,22 @@ const _WorkflowsTab: React.FC = () => {
     {
       key: 'lastStartedAt',
       label: t('Zuletzt gestartet'),
-      type: 'number',
       width: 160,
       formatter: (v: number) => _formatTs(v),
     },
     {
       key: 'runCount',
       label: t('Läufe'),
-      type: 'number',
       width: 80,
       formatter: (v: number) => (v != null ? String(v) : '0'),
     },
   ], [t]);
 
+  const _columns = useMemo(
+    () => resolveColumnTypes(_rawColumns, backendAttributes),
+    [_rawColumns, backendAttributes],
+  );
+
   const _hookData = useMemo(() => ({
     refetch: _load,
     handleDelete: (id: string) => _handleDelete(id),
diff --git a/src/pages/ComplianceAuditPage.tsx b/src/pages/ComplianceAuditPage.tsx
index 7d70bce..ea45645 100644
--- a/src/pages/ComplianceAuditPage.tsx
+++ b/src/pages/ComplianceAuditPage.tsx
@@ -14,6 +14,10 @@ import {
 } from 'recharts';
 import { FaDownload, FaEye, FaTrash, FaTimes } from 'react-icons/fa';
 import api from '../api';
+import { useApiRequest } from '../hooks/useApi';
+import { fetchAttributes } from '../api/attributesApi';
+import type { AttributeDefinition } from '../api/attributesApi';
+import { resolveColumnTypes } from '../utils/columnTypeResolver';
 import { useLanguage } from '../providers/language/LanguageContext';
 import { useUserMandates } from '../hooks/useUserMandates';
 import { useConfirm } from '../hooks/useConfirm';
@@ -139,9 +143,19 @@ const _NEUT_PAGE_SIZE = 100;
 
 export const ComplianceAuditPage: React.FC = () => {
   const { t } = useLanguage();
+  const { request } = useApiRequest();
+  const [aiAuditAttrs, setAiAuditAttrs] = useState<AttributeDefinition[]>([]);
+  const [auditLogAttrs, setAuditLogAttrs] = useState<AttributeDefinition[]>([]);
+  const [neutAttrs, setNeutAttrs] = useState<AttributeDefinition[]>([]);
   const { fetchMandates } = useUserMandates();
   const { confirm, ConfirmDialog } = useConfirm();
 
+  useEffect(() => {
+    fetchAttributes(request, 'AiAuditLogEntry').then(setAiAuditAttrs).catch(() => setAiAuditAttrs([]));
+    fetchAttributes(request, 'AuditLogEntry').then(setAuditLogAttrs).catch(() => setAuditLogAttrs([]));
+    fetchAttributes(request, 'DataNeutralizerAttributesView').then(setNeutAttrs).catch(() => setNeutAttrs([]));
+  }, [request]);
+
   const [mandates, setMandates] = useState<Mandate[]>([]);
   const [mandatesLoading, setMandatesLoading] = useState(true);
   const [selectedMandateId, setSelectedMandateId] = useState<string | null>(null);
@@ -433,19 +447,31 @@ export const ComplianceAuditPage: React.FC = () => {
 
   // ── Column definitions ──
 
-  const aiLogColumns: ColumnConfig[] = useMemo(() => [
-    { key: 'timestamp', label: t('Zeitpunkt'), type: 'timestamp' as any, sortable: true, width: 160 },
+  const _rawAiLogColumns: ColumnConfig[] = useMemo(() => [
+    { key: 'timestamp', label: t('Zeitpunkt'), sortable: true, width: 160 },
     {
-      key: 'username', label: t('Benutzer'), type: 'text' as any, sortable: true, searchable: true, width: 140,
-      formatter: (val: any, row: any) => val || (row?.userId ? row.userId.slice(0, 8) : '–'),
+      key: 'username',
+      label: t('Benutzer'),
+      sortable: true,
+      searchable: true,
+      width: 140,
+      formatter: (val: any, row: any) => val || (row?.userId ? `NA(${row.userId})` : '–'),
     },
     {
-      key: 'instanceLabel', label: t('Feature-Instanz'), type: 'text' as any, sortable: true, filterable: true, width: 160,
+      key: 'instanceLabel',
+      label: t('Feature-Instanz'),
+      sortable: true,
+      filterable: true,
+      width: 160,
       formatter: (val: any, row: any) => val || row?.featureCode || '–',
     },
-    { key: 'aiModel', label: t('AI-Modell'), type: 'text' as any, sortable: true, filterable: true, width: 160 },
+    { key: 'aiModel', label: t('AI-Modell'), sortable: true, filterable: true, width: 160 },
     {
-      key: 'aiProvider', label: t('Provider / Typ'), type: 'text' as any, sortable: true, filterable: true, width: 140,
+      key: 'aiProvider',
+      label: t('Provider / Typ'),
+      sortable: true,
+      filterable: true,
+      width: 140,
       formatter: (val: any, row: any) => {
         const provider = val || '–';
         const op = row?.operationType;
@@ -453,63 +479,110 @@ export const ComplianceAuditPage: React.FC = () => {
       },
     },
     {
-      key: 'priceCHF', label: t('Kosten (CHF)'), type: 'number' as any, sortable: true, width: 110,
-      formatter: (val: any) => val != null ? Number(val).toFixed(4) : '–',
+      key: 'priceCHF',
+      label: t('Kosten (CHF)'),
+      sortable: true,
+      width: 110,
+      formatter: (val: any) => (val != null ? Number(val).toFixed(4) : '–'),
     },
     {
-      key: 'neutralizationActive', label: t('Neutralisierung'), type: 'text' as any, sortable: true, width: 100,
-      formatter: (val: any) => val ? '✓' : '–',
+      key: 'neutralizationActive',
+      label: t('Neutralisierung'),
+      sortable: true,
+      width: 100,
+      formatter: (val: any) => (val ? '✓' : '–'),
     },
     {
-      key: 'success', label: t('Status'), type: 'text' as any, sortable: true, filterable: true, width: 80,
-      formatter: (val: any) => val ? t('OK') : t('Fehler'),
-      cellClassName: (val: any) => val ? styles.statusOk : styles.statusError,
+      key: 'success',
+      label: t('Status'),
+      sortable: true,
+      filterable: true,
+      width: 80,
+      formatter: (val: any) => (val ? t('OK') : t('Fehler')),
+      cellClassName: (val: any) => (val ? styles.statusOk : styles.statusError),
     },
   ], [t]);
 
-  const auditLogColumns: ColumnConfig[] = useMemo(() => [
-    { key: 'timestamp', label: t('Zeitpunkt'), type: 'timestamp' as any, sortable: true, width: 160 },
+  const aiLogColumns: ColumnConfig[] = useMemo(
+    () => resolveColumnTypes(_rawAiLogColumns, aiAuditAttrs),
+    [_rawAiLogColumns, aiAuditAttrs],
+  );
+
+  const _rawAuditLogColumns: ColumnConfig[] = useMemo(() => [
+    { key: 'timestamp', label: t('Zeitpunkt'), sortable: true, width: 160 },
     {
-      key: 'username', label: t('Benutzer'), type: 'text' as any, sortable: true, searchable: true, width: 140,
-      formatter: (val: any, row: any) => val || (row?.userId ? row.userId.slice(0, 8) : '–'),
+      key: 'username',
+      label: t('Benutzer'),
+      sortable: true,
+      searchable: true,
+      width: 140,
+      formatter: (val: any, row: any) => val || (row?.userId ? `NA(${row.userId})` : '–'),
     },
     {
-      key: 'category', label: t('Kategorie'), type: 'text' as any, sortable: true, filterable: true, width: 110,
+      key: 'category',
+      label: t('Kategorie'),
+      sortable: true,
+      filterable: true,
+      width: 110,
       cellClassName: (val: any) => {
         const color = _CATEGORY_COLORS[val as string];
         return color ? styles[`cat_${val}`] || '' : '';
       },
       formatter: (val: any) => val || '–',
     },
-    { key: 'action', label: t('Aktion'), type: 'text' as any, sortable: true, filterable: true, searchable: true, width: 140 },
-    { key: 'resourceType', label: t('Ressource'), type: 'text' as any, sortable: true, filterable: true, width: 120 },
-    { key: 'details', label: t('Details'), type: 'text' as any, searchable: true, width: 250 },
+    { key: 'action', label: t('Aktion'), sortable: true, filterable: true, searchable: true, width: 140 },
+    { key: 'resourceType', label: t('Ressource'), sortable: true, filterable: true, width: 120 },
+    { key: 'details', label: t('Details'), searchable: true, width: 250 },
     {
-      key: 'success', label: t('Status'), type: 'text' as any, sortable: true, width: 70,
-      formatter: (val: any) => val ? '✓' : '✗',
-      cellClassName: (val: any) => val ? styles.statusOk : styles.statusError,
+      key: 'success',
+      label: t('Status'),
+      sortable: true,
+      width: 70,
+      formatter: (val: any) => (val ? '✓' : '✗'),
+      cellClassName: (val: any) => (val ? styles.statusOk : styles.statusError),
     },
-    { key: 'ipAddress', label: t('IP'), type: 'text' as any, width: 120 },
+    { key: 'ipAddress', label: t('IP'), width: 120 },
   ], [t]);
 
-  const neutColumns: ColumnConfig[] = useMemo(() => [
-    { key: 'placeholder', label: t('Platzhalter'), type: 'text' as any, sortable: true, searchable: true, width: 220 },
-    { key: 'originalText', label: t('Originaltext'), type: 'text' as any, sortable: true, searchable: true, width: 240 },
-    { key: 'patternType', label: t('Kategorie'), type: 'text' as any, sortable: true, filterable: true, width: 120 },
+  const auditLogColumns: ColumnConfig[] = useMemo(
+    () => resolveColumnTypes(_rawAuditLogColumns, auditLogAttrs),
+    [_rawAuditLogColumns, auditLogAttrs],
+  );
+
+  const _rawNeutColumns: ColumnConfig[] = useMemo(() => [
+    { key: 'placeholder', label: t('Platzhalter'), sortable: true, searchable: true, width: 220 },
+    { key: 'originalText', label: t('Originaltext'), sortable: true, searchable: true, width: 240 },
+    { key: 'patternType', label: t('Kategorie'), sortable: true, filterable: true, width: 120 },
     {
-      key: 'username', label: t('Benutzer'), type: 'text' as any, sortable: true, filterable: true, width: 140,
-      formatter: (val: any, row: any) => val || (row?.userId ? String(row.userId).slice(0, 8) + '…' : '–'),
+      key: 'username',
+      label: t('Benutzer'),
+      sortable: true,
+      filterable: true,
+      width: 140,
+      formatter: (val: any, row: any) => val || (row?.userId ? `NA(${row.userId})` : '–'),
     },
     {
-      key: 'instanceLabel', label: t('Feature-Instanz'), type: 'text' as any, sortable: true, filterable: true, width: 160,
-      formatter: (val: any, row: any) => val || (row?.featureInstanceId ? String(row.featureInstanceId).slice(0, 8) + '…' : '–'),
+      key: 'instanceLabel',
+      label: t('Feature-Instanz'),
+      sortable: true,
+      filterable: true,
+      width: 160,
+      formatter: (val: any, row: any) => val || (row?.featureInstanceId ? `NA(${row.featureInstanceId})` : '–'),
     },
     {
-      key: 'fileId', label: t('Datei'), type: 'text' as any, sortable: true, width: 140,
-      formatter: (val: any) => val ? String(val).slice(0, 8) + '…' : '–',
+      key: 'fileId',
+      label: t('Datei'),
+      sortable: true,
+      width: 140,
+      formatter: (val: any) => (val ? `${String(val).slice(0, 8)}…` : '–'),
     },
   ], [t]);
 
+  const neutColumns: ColumnConfig[] = useMemo(
+    () => resolveColumnTypes(_rawNeutColumns, neutAttrs),
+    [_rawNeutColumns, neutAttrs],
+  );
+
   // ── fetchFilterValues for autofilter dropdowns ──
 
   const _makeFetchFilterValues = useCallback(
diff --git a/src/pages/admin/AdminFeatureAccessPage.tsx b/src/pages/admin/AdminFeatureAccessPage.tsx
index 4fbd307..7ac9bab 100644
--- a/src/pages/admin/AdminFeatureAccessPage.tsx
+++ b/src/pages/admin/AdminFeatureAccessPage.tsx
@@ -14,6 +14,10 @@ import { FormGeneratorForm, type AttributeDefinition } from '../../components/Fo
 import { FaPlus, FaSync, FaCube, FaBuilding, FaCogs, FaEdit } from 'react-icons/fa';
 import { useToast } from '../../contexts/ToastContext';
 import api from '../../api';
+import { useApiRequest } from '../../hooks/useApi';
+import { fetchAttributes } from '../../api/attributesApi';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
+import type { ColumnConfig } from '../../components/FormGenerator/FormGeneratorTable';
 import { ChatbotConfigSection } from './ChatbotConfigSection';
 import { TextField } from '../../components/UiComponents/TextField';
 import styles from './Admin.module.css';
@@ -42,6 +46,7 @@ export const AdminFeatureAccessPage: React.FC = () => {
   const { fetchMandates } = useUserMandates();
   const { showSuccess, showError } = useToast();
   const { loadFeatures } = useFeatureStore();
+  const { request } = useApiRequest();
 
   // State
   const [mandates, setMandates] = useState<Mandate[]>([]);
@@ -88,18 +93,28 @@ export const AdminFeatureAccessPage: React.FC = () => {
     }
   }, [selectedMandateId, fetchInstances]);
 
-  // Table columns
-  const columns = useMemo(() => [
-    { key: 'label', label: t('Name'), type: 'string' as const, sortable: true, filterable: true, searchable: true, width: 200 },
-    { key: 'featureCode', label: t('Feature'), type: 'string' as const, sortable: true, filterable: true, width: 150,
-      render: (value: string) => {
+  const _rawColumns: ColumnConfig[] = useMemo(() => [
+    { key: 'label', label: t('Name'), sortable: true, filterable: true, searchable: true, width: 200 },
+    {
+      key: 'featureCode',
+      label: t('Feature'),
+      sortable: true,
+      filterable: true,
+      width: 150,
+      formatter: (value: string) => {
         const feature = features.find(f => f.code === value);
-        return feature ? (feature.label || value) : value;
-      }
+        const label = feature ? (feature.label || value) : value;
+        return label;
+      },
     },
-    { key: 'enabled', label: t('Aktiv'), type: 'boolean' as const, sortable: true, filterable: true, width: 80 },
+    { key: 'enabled', label: t('Aktiv'), sortable: true, filterable: true, width: 80 },
   ], [features, t]);
 
+  const columns = useMemo(
+    () => resolveColumnTypes(_rawColumns, backendAttributes),
+    [_rawColumns, backendAttributes],
+  );
+
   // Form attributes from backend - merge with dynamic feature options
   // Exclude featureCode, config, and label since we handle them separately
   const createFields: AttributeDefinition[] = useMemo(() => {
diff --git a/src/pages/admin/AdminFeatureInstanceUsersPage.tsx b/src/pages/admin/AdminFeatureInstanceUsersPage.tsx
index b91937d..0fc90f6 100644
--- a/src/pages/admin/AdminFeatureInstanceUsersPage.tsx
+++ b/src/pages/admin/AdminFeatureInstanceUsersPage.tsx
@@ -14,6 +14,10 @@ import { FaPlus, FaSync, FaBuilding, FaCube } from 'react-icons/fa';
 import { useToast } from '../../contexts/ToastContext';
 import { useFeatureStore } from '../../stores/featureStore';
 import api from '../../api';
+import { useApiRequest } from '../../hooks/useApi';
+import { fetchAttributes } from '../../api/attributesApi';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
+import type { ColumnConfig } from '../../components/FormGenerator/FormGeneratorTable';
 import styles from './Admin.module.css';
 
 import { useLanguage } from '../../providers/language/LanguageContext';
@@ -38,6 +42,8 @@ export const AdminFeatureInstanceUsersPage: React.FC = () => {
   const { fetchMandates } = useUserMandates();
   const { showSuccess, showError } = useToast();
   const { loadFeatures } = useFeatureStore();
+  const { request } = useApiRequest();
+  const [backendAttributes, setBackendAttributes] = useState<AttributeDefinition[]>([]);
 
   // Combined instance option type
   interface CombinedInstanceOption {
@@ -72,6 +78,12 @@ export const AdminFeatureInstanceUsersPage: React.FC = () => {
     return selectedCombinedKey.split(':')[1] || '';
   }, [selectedCombinedKey]);
 
+  useEffect(() => {
+    fetchAttributes(request, 'FeatureAccessView')
+      .then(setBackendAttributes)
+      .catch(() => setBackendAttributes([]));
+  }, [request]);
+
   // Load mandates and features on mount, then build combined options
   useEffect(() => {
     fetchFeatures();
@@ -199,12 +211,10 @@ export const AdminFeatureInstanceUsersPage: React.FC = () => {
     return allUsers.filter(u => !existingUserIds.has(u.id));
   }, [allUsers, instanceUsers]);
 
-  // Table columns
-  const columns = useMemo(() => [
+  const _rawColumns: ColumnConfig[] = useMemo(() => [
     {
       key: 'username',
       label: t('Benutzername'),
-      type: 'text' as const,
       sortable: true,
       filterable: true,
       searchable: true,
@@ -213,7 +223,6 @@ export const AdminFeatureInstanceUsersPage: React.FC = () => {
     {
       key: 'email',
       label: t('E-Mail'),
-      type: 'text' as const,
       sortable: true,
       filterable: true,
       searchable: true,
@@ -222,7 +231,6 @@ export const AdminFeatureInstanceUsersPage: React.FC = () => {
     {
       key: 'fullName',
       label: t('Vollständiger Name'),
-      type: 'text' as const,
       sortable: true,
       filterable: true,
       searchable: true,
@@ -231,12 +239,11 @@ export const AdminFeatureInstanceUsersPage: React.FC = () => {
     {
       key: 'roleLabels',
       label: t('Rollen'),
-      type: 'text' as const,
       sortable: false,
       filterable: false,
       searchable: true,
       width: 200,
-      render: (value: string[]) => {
+      formatter: (value: string[]) => {
         if (!value || value.length === 0) return '-';
         return value.join(', ');
       },
@@ -244,7 +251,6 @@ export const AdminFeatureInstanceUsersPage: React.FC = () => {
     {
       key: 'enabled',
       label: t('Aktiv'),
-      type: 'boolean' as const,
       sortable: true,
       filterable: true,
       searchable: false,
@@ -252,6 +258,11 @@ export const AdminFeatureInstanceUsersPage: React.FC = () => {
     },
   ], [t]);
 
+  const columns = useMemo(
+    () => resolveColumnTypes(_rawColumns, backendAttributes),
+    [_rawColumns, backendAttributes],
+  );
+
   // Dynamic options for forms (users and roles)
   const userOptions = useMemo(() => 
     availableUsers.map(u => ({
diff --git a/src/pages/admin/AdminFeatureRolesPage.tsx b/src/pages/admin/AdminFeatureRolesPage.tsx
index 48227b5..c1259ac 100644
--- a/src/pages/admin/AdminFeatureRolesPage.tsx
+++ b/src/pages/admin/AdminFeatureRolesPage.tsx
@@ -17,6 +17,10 @@ import { AccessRulesEditor } from '../../components/AccessRules';
 import { FaPlus, FaSync, FaUserShield, FaCube, FaShieldAlt } from 'react-icons/fa';
 import { useToast } from '../../contexts/ToastContext';
 import api from '../../api';
+import { useApiRequest } from '../../hooks/useApi';
+import { fetchAttributes } from '../../api/attributesApi';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
+import type { ColumnConfig } from '../../components/FormGenerator/FormGeneratorTable';
 import styles from './Admin.module.css';
 
 import { useLanguage } from '../../providers/language/LanguageContext';
@@ -45,6 +49,9 @@ export const AdminFeatureRolesPage: React.FC = () => {
     const { t } = useLanguage();
 
   const { showError } = useToast();
+  const { request } = useApiRequest();
+  const [roleTableAttributes, setRoleTableAttributes] = useState<AttributeDefinition[]>([]);
+
   // State
   const [features, setFeatures] = useState<Feature[]>([]);
   const [selectedFeatureCode, setSelectedFeatureCode] = useState<string>('');
@@ -56,6 +63,12 @@ export const AdminFeatureRolesPage: React.FC = () => {
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [permissionsRole, setPermissionsRole] = useState<FeatureRole | null>(null);
 
+  useEffect(() => {
+    fetchAttributes(request, 'Role')
+      .then(setRoleTableAttributes)
+      .catch(() => setRoleTableAttributes([]));
+  }, [request]);
+
   // Load features on mount
   useEffect(() => {
     const loadFeatures = async () => {
@@ -130,40 +143,41 @@ export const AdminFeatureRolesPage: React.FC = () => {
     return String(value);
   };
 
-  // Table columns
-  const columns = useMemo(() => [
-    { 
-      key: 'roleLabel', 
-      label: t('Rollen-Label'), 
-      type: 'string' as const, 
-      sortable: true, 
-      filterable: true, 
-      searchable: true, 
-      width: 180 
+  const _rawColumns: ColumnConfig[] = useMemo(() => [
+    {
+      key: 'roleLabel',
+      label: t('Rollen-Label'),
+      sortable: true,
+      filterable: true,
+      searchable: true,
+      width: 180,
     },
-    { 
-      key: 'description', 
-      label: t('Beschreibung'), 
-      type: 'string' as const, 
-      sortable: false, 
+    {
+      key: 'description',
+      label: t('Beschreibung'),
+      sortable: false,
       width: 300,
-      formatter: (value: string) => getTextValue(value)
+      formatter: (value: string) => getTextValue(value),
     },
-    { 
-      key: 'featureCode', 
-      label: t('Feature'), 
-      type: 'string' as const, 
-      sortable: true, 
-      filterable: true, 
+    {
+      key: 'featureCode',
+      label: t('Feature'),
+      sortable: true,
+      filterable: true,
       width: 120,
       formatter: (value: string) => (
         <span className={styles.badge} style={{ background: 'var(--primary-color, #4a5568)', color: 'white' }}>
           <FaCube style={{ marginRight: 4 }} /> {value}
         </span>
-      )
+      ),
     },
   ], [t]);
 
+  const columns = useMemo(
+    () => resolveColumnTypes(_rawColumns, roleTableAttributes),
+    [_rawColumns, roleTableAttributes],
+  );
+
   // Form attributes for create
   const createFields: AttributeDefinition[] = useMemo(() => {
     const fields: AttributeDefinition[] = [
diff --git a/src/pages/admin/AdminInvitationsPage.tsx b/src/pages/admin/AdminInvitationsPage.tsx
index 2f76da0..61c64f8 100644
--- a/src/pages/admin/AdminInvitationsPage.tsx
+++ b/src/pages/admin/AdminInvitationsPage.tsx
@@ -12,7 +12,10 @@ import { FormGeneratorTable } from '../../components/FormGenerator/FormGenerator
 import { FormGeneratorForm, type AttributeDefinition } from '../../components/FormGenerator/FormGeneratorForm';
 import { FaPlus, FaSync, FaBuilding, FaCopy, FaLink } from 'react-icons/fa';
 import { useToast } from '../../contexts/ToastContext';
-import api from '../../api';
+import { useApiRequest } from '../../hooks/useApi';
+import { fetchAttributes } from '../../api/attributesApi';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
+import type { ColumnConfig } from '../../components/FormGenerator/FormGeneratorTable';
 import styles from './Admin.module.css';
 
 import { useLanguage } from '../../providers/language/LanguageContext';
@@ -22,6 +25,7 @@ export const AdminInvitationsPage: React.FC = () => {
     const { t } = useLanguage();
 
   const { showError } = useToast();
+  const { request } = useApiRequest();
   const {
     invitations,
     loading,
@@ -56,12 +60,10 @@ export const AdminInvitationsPage: React.FC = () => {
       }
     };
     loadMandates();
-    // Fetch Invitation attributes from backend
-    api.get('/api/attributes/Invitation').then(response => {
-      const attrs = response.data?.attributes || response.data || [];
-      setBackendAttributes(Array.isArray(attrs) ? attrs : []);
-    }).catch(() => setBackendAttributes([]));
-  }, [fetchMandates]);
+    fetchAttributes(request, 'Invitation')
+      .then(setBackendAttributes)
+      .catch(() => setBackendAttributes([]));
+  }, [fetchMandates, request]);
 
   // Load invitations and roles when mandate changes (same roles as AdminUserMandatesPage: user, viewer, admin)
   useEffect(() => {
@@ -84,25 +86,22 @@ export const AdminInvitationsPage: React.FC = () => {
     });
   };
 
-  // Table columns
-  const columns = useMemo(() => [
-    { 
-      key: 'targetUsername', 
-      label: t('Benutzername'), 
-      type: 'string' as const, 
-      sortable: true, 
-      filterable: true, 
-      searchable: true, 
+  const _rawColumns: ColumnConfig[] = useMemo(() => [
+    {
+      key: 'targetUsername',
+      label: t('Benutzername'),
+      sortable: true,
+      filterable: true,
+      searchable: true,
       width: 150,
     },
-    { 
-      key: 'email', 
-      label: t('E-Mail'), 
-      type: 'string' as const, 
-      sortable: true, 
-      filterable: true, 
+    {
+      key: 'email',
+      label: t('E-Mail'),
+      sortable: true,
+      filterable: true,
       width: 180,
-      render: (value: string, row: Invitation) => {
+      formatter: (value: string, row: Invitation) => {
         const emailText = value || '-';
         const emailSent = (row as any).emailSent;
         return (
@@ -110,30 +109,28 @@ export const AdminInvitationsPage: React.FC = () => {
             {emailText} {emailSent && '✓'}
           </span>
         );
-      }
+      },
     },
-    { 
-      key: 'roleIds', 
-      label: t('Rollen'), 
-      type: 'string', // Array rendered as string
-      sortable: false, 
-      filterable: false, 
+    {
+      key: 'roleIds',
+      label: t('Rollen'),
+      sortable: false,
+      filterable: false,
       width: 150,
-      render: (value: string[]) => {
+      formatter: (value: string[]) => {
         if (!value || value.length === 0) return '-';
-        return value.map(roleId => {
+        return value.map((roleId) => {
           const role = roles.find(r => r.id === roleId);
           return role?.roleLabel || roleId;
         }).join(', ');
-      }
-    } as any,
-    { 
-      key: 'expiresAt', 
-      label: t('Gültig bis'), 
-      type: 'number' as const, 
-      sortable: true, 
+      },
+    },
+    {
+      key: 'expiresAt',
+      label: t('Gültig bis'),
+      sortable: true,
       width: 150,
-      render: (value: number) => {
+      formatter: (value: number) => {
         const text = formatDate(value);
         const isExpired = value < Date.now() / 1000;
         return (
@@ -141,29 +138,32 @@ export const AdminInvitationsPage: React.FC = () => {
             {text} {isExpired && '(abgelaufen)'}
           </span>
         );
-      }
+      },
     },
-    { 
-      key: 'currentUses', 
-      label: t('Verwendet'), 
-      type: 'string' as const, 
-      sortable: true, 
+    {
+      key: 'currentUses',
+      label: t('Verwendet'),
+      sortable: true,
       width: 100,
-      render: (value: number, row: Invitation) => `${value || 0} / ${row.maxUses || 1}`
+      formatter: (value: number, row: Invitation) => `${value || 0} / ${row.maxUses || 1}`,
     },
-    { 
-      key: 'createdAt', 
-      label: t('Erstellt'), 
-      type: 'number' as const, 
-      sortable: true, 
+    {
+      key: 'sysCreatedAt',
+      label: t('Erstellt'),
+      sortable: true,
       width: 150,
-      render: (value: number) => formatDate(value)
+      formatter: (value: number) => formatDate(value),
     },
   ], [roles, t]);
 
+  const columns = useMemo(
+    () => resolveColumnTypes(_rawColumns, backendAttributes),
+    [_rawColumns, backendAttributes],
+  );
+
   // Form attributes - same role options as AdminUserMandatesPage (user, viewer, admin)
   const createFields: AttributeDefinition[] = useMemo(() => {
-    const excludedFields = ['id', 'mandateId', 'token', 'createdBy', 'createdAt', 'expiresAt', 'currentUses', 'inviteUrl', 'featureInstanceId'];
+    const excludedFields = ['id', 'mandateId', 'token', 'sysCreatedBy', 'sysCreatedAt', 'sysUpdatedAt', 'sysUpdatedBy', 'expiresAt', 'currentUses', 'inviteUrl', 'featureInstanceId'];
     
     // Mandate-level roles (user, viewer, admin) - same as when adding mandate members
     const roleOptions = roles
diff --git a/src/pages/admin/AdminLanguagesPage.tsx b/src/pages/admin/AdminLanguagesPage.tsx
index 5e74919..ea77f94 100644
--- a/src/pages/admin/AdminLanguagesPage.tsx
+++ b/src/pages/admin/AdminLanguagesPage.tsx
@@ -8,6 +8,10 @@ import api from '../../api';
 import axios from 'axios';
 import { FormGeneratorTable, type ColumnConfig } from '../../components/FormGenerator/FormGeneratorTable/FormGeneratorTable';
 import { useConfirm } from '../../hooks/useConfirm';
+import { useApiRequest } from '../../hooks/useApi';
+import { fetchAttributes } from '../../api/attributesApi';
+import type { AttributeDefinition } from '../../api/attributesApi';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
 import { useLanguage } from '../../providers/language/LanguageContext';
 import styles from './Admin.module.css';
 
@@ -39,44 +43,6 @@ type ProgressInfo = {
   keysTranslated?: number;
 };
 
-function _getColumns(t: (key: string) => string): ColumnConfig[] {
-  return [
-    { key: 'id', label: t('Code'), type: 'text', sortable: true, filterable: true, width: 90 },
-    { key: 'label', label: t('Bezeichnung'), type: 'text', sortable: true, filterable: true, width: 200 },
-    {
-      key: 'status',
-      label: t('Status'),
-      type: 'text',
-      sortable: true,
-      filterable: true,
-      width: 160,
-      formatter: (_val: any, row: any) => {
-        const r = row as LangRow;
-        if (r.updating) {
-          return (
-            <span style={{ display: 'inline-flex', alignItems: 'center', gap: 6, color: 'var(--color-warning, #e6a700)' }}>
-              <FaSync style={{ animation: 'spin 1s linear infinite', fontSize: '0.85em' }} />
-              {t('wird aktualisiert…')}
-            </span>
-          );
-        }
-        if (r.status === 'generating') {
-          return (
-            <span style={{ display: 'inline-flex', alignItems: 'center', gap: 6, color: 'var(--color-warning, #e6a700)' }}>
-              <FaSync style={{ animation: 'spin 1s linear infinite', fontSize: '0.85em' }} />
-              {t('wird erzeugt…')}
-            </span>
-          );
-        }
-        return r.status;
-      },
-    },
-    { key: 'uiCount', label: t('UI'), type: 'number', sortable: true, width: 80 },
-    { key: 'gatewayCount', label: t('API'), type: 'number', sortable: true, width: 80 },
-    { key: 'entriesCount', label: t('Gesamt'), type: 'number', sortable: true, width: 80 },
-  ];
-}
-
 // ISO 639 catalog (codes + native labels + priority order) is provided by the
 // gateway via GET /api/i18n/iso-choices. We must NOT keep a local copy here --
 // any divergence between frontend and backend caused subtle bugs (e.g. user
@@ -278,6 +244,8 @@ const _ProgressOverlay: React.FC<{
 export const AdminLanguagesPage: React.FC = () => {
   const { t, reloadLanguage, refreshAvailableLanguages } = useLanguage();
   const { confirm, ConfirmDialog } = useConfirm();
+  const { request } = useApiRequest();
+  const [langSetAttributes, setLangSetAttributes] = useState<AttributeDefinition[]>([]);
   const [rows, setRows] = useState<LangRow[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -288,6 +256,12 @@ export const AdminLanguagesPage: React.FC = () => {
   const busyRef = useRef(false);
   const abortRef = useRef<AbortController | null>(null);
 
+  useEffect(() => {
+    fetchAttributes(request, 'UiLanguageSetView')
+      .then(setLangSetAttributes)
+      .catch(() => setLangSetAttributes([]));
+  }, [request]);
+
   useEffect(() => {
     let cancelled = false;
     (async () => {
@@ -393,6 +367,44 @@ export const AdminLanguagesPage: React.FC = () => {
     });
   }, [rows, search]);
 
+  const columns = useMemo(() => {
+    const raw: ColumnConfig[] = [
+      { key: 'id', label: t('Code'), sortable: true, filterable: true, width: 90 },
+      { key: 'label', label: t('Bezeichnung'), sortable: true, filterable: true, width: 200 },
+      {
+        key: 'status',
+        label: t('Status'),
+        sortable: true,
+        filterable: true,
+        width: 160,
+        formatter: (_val: any, row: any) => {
+          const r = row as LangRow;
+          if (r.updating) {
+            return (
+              <span style={{ display: 'inline-flex', alignItems: 'center', gap: 6, color: 'var(--color-warning, #e6a700)' }}>
+                <FaSync style={{ animation: 'spin 1s linear infinite', fontSize: '0.85em' }} />
+                {t('wird aktualisiert…')}
+              </span>
+            );
+          }
+          if (r.status === 'generating') {
+            return (
+              <span style={{ display: 'inline-flex', alignItems: 'center', gap: 6, color: 'var(--color-warning, #e6a700)' }}>
+                <FaSync style={{ animation: 'spin 1s linear infinite', fontSize: '0.85em' }} />
+                {t('wird erzeugt…')}
+              </span>
+            );
+          }
+          return r.status;
+        },
+      },
+      { key: 'uiCount', label: t('UI'), sortable: true, width: 80 },
+      { key: 'gatewayCount', label: t('API'), sortable: true, width: 80 },
+      { key: 'entriesCount', label: t('Gesamt'), sortable: true, width: 80 },
+    ];
+    return resolveColumnTypes(raw, langSetAttributes);
+  }, [t, langSetAttributes]);
+
   const existingCodes = useMemo(() => new Set(rows.map((r) => r.id)), [rows]);
 
   const addChoices = useMemo(() => {
@@ -869,7 +881,7 @@ export const AdminLanguagesPage: React.FC = () => {
       <div style={{ flex: 1, minHeight: 0, position: 'relative' }}>
         <FormGeneratorTable
           data={displayRows}
-          columns={_getColumns(t)}
+          columns={columns}
           loading={loading}
           pagination={false}
           selectable={false}
diff --git a/src/pages/admin/AdminMandateRolesPage.tsx b/src/pages/admin/AdminMandateRolesPage.tsx
index 7d36a51..77db34d 100644
--- a/src/pages/admin/AdminMandateRolesPage.tsx
+++ b/src/pages/admin/AdminMandateRolesPage.tsx
@@ -21,7 +21,10 @@ import { FormGeneratorTable } from '../../components/FormGenerator/FormGenerator
 import { FormGeneratorForm, type AttributeDefinition } from '../../components/FormGenerator/FormGeneratorForm';
 import { FaPlus, FaSync, FaUserShield, FaBuilding, FaGlobe, FaShieldAlt, FaCube } from 'react-icons/fa';
 import { useToast } from '../../contexts/ToastContext';
-import api from '../../api';
+import { useApiRequest } from '../../hooks/useApi';
+import { fetchAttributes } from '../../api/attributesApi';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
+import type { ColumnConfig } from '../../components/FormGenerator/FormGeneratorTable';
 import styles from './Admin.module.css';
 
 import { useLanguage } from '../../providers/language/LanguageContext';
@@ -31,6 +34,7 @@ export const AdminMandateRolesPage: React.FC = () => {
     const { t, currentLanguage } = useLanguage();
 
   const navigate = useNavigate();
+  const { request } = useApiRequest();
   const { showError, showWarning } = useToast();
   const {
     roles,
@@ -68,12 +72,10 @@ export const AdminMandateRolesPage: React.FC = () => {
       }
     };
     loadMandates();
-    // Fetch Role attributes from backend
-    api.get('/api/attributes/Role').then(response => {
-      const attrs = response.data?.attributes || response.data || [];
-      setBackendAttributes(Array.isArray(attrs) ? attrs : []);
-    }).catch(() => setBackendAttributes([]));
-  }, [fetchMandates]);
+    fetchAttributes(request, 'Role')
+      .then(setBackendAttributes)
+      .catch(() => setBackendAttributes([]));
+  }, [fetchMandates, request]);
 
   // Load roles when mandate or scopeFilter changes
   useEffect(() => {
@@ -102,32 +104,28 @@ export const AdminMandateRolesPage: React.FC = () => {
     return String(desc);
   };
 
-  // Table columns - scopeType is now a backend-computed field
-  const columns = useMemo(() => [
-    { 
-      key: 'roleLabel', 
-      label: t('Bezeichnung'), 
-      type: 'string' as const, 
-      sortable: true, 
-      filterable: true, 
-      searchable: true, 
-      width: 150 
+  const _rawColumns: ColumnConfig[] = useMemo(() => [
+    {
+      key: 'roleLabel',
+      label: t('Bezeichnung'),
+      sortable: true,
+      filterable: true,
+      searchable: true,
+      width: 150,
     },
-    { 
-      key: 'description', 
-      label: t('Beschreibung'), 
-      type: 'string' as const, 
-      sortable: false, 
+    {
+      key: 'description',
+      label: t('Beschreibung'),
+      sortable: false,
       filterable: false,
       width: 250,
-      formatter: (value: string) => getDescriptionText(value)
+      formatter: (value: string) => getDescriptionText(value),
     },
-    { 
-      key: 'scopeType', 
-      label: t('Geltungsbereich'), 
-      type: 'string' as const, 
-      sortable: true, 
-      filterable: true, 
+    {
+      key: 'scopeType',
+      label: t('Geltungsbereich'),
+      sortable: true,
+      filterable: true,
       width: 140,
       formatter: (value: string) => {
         if (value === 'system') {
@@ -149,10 +147,15 @@ export const AdminMandateRolesPage: React.FC = () => {
             <FaBuilding style={{ marginRight: 4 }} /> {t('Mandant')}
           </span>
         );
-      }
+      },
     },
   ], [t]);
 
+  const columns = useMemo(
+    () => resolveColumnTypes(_rawColumns, backendAttributes),
+    [_rawColumns, backendAttributes],
+  );
+
   // Form attributes from backend - for create form
   const createFields: AttributeDefinition[] = useMemo(() => {
     const excludedFields = ['id', 'mandateId', 'featureInstanceId', 'featureCode', 'isSystemRole', 'scopeType'];
diff --git a/src/pages/admin/AdminUserMandatesPage.tsx b/src/pages/admin/AdminUserMandatesPage.tsx
index 2ff9715..8d9f5fa 100644
--- a/src/pages/admin/AdminUserMandatesPage.tsx
+++ b/src/pages/admin/AdminUserMandatesPage.tsx
@@ -11,7 +11,10 @@ import { FormGeneratorTable } from '../../components/FormGenerator/FormGenerator
 import { FormGeneratorForm, type AttributeDefinition } from '../../components/FormGenerator/FormGeneratorForm';
 import { FaPlus, FaSync, FaBuilding } from 'react-icons/fa';
 import { useToast } from '../../contexts/ToastContext';
-import api from '../../api';
+import { useApiRequest } from '../../hooks/useApi';
+import { fetchAttributes } from '../../api/attributesApi';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
+import type { ColumnConfig } from '../../components/FormGenerator/FormGeneratorTable';
 import styles from './Admin.module.css';
 
 import { useLanguage } from '../../providers/language/LanguageContext';
@@ -21,6 +24,7 @@ export const AdminUserMandatesPage: React.FC = () => {
     const { t } = useLanguage();
 
   const { showError } = useToast();
+  const { request } = useApiRequest();
   const {
     users,
     loading,
@@ -59,12 +63,10 @@ export const AdminUserMandatesPage: React.FC = () => {
       }
     };
     loadMandates();
-    // Fetch UserMandate attributes from backend (for table columns)
-    api.get('/api/attributes/UserMandate').then(response => {
-      const attrs = response.data?.attributes || response.data || [];
-      setBackendAttributes(Array.isArray(attrs) ? attrs : []);
-    }).catch(() => setBackendAttributes([]));
-  }, [fetchMandates]);
+    fetchAttributes(request, 'UserMandateView')
+      .then(setBackendAttributes)
+      .catch(() => setBackendAttributes([]));
+  }, [fetchMandates, request]);
 
   // Load users when mandate changes
   useEffect(() => {
@@ -97,60 +99,57 @@ export const AdminUserMandatesPage: React.FC = () => {
     return allUsers.filter(u => !existingUserIds.has(u.id));
   }, [allUsers, users]);
 
-  // Table columns - based on MandateUserInfo response structure
-  const columns = useMemo(() => {
-    return [
-      {
-        key: 'username',
-        label: t('Benutzername'),
-        type: 'text' as any,
-        sortable: true,
-        filterable: true,
-        searchable: true,
-        width: 150,
+  const _rawColumns: ColumnConfig[] = useMemo(() => [
+    {
+      key: 'username',
+      label: t('Benutzername'),
+      sortable: true,
+      filterable: true,
+      searchable: true,
+      width: 150,
+    },
+    {
+      key: 'email',
+      label: t('E-Mail'),
+      sortable: true,
+      filterable: true,
+      searchable: true,
+      width: 200,
+    },
+    {
+      key: 'fullName',
+      label: t('Vollständiger Name'),
+      sortable: true,
+      filterable: true,
+      searchable: true,
+      width: 180,
+    },
+    {
+      key: 'roleLabels',
+      label: t('Rollen'),
+      sortable: false,
+      filterable: false,
+      searchable: true,
+      width: 200,
+      formatter: (value: string[]) => {
+        if (!value || value.length === 0) return '-';
+        return value.join(', ');
       },
-      {
-        key: 'email',
-        label: t('E-Mail'),
-        type: 'text' as any,
-        sortable: true,
-        filterable: true,
-        searchable: true,
-        width: 200,
-      },
-      {
-        key: 'fullName',
-        label: t('Vollständiger Name'),
-        type: 'text' as any,
-        sortable: true,
-        filterable: true,
-        searchable: true,
-        width: 180,
-      },
-      {
-        key: 'roleLabels',
-        label: t('Rollen'),
-        type: 'text' as any,
-        sortable: false,
-        filterable: false,
-        searchable: true,
-        width: 200,
-        render: (value: string[]) => {
-          if (!value || value.length === 0) return '-';
-          return value.join(', ');
-        },
-      },
-      {
-        key: 'enabled',
-        label: t('Aktiv'),
-        type: 'boolean' as any,
-        sortable: true,
-        filterable: true,
-        searchable: false,
-        width: 80,
-      },
-    ];
-  }, [t]);
+    },
+    {
+      key: 'enabled',
+      label: t('Aktiv'),
+      sortable: true,
+      filterable: true,
+      searchable: false,
+      width: 80,
+    },
+  ], [t]);
+
+  const columns = useMemo(
+    () => resolveColumnTypes(_rawColumns, backendAttributes),
+    [_rawColumns, backendAttributes],
+  );
 
   // Dynamic options for forms (users and roles)
   const userOptions = useMemo(() => 
diff --git a/src/pages/admin/AdminUsersPage.tsx b/src/pages/admin/AdminUsersPage.tsx
index fcac187..20f350d 100644
--- a/src/pages/admin/AdminUsersPage.tsx
+++ b/src/pages/admin/AdminUsersPage.tsx
@@ -14,6 +14,7 @@ import styles from './Admin.module.css';
 import { getUserDataCache } from '../../utils/userCache';
 
 import { useLanguage } from '../../providers/language/LanguageContext';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
 
 const _PRIVILEGED_FLAGS = ['isSysAdmin', 'isPlatformAdmin'] as const;
 
@@ -57,12 +58,11 @@ export const AdminUsersPage: React.FC = () => {
   const [showCreateModal, setShowCreateModal] = useState(false);
   const [editingUser, setEditingUser] = useState<User | null>(null);
 
-  // Generate columns from attributes
+  // Generate columns from attributes; types from backend via resolveColumnTypes
   const columns = useMemo(() => {
-    return (attributes || []).map(attr => ({
+    const raw = (attributes || []).map(attr => ({
       key: attr.name,
       label: attr.label || attr.name,
-      type: attr.type as any,
       sortable: attr.sortable !== false,
       filterable: attr.filterable !== false,
       searchable: attr.searchable !== false,
@@ -71,6 +71,7 @@ export const AdminUsersPage: React.FC = () => {
       maxWidth: attr.maxWidth || 400,
       displayField: (attr as any).displayField,
     }));
+    return resolveColumnTypes(raw, attributes || []);
   }, [attributes]);
 
   // Check permissions
diff --git a/src/pages/basedata/ConnectionsPage.tsx b/src/pages/basedata/ConnectionsPage.tsx
index 774b7e6..9636e82 100644
--- a/src/pages/basedata/ConnectionsPage.tsx
+++ b/src/pages/basedata/ConnectionsPage.tsx
@@ -14,6 +14,7 @@ import { getApiBaseUrl } from '../../../config/config';
 import styles from '../admin/Admin.module.css';
 
 import { useLanguage } from '../../providers/language/LanguageContext';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
 
 export const ConnectionsPage: React.FC = () => {
     const { t } = useLanguage();
@@ -54,13 +55,12 @@ export const ConnectionsPage: React.FC = () => {
   const columns = useMemo(() => {
     const hiddenColumns = ['id', 'externalId', 'tokenStatus', 'tokenExpiresAt', 'grantedScopes'];
 
-    return (attributes || [])
+    const raw = (attributes || [])
       .filter(attr => !hiddenColumns.includes(attr.name))
       .map(attr => {
         const col: any = {
           key: attr.name,
-          label: attr.label || attr.name,
-          type: attr.type as any,
+          label: attr.name === 'userId' ? t('Benutzer') : attr.label || attr.name,
           sortable: attr.sortable !== false,
           filterable: attr.filterable !== false,
           searchable: attr.searchable !== false,
@@ -71,13 +71,9 @@ export const ConnectionsPage: React.FC = () => {
           frontendFormat: (attr as any).frontendFormat,
           frontendFormatLabels: (attr as any).frontendFormatLabels,
         };
-
-        if (attr.name === 'userId') {
-          col.label = t('Benutzer');
-        }
-
         return col;
       });
+    return resolveColumnTypes(raw, attributes || []);
   }, [attributes, t]);
 
   // Check permissions
diff --git a/src/pages/basedata/FilesPage.tsx b/src/pages/basedata/FilesPage.tsx
index b7b4fe4..a65ad5b 100644
--- a/src/pages/basedata/FilesPage.tsx
+++ b/src/pages/basedata/FilesPage.tsx
@@ -20,6 +20,7 @@ import { usePrompt } from '../../hooks/usePrompt';
 import styles from '../admin/Admin.module.css';
 import { useLanguage } from '../../providers/language/LanguageContext';
 import { getUserDataCache } from '../../utils/userCache';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
 
 interface UserFile {
   id: string;
@@ -203,7 +204,6 @@ export const FilesPage: React.FC = () => {
       .map(attr => ({
         key: attr.name,
         label: attr.label || attr.name,
-        type: attr.type as any,
         sortable: attr.sortable !== false,
         filterable: attr.filterable !== false,
         searchable: attr.searchable !== false,
@@ -217,7 +217,6 @@ export const FilesPage: React.FC = () => {
     cols.push({
       key: 'sysCreatedBy',
       label: t('Erstellt von'),
-      type: 'text' as any,
       sortable: true,
       filterable: true,
       searchable: true,
@@ -226,7 +225,7 @@ export const FilesPage: React.FC = () => {
       maxWidth: 250,
       displayField: 'sysCreatedByLabel',
     } as any);
-    return cols;
+    return resolveColumnTypes(cols, attributes || []);
   }, [attributes, t]);
 
   const canCreate = permissions?.create !== 'n';
diff --git a/src/pages/basedata/PromptsPage.tsx b/src/pages/basedata/PromptsPage.tsx
index e274393..3fa1bdf 100644
--- a/src/pages/basedata/PromptsPage.tsx
+++ b/src/pages/basedata/PromptsPage.tsx
@@ -13,6 +13,7 @@ import { FaSync, FaPlus } from 'react-icons/fa';
 import styles from '../admin/Admin.module.css';
 
 import { useLanguage } from '../../providers/language/LanguageContext';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
 
 interface Prompt {
   id: string;
@@ -76,7 +77,6 @@ export const PromptsPage: React.FC = () => {
       .map(attr => ({
         key: attr.name,
         label: attr.label || attr.name,
-        type: attr.type as any,
         sortable: attr.sortable !== false,
         filterable: attr.filterable !== false,
         searchable: attr.searchable !== false,
@@ -92,7 +92,6 @@ export const PromptsPage: React.FC = () => {
     cols.push({
       key: 'sysCreatedBy',
       label: t('Erstellt von'),
-      type: 'text' as any,
       sortable: true,
       filterable: true,
       searchable: true,
@@ -104,7 +103,7 @@ export const PromptsPage: React.FC = () => {
       frontendFormatLabels: undefined,
     });
 
-    return cols;
+    return resolveColumnTypes(cols, attributes || []);
   }, [attributes, t]);
 
   // Check permissions
diff --git a/src/pages/billing/AdminSubscriptionsPage.tsx b/src/pages/billing/AdminSubscriptionsPage.tsx
index dc2a81c..f6d7403 100644
--- a/src/pages/billing/AdminSubscriptionsPage.tsx
+++ b/src/pages/billing/AdminSubscriptionsPage.tsx
@@ -1,7 +1,11 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { FormGeneratorTable, type ColumnConfig } from '../../components/FormGenerator/FormGeneratorTable';
 import { useAdminSubscriptions } from '../../hooks/useAdminSubscriptions';
 import { useConfirm } from '../../hooks/useConfirm';
+import { useApiRequest } from '../../hooks/useApi';
+import { fetchAttributes } from '../../api/attributesApi';
+import type { AttributeDefinition } from '../../api/attributesApi';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
 import api from '../../api';
 import styles from './Billing.module.css';
 
@@ -9,28 +13,39 @@ import { useLanguage } from '../../providers/language/LanguageContext';
 
 const _TERMINAL_STATUSES = new Set(['EXPIRED']);
 
-function _getColumns(t: (key: string) => string): ColumnConfig[] {
-  return [
-    { key: 'mandateName', label: t('Mandant'), type: 'text', sortable: true, filterable: true, width: 180 },
-    { key: 'planTitle', label: t('Plan'), type: 'text', sortable: true, filterable: true, width: 180 },
-    { key: 'status', label: t('Status'), type: 'text', sortable: true, filterable: true, width: 110 },
-    { key: 'recurring', label: t('Wiederkehrend'), type: 'boolean', sortable: true, filterable: true, width: 120 },
-    { key: 'activeUsers', label: t('Benutzer'), type: 'number', sortable: true, width: 70 },
-    { key: 'activeInstances', label: t('Module'), type: 'number', sortable: true, width: 90 },
-    { key: 'monthlyRevenueCHF', label: t('Umsatz pro Monat'), type: 'number', sortable: true, width: 140 },
-    { key: 'startedAt', label: t('Gestartet'), type: 'date', sortable: true, filterable: true, width: 130 },
-    { key: 'currentPeriodEnd', label: t('Periodenende'), type: 'date', sortable: true, filterable: true, width: 130 },
-    { key: 'snapshotPricePerUserCHF', label: t('Preis pro Benutzer'), type: 'number', sortable: true, width: 100 },
-    { key: 'snapshotPricePerInstanceCHF', label: t('Preis pro Modul'), type: 'number', sortable: true, width: 110 },
-  ];
-}
-
 const AdminSubscriptionsPage: React.FC = () => {
-    const { t } = useLanguage();
+  const { t } = useLanguage();
+  const { request } = useApiRequest();
+  const [backendAttributes, setBackendAttributes] = useState<AttributeDefinition[]>([]);
 
   const { confirm, ConfirmDialog } = useConfirm();
   const { data: subscriptions, pagination, loading, refetch } = useAdminSubscriptions();
 
+  useEffect(() => {
+    fetchAttributes(request, 'MandateSubscriptionView')
+      .then(setBackendAttributes)
+      .catch(() => setBackendAttributes([]));
+  }, [request]);
+
+  const _rawColumns: ColumnConfig[] = useMemo(() => [
+    { key: 'mandateName', label: t('Mandant'), sortable: true, filterable: true, width: 180 },
+    { key: 'planTitle', label: t('Plan'), sortable: true, filterable: true, width: 180 },
+    { key: 'status', label: t('Status'), sortable: true, filterable: true, width: 110 },
+    { key: 'recurring', label: t('Wiederkehrend'), sortable: true, filterable: true, width: 120 },
+    { key: 'activeUsers', label: t('Benutzer'), sortable: true, width: 70 },
+    { key: 'activeInstances', label: t('Module'), sortable: true, width: 90 },
+    { key: 'monthlyRevenueCHF', label: t('Umsatz pro Monat'), sortable: true, width: 140 },
+    { key: 'startedAt', label: t('Gestartet'), sortable: true, filterable: true, width: 130 },
+    { key: 'currentPeriodEnd', label: t('Periodenende'), sortable: true, filterable: true, width: 130 },
+    { key: 'snapshotPricePerUserCHF', label: t('Preis pro Benutzer'), sortable: true, width: 100 },
+    { key: 'snapshotPricePerInstanceCHF', label: t('Preis pro Modul'), sortable: true, width: 110 },
+  ], [t]);
+
+  const columns = useMemo(
+    () => resolveColumnTypes(_rawColumns, backendAttributes),
+    [_rawColumns, backendAttributes],
+  );
+
   const _handleForceCancel = useCallback(async (row: any) => {
     const ok = await confirm(
       t('Subscription «{plan}» für Mandant «{mandate}» sofort kündigen? Dies wird auch auf Stripe sofort storniert.', { plan: row.planTitle, mandate: row.mandateName }),
@@ -44,7 +59,7 @@ const AdminSubscriptionsPage: React.FC = () => {
     } catch (err) {
       console.error('Force cancel failed:', err);
     }
-  }, [confirm, refetch]);
+  }, [confirm, refetch, t]);
 
   return (
     <div className={styles.billingDashboard} style={{ minHeight: 0 }}>
@@ -56,7 +71,7 @@ const AdminSubscriptionsPage: React.FC = () => {
       <div style={{ flex: 1, minHeight: 0, overflow: 'auto' }}>
         <FormGeneratorTable
           data={subscriptions}
-          columns={_getColumns(t)}
+          columns={columns}
           apiEndpoint="/api/subscription/admin/all"
           loading={loading}
           pagination={true}
diff --git a/src/pages/billing/BillingDataView.tsx b/src/pages/billing/BillingDataView.tsx
index 0b75f69..0dd3caf 100644
--- a/src/pages/billing/BillingDataView.tsx
+++ b/src/pages/billing/BillingDataView.tsx
@@ -13,6 +13,10 @@ import { FormGeneratorTable, ColumnConfig } from '../../components/FormGenerator
 import { FormGeneratorReport } from '../../components/FormGenerator/FormGeneratorReport';
 import type { ReportSection, ReportFilterState, ReportChartDataPoint, ReportDateRangeSelectorConfig } from '../../components/FormGenerator/FormGeneratorReport';
 import api from '../../api';
+import { useApiRequest } from '../../hooks/useApi';
+import { fetchAttributes } from '../../api/attributesApi';
+import type { AttributeDefinition } from '../../api/attributesApi';
+import { resolveColumnTypes } from '../../utils/columnTypeResolver';
 import { useBilling, type BillingBucketSize } from '../../hooks/useBilling';
 import { UserTransaction } from '../../api/billingApi';
 import { formatBinaryDataSizeFromMebibytes } from '../../utils/formatDataSize';
@@ -252,6 +256,8 @@ function _buildDiagramSections(viewStats: ViewStatistics, chartMode: 'pie' | 'ba
 
 export const BillingDataView: React.FC = () => {
   const { t } = useLanguage();
+  const { request } = useApiRequest();
+  const [billingTxnAttributes, setBillingTxnAttributes] = useState<AttributeDefinition[]>([]);
   const [activeTab, setActiveTab] = useState<TabType>('overview');
   const [searchParams, setSearchParams] = useSearchParams();
   const [checkoutMessage, setCheckoutMessage] = useState<{ type: 'success' | 'error'; text: string } | null>(null);
@@ -338,6 +344,12 @@ export const BillingDataView: React.FC = () => {
   const [transactionsError, setTransactionsError] = useState<string | null>(null);
   const [transactionsPagination, setTransactionsPagination] = useState<any>(null);
 
+  useEffect(() => {
+    fetchAttributes(request, 'BillingTransactionView')
+      .then(setBillingTxnAttributes)
+      .catch(() => setBillingTxnAttributes([]));
+  }, [request]);
+
   // Unified scope params -- single source of truth for all tab API calls
   // "nur meine Daten" is an additional filter on top of the dropdown scope
   const _scopeParams = useMemo((): Record<string, string> => {
@@ -512,19 +524,23 @@ export const BillingDataView: React.FC = () => {
     fetchFilterValues: _fetchTransactionFilterValues,
   }), [_loadTransactions, transactionsPagination, _fetchTransactionFilterValues]);
 
-  // Table column definitions
-  const columns: ColumnConfig[] = useMemo(() => [
-    { key: 'createdAt', label: t('Datum'), type: 'timestamp' as any, sortable: true, width: 160 },
-    { key: 'mandateName', label: t('Mandant'), type: 'text' as any, sortable: true, filterable: true, searchable: true, width: 150 },
-    { key: 'userName', label: t('Benutzer'), type: 'text' as any, sortable: true, filterable: true, searchable: true, width: 150 },
-    { key: 'transactionType', label: t('Typ'), type: 'text' as any, sortable: true, filterable: true, width: 100 },
-    { key: 'description', label: t('Beschreibung'), type: 'text' as any, searchable: true, width: 250 },
-    { key: 'aicoreProvider', label: t('Anbieter'), type: 'text' as any, sortable: true, filterable: true, width: 120 },
-    { key: 'aicoreModel', label: t('Modell'), type: 'text' as any, sortable: true, filterable: true, width: 150 },
-    { key: 'featureCode', label: t('Feature'), type: 'text' as any, sortable: true, filterable: true, width: 120 },
-    { key: 'amount', label: t('Betrag (CHF)'), type: 'number' as any, sortable: true, searchable: true, width: 120 },
+  const _rawTransactionColumns: ColumnConfig[] = useMemo(() => [
+    { key: 'sysCreatedAt', label: t('Datum'), sortable: true, width: 160 },
+    { key: 'mandateName', label: t('Mandant'), sortable: true, filterable: true, searchable: true, width: 150 },
+    { key: 'userName', label: t('Benutzer'), sortable: true, filterable: true, searchable: true, width: 150 },
+    { key: 'transactionType', label: t('Typ'), sortable: true, filterable: true, width: 100 },
+    { key: 'description', label: t('Beschreibung'), searchable: true, width: 250 },
+    { key: 'aicoreProvider', label: t('Anbieter'), sortable: true, filterable: true, width: 120 },
+    { key: 'aicoreModel', label: t('Modell'), sortable: true, filterable: true, width: 150 },
+    { key: 'featureCode', label: t('Feature'), sortable: true, filterable: true, width: 120 },
+    { key: 'amount', label: t('Betrag (CHF)'), sortable: true, searchable: true, width: 120 },
   ], [t]);
 
+  const columns: ColumnConfig[] = useMemo(
+    () => resolveColumnTypes(_rawTransactionColumns, billingTxnAttributes),
+    [_rawTransactionColumns, billingTxnAttributes],
+  );
+
   const totalBalance = useMemo(() => {
     const filtered = selectedScope === 'personal' || selectedScope === 'all'
       ? balances
diff --git a/src/pages/billing/BillingMandateView.tsx b/src/pages/billing/BillingMandateView.tsx
index bf2b575..db9c174 100644
--- a/src/pages/billing/BillingMandateView.tsx
+++ b/src/pages/billing/BillingMandateView.tsx
@@ -145,7 +145,7 @@ const TransactionTable: React.FC<TransactionTableProps> = ({ transactions }) =>
         <tbody>
           {transactions.map((txn) => (
             <tr key={txn.id}>
-              <td>{formatDate(txn.createdAt)}</td>
+              <td>{formatDate(txn.sysCreatedAt)}</td>
               <td>{txn.mandateName || '-'}</td>
               <td>
                 <span className={`${styles.transactionType} ${getTypeClass(txn.transactionType)}`}>
diff --git a/src/pages/billing/BillingTransactions.tsx b/src/pages/billing/BillingTransactions.tsx
index 533513f..b176ff8 100644
--- a/src/pages/billing/BillingTransactions.tsx
+++ b/src/pages/billing/BillingTransactions.tsx
@@ -58,7 +58,7 @@ const TransactionRow: React.FC<TransactionRowProps> = ({ transaction }) => {
   
   return (
     <tr>
-      <td>{formatDate(transaction.createdAt)}</td>
+      <td>{formatDate(transaction.sysCreatedAt)}</td>
       <td>{transaction.mandateName || '-'}</td>
       <td>
         <span className={`${styles.transactionType} ${getTypeClass(transaction.transactionType)}`}>
diff --git a/src/pages/billing/BillingUserView.tsx b/src/pages/billing/BillingUserView.tsx
index 644f2ef..3e9abb1 100644
--- a/src/pages/billing/BillingUserView.tsx
+++ b/src/pages/billing/BillingUserView.tsx
@@ -239,7 +239,7 @@ const UserTransactionTable: React.FC<UserTransactionTableProps> = ({
         <tbody>
           {filteredTransactions.map((txn) => (
             <tr key={txn.id}>
-              <td>{formatDate(txn.createdAt)}</td>
+              <td>{formatDate(txn.sysCreatedAt)}</td>
               <td>{txn.mandateName || '-'}</td>
               <td>{txn.userName || '-'}</td>
               <td>
diff --git a/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx b/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx
index 9737eab..06dd2e5 100644
--- a/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx
+++ b/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx
@@ -22,6 +22,9 @@ import {
   type AutoWorkflowTemplate,
   type AutoTemplateScope,
 } from '../../../api/workflowApi';
+import { fetchAttributes } from '../../../api/attributesApi';
+import type { AttributeDefinition } from '../../../api/attributesApi';
+import { resolveColumnTypes } from '../../../utils/columnTypeResolver';
 import { useToast } from '../../../contexts/ToastContext';
 import { formatUnixTimestamp } from '../../../utils/time';
 import styles from '../../../pages/admin/Admin.module.css';
@@ -68,6 +71,13 @@ export const GraphicalEditorTemplatesPage: React.FC = () => {
   const [sharingId, setSharingId] = useState<string | null>(null);
 
   const [paginationMeta, setPaginationMeta] = useState<any>(null);
+  const [backendAttributes, setBackendAttributes] = useState<AttributeDefinition[]>([]);
+
+  useEffect(() => {
+    fetchAttributes(request, 'AutoWorkflow')
+      .then(setBackendAttributes)
+      .catch(() => {});
+  }, [request]);
 
   const load = useCallback(async (paginationParams?: any) => {
     if (!instanceId) return;
@@ -173,20 +183,18 @@ export const GraphicalEditorTemplatesPage: React.FC = () => {
     [mandateId, instanceId, navigate]
   );
 
-  const columns: ColumnConfig[] = useMemo(
+  const _rawColumns: ColumnConfig[] = useMemo(
     () => [
-    { key: 'label', label: t('Vorlage'), type: 'string', width: 220, sortable: true },
+    { key: 'label', label: t('Vorlage'), width: 220, sortable: true },
     {
       key: 'templateScope',
       label: t('Bereich'),
-      type: 'string',
       width: 100,
       formatter: (v: string) => scopeLabels[v as AutoTemplateScope] ?? v ?? '—',
     },
     {
       key: 'sharedReadOnly',
       label: t('Freigegeben'),
-      type: 'boolean',
       width: 100,
       formatter: (v: boolean) =>
         v ? (
@@ -198,14 +206,12 @@ export const GraphicalEditorTemplatesPage: React.FC = () => {
     {
       key: 'sysCreatedBy',
       label: t('Erstellt von'),
-      type: 'string',
       width: 140,
       displayField: 'sysCreatedByLabel',
     },
     {
       key: 'sysCreatedAt',
       label: t('Erstellt'),
-      type: 'number',
       width: 140,
       formatter: (v: number) => _formatTs(v),
     },
@@ -213,6 +219,11 @@ export const GraphicalEditorTemplatesPage: React.FC = () => {
     [t, scopeLabels],
   );
 
+  const columns = useMemo(
+    () => resolveColumnTypes(_rawColumns, backendAttributes),
+    [_rawColumns, backendAttributes],
+  );
+
   if (!instanceId) {
     return (
       <div className={styles.adminPage}>
diff --git a/src/pages/views/graphicalEditor/GraphicalEditorWorkflowsPage.tsx b/src/pages/views/graphicalEditor/GraphicalEditorWorkflowsPage.tsx
index 4d0c0ad..d8511c1 100644
--- a/src/pages/views/graphicalEditor/GraphicalEditorWorkflowsPage.tsx
+++ b/src/pages/views/graphicalEditor/GraphicalEditorWorkflowsPage.tsx
@@ -6,7 +6,7 @@
  * Actions: Edit, Delete, Aktivieren/Deaktivieren, Ausführen (nur bei manuellem Trigger).
  */
 
-import React, { useState, useCallback, useEffect, useRef } from 'react';
+import React, { useState, useCallback, useEffect, useRef, useMemo } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { FaPlay, FaSync, FaCheck, FaBan, FaPen, FaFileImport, FaFileExport } from 'react-icons/fa';
 import { usePrompt } from '../../../hooks/usePrompt';
@@ -26,6 +26,9 @@ import {
   type Automation2Workflow,
   type WorkflowFileEnvelope,
 } from '../../../api/workflowApi';
+import { fetchAttributes } from '../../../api/attributesApi';
+import type { AttributeDefinition } from '../../../api/attributesApi';
+import { resolveColumnTypes } from '../../../utils/columnTypeResolver';
 import { useToast } from '../../../contexts/ToastContext';
 import { formatUnixTimestamp } from '../../../utils/time';
 import styles from '../../../pages/admin/Admin.module.css';
@@ -64,6 +67,13 @@ export const GraphicalEditorWorkflowsPage: React.FC = () => {
   const [paginationMeta, setPaginationMeta] = useState<any>(null);
   const [importing, setImporting] = useState(false);
   const importFileInputRef = useRef<HTMLInputElement>(null);
+  const [backendAttributes, setBackendAttributes] = useState<AttributeDefinition[]>([]);
+
+  useEffect(() => {
+    fetchAttributes(request, 'Automation2Workflow')
+      .then(setBackendAttributes)
+      .catch(() => {});
+  }, [request]);
 
   const load = useCallback(async (paginationParams?: any) => {
     if (!instanceId) return;
@@ -251,12 +261,11 @@ export const GraphicalEditorWorkflowsPage: React.FC = () => {
     [instanceId, request, showSuccess, showError, load, t],
   );
 
-  const columns: ColumnConfig[] = [
-    { key: 'label', label: t('Workflow'), type: 'string', width: 200, sortable: true },
+  const _rawColumns: ColumnConfig[] = useMemo(() => [
+    { key: 'label', label: t('Workflow'), width: 200, sortable: true },
     {
       key: 'active',
       label: t('Aktiv (Spalte)'),
-      type: 'boolean',
       width: 80,
       formatter: (value: boolean) =>
         value !== false ? (
@@ -268,7 +277,6 @@ export const GraphicalEditorWorkflowsPage: React.FC = () => {
     {
       key: 'isRunning',
       label: t('läuft'),
-      type: 'boolean',
       width: 80,
       formatter: (value: boolean) =>
         value ? (
@@ -280,7 +288,6 @@ export const GraphicalEditorWorkflowsPage: React.FC = () => {
     {
       key: 'stuckAtNodeLabel',
       label: t('steht bei'),
-      type: 'string',
       width: 160,
       formatter: (value: string, row: Automation2Workflow) =>
         row.isRunning && (value || row.stuckAtNodeId)
@@ -290,25 +297,27 @@ export const GraphicalEditorWorkflowsPage: React.FC = () => {
     {
       key: 'createdAt',
       label: t('Erstellt'),
-      type: 'number',
       width: 140,
       formatter: (v: number) => formatTs(v),
     },
     {
       key: 'lastStartedAt',
       label: t('zuletzt gestartet'),
-      type: 'number',
       width: 160,
       formatter: (v: number) => formatTs(v),
     },
     {
       key: 'runCount',
       label: t('Läufe'),
-      type: 'number',
       width: 80,
       formatter: (v: number) => (v != null ? String(v) : '0'),
     },
-  ];
+  ], [t]);
+
+  const columns = useMemo(
+    () => resolveColumnTypes(_rawColumns, backendAttributes),
+    [_rawColumns, backendAttributes],
+  );
 
   const hookData = {
     refetch: load,
diff --git a/src/pages/views/realestate/RealEstateParcelsView.tsx b/src/pages/views/realestate/RealEstateParcelsView.tsx
index 80fc0dd..e6d77f8 100644
--- a/src/pages/views/realestate/RealEstateParcelsView.tsx
+++ b/src/pages/views/realestate/RealEstateParcelsView.tsx
@@ -18,6 +18,7 @@ import { FaSync } from 'react-icons/fa';
 import styles from '../../admin/Admin.module.css';
 
 import { useLanguage } from '../../../providers/language/LanguageContext';
+import { resolveColumnTypes } from '../../../utils/columnTypeResolver';
 
 export const RealEstateParcelsView: React.FC = () => {
     const { t } = useLanguage();
@@ -54,10 +55,9 @@ export const RealEstateParcelsView: React.FC = () => {
   }, [instanceId, refetch]);
 
   const columns = useMemo(() => {
-    return (attributes || []).map(attr => ({
+    const raw = (attributes || []).map(attr => ({
       key: attr.name,
       label: attr.label || attr.name,
-      type: attr.type as 'string' | 'number' | 'date' | 'boolean',
       sortable: attr.sortable !== false,
       filterable: attr.filterable !== false,
       searchable: attr.searchable !== false,
@@ -66,6 +66,7 @@ export const RealEstateParcelsView: React.FC = () => {
       maxWidth: attr.maxWidth || 400,
       displayField: (attr as any).displayField,
     }));
+    return resolveColumnTypes(raw, attributes || []);
   }, [attributes]);
 
   const canCreate = permissions?.create !== 'n';
diff --git a/src/pages/views/realestate/RealEstateProjectsView.tsx b/src/pages/views/realestate/RealEstateProjectsView.tsx
index 4d25a4b..9a92bc0 100644
--- a/src/pages/views/realestate/RealEstateProjectsView.tsx
+++ b/src/pages/views/realestate/RealEstateProjectsView.tsx
@@ -18,6 +18,7 @@ import { FaSync } from 'react-icons/fa';
 import styles from '../../admin/Admin.module.css';
 
 import { useLanguage } from '../../../providers/language/LanguageContext';
+import { resolveColumnTypes } from '../../../utils/columnTypeResolver';
 
 export const RealEstateProjectsView: React.FC = () => {
     const { t } = useLanguage();
@@ -52,10 +53,9 @@ export const RealEstateProjectsView: React.FC = () => {
   }, [instanceId, refetch]);
 
   const columns = useMemo(() => {
-    return (attributes || []).map(attr => ({
+    const raw = (attributes || []).map(attr => ({
       key: attr.name,
       label: attr.label || attr.name,
-      type: (attr.type || 'string') as 'string' | 'number' | 'date' | 'boolean',
       sortable: attr.sortable !== false,
       filterable: attr.filterable !== false,
       searchable: attr.searchable !== false,
@@ -64,6 +64,7 @@ export const RealEstateProjectsView: React.FC = () => {
       maxWidth: attr.maxWidth || 400,
       displayField: (attr as any).displayField,
     }));
+    return resolveColumnTypes(raw, attributes || []);
   }, [attributes]);
 
   const canCreate = permissions?.create !== 'n';
diff --git a/src/pages/views/trustee/TrusteeDocumentsView.tsx b/src/pages/views/trustee/TrusteeDocumentsView.tsx
index 4bbdd3b..3a8d24c 100644
--- a/src/pages/views/trustee/TrusteeDocumentsView.tsx
+++ b/src/pages/views/trustee/TrusteeDocumentsView.tsx
@@ -23,6 +23,7 @@ import api from '../../../api';
 import styles from '../../admin/Admin.module.css';
 
 import { useLanguage } from '../../../providers/language/LanguageContext';
+import { resolveColumnTypes } from '../../../utils/columnTypeResolver';
 
 export const TrusteeDocumentsView: React.FC = () => {
     const { t } = useLanguage();
@@ -70,7 +71,6 @@ export const TrusteeDocumentsView: React.FC = () => {
     const allCols = (attributes || []).map(attr => ({
       key: attr.name,
       label: attr.label || attr.name,
-      type: attr.type as any,
       sortable: attr.sortable !== false,
       filterable: attr.filterable !== false,
       searchable: attr.searchable !== false,
@@ -88,7 +88,7 @@ export const TrusteeDocumentsView: React.FC = () => {
     for (const col of allCols) {
       if (byKey.has(col.key)) ordered.push(col);
     }
-    return ordered;
+    return resolveColumnTypes(ordered, attributes || []);
   }, [attributes]);
 
   // Check permissions
diff --git a/src/pages/views/trustee/TrusteePositionDocumentsView.tsx b/src/pages/views/trustee/TrusteePositionDocumentsView.tsx
index 749fc41..83b45c8 100644
--- a/src/pages/views/trustee/TrusteePositionDocumentsView.tsx
+++ b/src/pages/views/trustee/TrusteePositionDocumentsView.tsx
@@ -14,6 +14,7 @@ import { FaSync } from 'react-icons/fa';
 import styles from '../../admin/Admin.module.css';
 
 import { useLanguage } from '../../../providers/language/LanguageContext';
+import { resolveColumnTypes } from '../../../utils/columnTypeResolver';
 
 export const TrusteePositionDocumentsView: React.FC = () => {
     const { t } = useLanguage();
@@ -56,12 +57,11 @@ export const TrusteePositionDocumentsView: React.FC = () => {
     // Exclude system fields from table columns
     const excludedFields = ['id', 'mandateId', 'featureInstanceId', 'sysCreatedBy', 'sysCreatedAt', 'sysModifiedAt', 'sysModifiedBy'];
     
-    return attributes
+    const raw = attributes
       .filter((attr: any) => !excludedFields.includes(attr.name))
       .map((attr: any) => ({
         key: attr.name,
         label: attr.label || attr.name,
-        type: attr.type as any,
         sortable: attr.sortable !== false,
         filterable: attr.filterable !== false,
         searchable: attr.searchable !== false,
@@ -70,6 +70,7 @@ export const TrusteePositionDocumentsView: React.FC = () => {
         maxWidth: attr.maxWidth || 400,
         displayField: attr.displayField,
       }));
+    return resolveColumnTypes(raw, attributes);
   }, [attributes]);
 
   // Check permissions (general level)
diff --git a/src/pages/views/trustee/TrusteePositionsView.tsx b/src/pages/views/trustee/TrusteePositionsView.tsx
index 66122c2..bb5875a 100644
--- a/src/pages/views/trustee/TrusteePositionsView.tsx
+++ b/src/pages/views/trustee/TrusteePositionsView.tsx
@@ -26,6 +26,7 @@ import { formatAmount, formatPercent } from '../../../utils/formatAmount';
 import styles from '../../admin/Admin.module.css';
 
 import { useLanguage } from '../../../providers/language/LanguageContext';
+import { resolveColumnTypes } from '../../../utils/columnTypeResolver';
 
 export const TrusteePositionsView: React.FC = () => {
     const { t } = useLanguage();
@@ -285,7 +286,6 @@ export const TrusteePositionsView: React.FC = () => {
         const col: ColumnConfig = {
           key: attr.name,
           label: attr.label || attr.name,
-          type: attr.type as any,
           sortable: attr.sortable !== false,
           filterable: attr.filterable !== false,
           searchable: attr.searchable !== false,
@@ -320,7 +320,7 @@ export const TrusteePositionsView: React.FC = () => {
       const col = byKey.get(key);
       if (col) ordered.push(col);
     }
-    return ordered;
+    return resolveColumnTypes(ordered, attributes || []);
   }, [attributes, belegeColumn, syncStatusColumn]);
 
   // Check permissions
diff --git a/src/pages/views/trustee/dataTables/TrusteeDataTab.tsx b/src/pages/views/trustee/dataTables/TrusteeDataTab.tsx
index 1b6f5bf..75c00a1 100644
--- a/src/pages/views/trustee/dataTables/TrusteeDataTab.tsx
+++ b/src/pages/views/trustee/dataTables/TrusteeDataTab.tsx
@@ -25,6 +25,7 @@ import { FormGeneratorForm } from '../../../../components/FormGenerator/FormGene
 import { useLanguage } from '../../../../providers/language/LanguageContext';
 import { useInstanceId } from '../../../../hooks/useCurrentInstance';
 import adminStyles from '../../../admin/Admin.module.css';
+import { resolveColumnTypes } from '../../../../utils/columnTypeResolver';
 
 export interface TrusteeDataTabProps {
   /** Result of the entity hook factory call (see `useTrustee.ts`). */
@@ -117,12 +118,11 @@ export const TrusteeDataTab: React.FC<TrusteeDataTabProps> = ({
 
   const columns = useMemo(() => {
     const hidden = new Set([..._DEFAULT_HIDDEN_COLUMNS, ...(hiddenColumns || [])]);
-    return (attributes || [])
+    const raw = (attributes || [])
       .filter((attr: any) => !hidden.has(attr.name))
       .map((attr: any) => ({
         key: attr.name,
         label: attr.label || attr.name,
-        type: (attr.type as any) || 'text',
         sortable: attr.sortable !== false,
         filterable: attr.filterable !== false,
         searchable: attr.searchable !== false,
@@ -133,6 +133,7 @@ export const TrusteeDataTab: React.FC<TrusteeDataTabProps> = ({
         frontendFormat: attr.frontendFormat,
         frontendFormatLabels: attr.frontendFormatLabels,
       }));
+    return resolveColumnTypes(raw, attributes || []);
   }, [attributes, hiddenColumns]);
 
   const formAttributes = useMemo(() => {
diff --git a/src/utils/attributeTypeMapper.ts b/src/utils/attributeTypeMapper.ts
index f9e3517..1d18dcc 100644
--- a/src/utils/attributeTypeMapper.ts
+++ b/src/utils/attributeTypeMapper.ts
@@ -24,7 +24,9 @@ export type AttributeType =
   | 'string'
   | 'enum'
   | 'slug'
-  | 'readonly';
+  | 'readonly'
+  | 'object'
+  | 'json';
 
 export type InputComponentType = 
   | 'text' 
@@ -82,6 +84,7 @@ export function attributeTypeToInputType(attributeType: AttributeType): InputCom
       return 'multiselect';
     
     case 'integer':
+    case 'int':
     case 'number':
     case 'float':
       return 'number';
@@ -113,6 +116,10 @@ export function attributeTypeToInputType(attributeType: AttributeType): InputCom
     
     case 'readonly':
       return 'text'; // Default to text for readonly, but should be rendered as readonly
+
+    case 'object':
+    case 'json':
+      return 'textarea';
     
     default:
       // Default fallback to text input
@@ -124,7 +131,7 @@ export function attributeTypeToInputType(attributeType: AttributeType): InputCom
  * Determines if an attribute type should render as a textarea
  */
 export function isTextareaType(attributeType: AttributeType): boolean {
-  return attributeType === 'textarea';
+  return attributeType === 'textarea' || attributeType === 'object' || attributeType === 'json';
 }
 
 /**
@@ -166,7 +173,12 @@ export function isFileType(attributeType: AttributeType): boolean {
  * Determines if an attribute type should render as a number input
  */
 export function isNumberType(attributeType: AttributeType): boolean {
-  return attributeType === 'integer' || attributeType === 'number' || attributeType === 'float';
+  return (
+    attributeType === 'integer'
+    || attributeType === 'int'
+    || attributeType === 'number'
+    || attributeType === 'float'
+  );
 }
 
 /**
@@ -176,6 +188,25 @@ export function isDateTimeType(attributeType: AttributeType): boolean {
   return attributeType === 'timestamp' || attributeType === 'date' || attributeType === 'time';
 }
 
+/**
+ * Subset of AttributeType suitable for user-facing form fields (workflow start forms,
+ * input forms, field builders). Components render labels via t(FORM_FIELD_TYPE_LABELS[ft]).
+ */
+export const FORM_FIELD_TYPES: AttributeType[] = [
+  'text', 'textarea', 'number', 'email', 'date', 'boolean', 'select', 'checkbox',
+];
+
+export const FORM_FIELD_TYPE_LABELS: Record<string, string> = {
+  text: 'Text',
+  textarea: 'Mehrzeilig',
+  number: 'Zahl',
+  email: 'E-Mail',
+  date: 'Datum',
+  boolean: 'Ja/Nein',
+  select: 'Auswahl',
+  checkbox: 'Kontrollkästchen',
+};
+
 /**
  * Gets the default value for an attribute type
  */
diff --git a/src/utils/columnTypeResolver.ts b/src/utils/columnTypeResolver.ts
new file mode 100644
index 0000000..7ce5e22
--- /dev/null
+++ b/src/utils/columnTypeResolver.ts
@@ -0,0 +1,57 @@
+/**
+ * Resolves column types from backend attribute definitions.
+ *
+ * Pages define column configs with UI metadata (label, width, formatter, etc.)
+ * but omit the `type` field. This utility merges the backend-provided attribute
+ * type into each column, ensuring a single source of truth for column types.
+ */
+
+import type { ColumnConfig } from '../components/FormGenerator/FormGeneratorTable';
+import type { AttributeType } from './attributeTypeMapper';
+
+export interface AttributeLike {
+  name: string;
+  type?: string;
+  displayField?: string;
+  frontendFormat?: string;
+  frontendFormatLabels?: string[];
+}
+
+/**
+ * Merge backend attribute types into page-defined column configs.
+ *
+ * For each column, the `type` is resolved from the matching backend attribute
+ * (by `key === attr.name`). Page-level overrides for `type` are preserved only
+ * when no backend attribute is available (graceful degradation during loading).
+ */
+export function resolveColumnTypes(
+  columns: ColumnConfig[],
+  attributes: AttributeLike[],
+): ColumnConfig[] {
+  if (!attributes || attributes.length === 0) return columns;
+
+  const attrMap = new Map<string, AttributeLike>();
+  for (const attr of attributes) {
+    attrMap.set(attr.name, attr);
+  }
+
+  return columns.map((col) => {
+    const attr = attrMap.get(col.key);
+    if (!attr) return col;
+
+    const merged: ColumnConfig = { ...col };
+    if (attr.type) {
+      merged.type = attr.type as AttributeType;
+    }
+    if (attr.displayField && !col.displayField) {
+      merged.displayField = attr.displayField;
+    }
+    if (attr.frontendFormat && !col.frontendFormat) {
+      merged.frontendFormat = attr.frontendFormat;
+    }
+    if (attr.frontendFormatLabels && !col.frontendFormatLabels) {
+      merged.frontendFormatLabels = attr.frontendFormatLabels;
+    }
+    return merged;
+  });
+}

From f0e73b62d2ce4e03ba442d5f35e0c31419fbe574 Mon Sep 17 00:00:00 2001
From: ValueOn AG <p.motsch@valueon.ch>
Date: Sun, 26 Apr 2026 22:53:39 +0200
Subject: [PATCH 6/6] Graph and data class falignment strict

---
 src/api/workflowApi.ts                        |  4 +-
 .../editor/EditorWorkflowChatList.tsx         |  4 +-
 .../FormGeneratorControls.tsx                 |  2 +-
 .../FormGeneratorTable/FormGeneratorTable.tsx | 45 +++++++++--
 src/hooks/useInvitations.ts                   |  8 +-
 src/hooks/useTrustee.ts                       | 11 ++-
 src/pages/AutomationsDashboardPage.tsx        | 51 +++++-------
 src/pages/ComplianceAuditPage.tsx             |  1 -
 src/pages/admin/AdminDatabaseHealthPage.tsx   | 27 ++++++-
 src/pages/admin/AdminInvitationsPage.tsx      | 65 ++++------------
 src/pages/admin/AdminLanguagesPage.tsx        | 40 ++++++++++
 src/pages/admin/AdminMandateRolesPage.tsx     | 46 ++---------
 .../wizards/AdminInvitationWizardPage.tsx     |  6 +-
 .../GraphicalEditorTemplatesPage.tsx          | 44 +++--------
 .../GraphicalEditorWorkflowsPage.tsx          | 43 ++++------
 .../realestate/RealEstateParcelsView.tsx      |  1 +
 .../realestate/RealEstateProjectsView.tsx     |  1 +
 .../views/trustee/TrusteePositionsView.tsx    | 78 ++-----------------
 src/utils/columnTypeResolver.ts               | 28 ++++++-
 19 files changed, 223 insertions(+), 282 deletions(-)

diff --git a/src/api/workflowApi.ts b/src/api/workflowApi.ts
index 76aa49a..47c33c9 100644
--- a/src/api/workflowApi.ts
+++ b/src/api/workflowApi.ts
@@ -156,8 +156,8 @@ export interface Automation2Workflow {
   stuckAtNodeId?: string;
   /** Enriched: human-readable label for stuck node */
   stuckAtNodeLabel?: string;
-  /** Enriched: created timestamp (seconds) */
-  createdAt?: number;
+  /** From PowerOnModel base — record creation timestamp (seconds) */
+  sysCreatedAt?: number;
   /** Enriched: last run started timestamp (seconds) */
   lastStartedAt?: number;
 }
diff --git a/src/components/FlowEditor/editor/EditorWorkflowChatList.tsx b/src/components/FlowEditor/editor/EditorWorkflowChatList.tsx
index 7709636..7973c98 100644
--- a/src/components/FlowEditor/editor/EditorWorkflowChatList.tsx
+++ b/src/components/FlowEditor/editor/EditorWorkflowChatList.tsx
@@ -48,7 +48,7 @@ export const EditorWorkflowChatList: React.FC<EditorWorkflowChatListProps> = ({
     const list = q
       ? workflows.filter((w) => (w.label || '').toLowerCase().includes(q))
       : [...workflows];
-    list.sort((a, b) => (b.lastStartedAt || b.createdAt || 0) - (a.lastStartedAt || a.createdAt || 0));
+    list.sort((a, b) => (b.lastStartedAt || b.sysCreatedAt || 0) - (a.lastStartedAt || a.sysCreatedAt || 0));
     return list;
   }, [workflows, search]);
 
@@ -85,7 +85,7 @@ export const EditorWorkflowChatList: React.FC<EditorWorkflowChatListProps> = ({
         ) : (
           filtered.map((wf) => {
             const isActive = wf.id === currentWorkflowId;
-            const ts = wf.lastStartedAt || wf.createdAt;
+            const ts = wf.lastStartedAt || wf.sysCreatedAt;
             return (
               <div
                 key={wf.id}
diff --git a/src/components/FormGenerator/FormGeneratorControls/FormGeneratorControls.tsx b/src/components/FormGenerator/FormGeneratorControls/FormGeneratorControls.tsx
index 9b3e446..0e5ff03 100644
--- a/src/components/FormGenerator/FormGeneratorControls/FormGeneratorControls.tsx
+++ b/src/components/FormGenerator/FormGeneratorControls/FormGeneratorControls.tsx
@@ -10,7 +10,7 @@ import type { AttributeType } from '../../../utils/attributeTypeMapper';
 // Generic field/column config interface
 export interface FilterableField {
   key: string;
-  label: string;
+  label?: string;
   type?: AttributeType;
   filterable?: boolean;
   filterOptions?: string[];
diff --git a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
index d7303f8..4592906 100644
--- a/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
+++ b/src/components/FormGenerator/FormGeneratorTable/FormGeneratorTable.tsx
@@ -106,7 +106,9 @@ const _objectToDisplayString = (value: Record<string, unknown>): string => {
 // Types for the FormGeneratorTable
 export interface ColumnConfig {
   key: string;
-  label: string;
+  /** Header label. Optional — when omitted, `resolveColumnTypes` fills it from the
+   *  backend Pydantic field's `label`. Set explicitly only to override. */
+  label?: string;
   type?: AttributeType;
   width?: number;
   minWidth?: number;
@@ -129,6 +131,11 @@ export interface ColumnConfig {
   // Pre-translated label tokens for binary/categorical cells, e.g. ["Ja", "-", "Nein"].
   // Resolved server-side via i18n so the FE never needs another translation hop.
   frontendFormatLabels?: string[];
+  // Backend-provided enum options (frontend_options on a Pydantic Field).
+  // When present and column.type is `select`, the cell renderer translates the
+  // raw value into the matching label.  Pages MUST NOT hardcode value→label
+  // mappings — they must come from the Pydantic model.
+  options?: Array<{ value: string | number; label: string }>;
 }
 
 export interface FormGeneratorTableProps<T = any> {
@@ -1219,9 +1226,10 @@ export function FormGeneratorTable<T extends Record<string, any>>({
   }, [openFilterColumn, detectedColumns, asyncFilterValues, filterValuesLoading, hookData, apiEndpoint, supportsBackendPagination, filters]);
 
   // Get unique values for a column (for filter dropdown)
-  // Sources: 1) column.filterOptions (static enum)
-  //          2) asyncFilterValues (loaded from backend via hookData.fetchFilterValues)
-  //          3) data — ONLY when no backend pagination (data = full dataset)
+  // Sources: 1) column.filterOptions (static enum, page-defined)
+  //          2) column.options (backend-provided frontend_options on Pydantic field)
+  //          3) asyncFilterValues (loaded from backend via hookData.fetchFilterValues)
+  //          4) data — ONLY when no backend pagination (data = full dataset)
   // With backend pagination, data is a single page, so extracting filter
   // values from it would be incomplete and misleading.
   const getUniqueValuesForColumn = useCallback((columnKey: string): FilterValue[] => {
@@ -1231,6 +1239,10 @@ export function FormGeneratorTable<T extends Record<string, any>>({
       return column.filterOptions;
     }
 
+    if (column?.options && column.options.length > 0) {
+      return column.options.map((o) => ({ value: String(o.value), label: o.label }));
+    }
+
     // displayField + local full dataset: { value, label } from enriched rows
     if (column?.displayField && !supportsBackendPagination) {
       const showKey = column.displayField;
@@ -1905,6 +1917,15 @@ export function FormGeneratorTable<T extends Record<string, any>>({
       return renderBooleanCell(value, column, row);
     }
 
+    // Select / enum cells: translate raw value to backend-provided label.
+    // Pages MUST NOT hardcode value→label maps; they must declare
+    // `frontend_options` on the Pydantic field, and the API forwards them
+    // (already translated server-side via i18n) into `column.options`.
+    if (column.options && column.options.length > 0 && (value !== null && value !== undefined && value !== '')) {
+      const match = column.options.find((opt) => String(opt.value) === String(value));
+      if (match) return match.label;
+    }
+
     // Check if this is an ID or hash field that should be truncated and copyable
     // Do this BEFORE checking for custom formatters to ensure IDs/hashes are always copyable
     const isId = isIdField(column.key);
@@ -2284,9 +2305,9 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                       <span 
                         className={styles.columnLabel}
                         onClick={() => column.sortable && handleSort(column.key)}
-                        title={column.label}
+                        title={column.label ?? column.key}
                       >
-                        {column.label}
+                        {column.label ?? column.key}
                       </span>
                     </div>
                     
@@ -2298,7 +2319,7 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                         onClick={(e) => e.stopPropagation()}
                       >
                         <div className={styles.filterDropdownHeader}>
-                          <span>{t('Filter')}: {column.label}</span>
+                          <span>{t('Filter')}: {column.label ?? column.key}</span>
                           {column.key in filters && (
                             <button
                               className={styles.filterClearBtn}
@@ -2448,7 +2469,15 @@ export function FormGeneratorTable<T extends Record<string, any>>({
                                     allValues={columnFilterValues}
                                     activeFilter={filters[column.key]}
                                     onSelect={(value) => handleFilter(column.key, value)}
-                                    resolveLabel={column.filterLabelResolver}
+                                    resolveLabel={
+                                      column.filterLabelResolver
+                                      ?? (column.options && column.options.length > 0
+                                        ? (v: string) => {
+                                          const m = column.options!.find((o) => String(o.value) === String(v));
+                                          return m ? m.label : v;
+                                        }
+                                        : undefined)
+                                    }
                                   />
                                 )}
                               </>
diff --git a/src/hooks/useInvitations.ts b/src/hooks/useInvitations.ts
index 61a6fd9..7377e3e 100644
--- a/src/hooks/useInvitations.ts
+++ b/src/hooks/useInvitations.ts
@@ -41,9 +41,11 @@ export interface Invitation {
   maxUses: number;
   currentUses: number;
   inviteUrl: string;
-  emailSent?: boolean;
-  isExpired?: boolean;
-  isUsedUp?: boolean;
+  // Backend-driven flags (computed @ Pydantic model + view enrichment)
+  emailSentFlag?: boolean;
+  emailSentAt?: number;
+  expiredFlag?: boolean;
+  usedUpFlag?: boolean;
 }
 
 export interface InvitationCreate {
diff --git a/src/hooks/useTrustee.ts b/src/hooks/useTrustee.ts
index 83e0823..c9aad43 100644
--- a/src/hooks/useTrustee.ts
+++ b/src/hooks/useTrustee.ts
@@ -110,6 +110,11 @@ export interface AttributeDefinition {
 
 interface TrusteeEntityConfig<T> {
   entityName: string;
+  /** Optional override: name of the *view* model (e.g. ``TrusteePositionView``)
+   *  used purely for the `/attributes/...` lookup so synthetic display columns
+   *  resolve via `resolveColumnTypes`.  Falls back to `entityName` when absent.
+   *  Permissions and CRUD operations always use `entityName`. */
+  attributesEntityName?: string;
   fetchAll: (request: any, instanceId: string, params?: PaginationParams) => Promise<any>;
   fetchById: (request: any, instanceId: string, id: string) => Promise<T | null>;
   create: (request: any, instanceId: string, data: Partial<T>) => Promise<T>;
@@ -138,7 +143,8 @@ function _createTrusteeEntityHook<T extends { id: string }>(config: TrusteeEntit
       if (!instanceId) return [];
       
       try {
-        const response = await api.get(`/api/trustee/${instanceId}/attributes/${config.entityName}`);
+        const attrEntity = config.attributesEntityName ?? config.entityName;
+        const response = await api.get(`/api/trustee/${instanceId}/attributes/${attrEntity}`);
         let attrs: AttributeDefinition[] = [];
         if (response.data?.attributes && Array.isArray(response.data.attributes)) {
           attrs = response.data.attributes;
@@ -571,6 +577,9 @@ export const useTrusteeDocumentOperations = _createTrusteeOperationsHook(documen
 
 const positionConfig: TrusteeEntityConfig<TrusteePosition> = {
   entityName: 'TrusteePosition',
+  // Use the view model so the table picks up `syncStatus` / `syncErrorMessage`
+  // attributes (computed at the route layer from `TrusteeAccountingSync`).
+  attributesEntityName: 'TrusteePositionView',
   fetchAll: fetchPositionsApi,
   fetchById: fetchPositionByIdApi,
   create: createPositionApi,
diff --git a/src/pages/AutomationsDashboardPage.tsx b/src/pages/AutomationsDashboardPage.tsx
index e0923f7..3941bd6 100644
--- a/src/pages/AutomationsDashboardPage.tsx
+++ b/src/pages/AutomationsDashboardPage.tsx
@@ -440,7 +440,7 @@ const _DashboardTab: React.FC = () => {
   useEffect(() => {
     fetchAttributes(request, 'AutoRun')
       .then(setBackendAttributes)
-      .catch(() => {});
+      .catch((err) => { console.error('[automations] fetchAttributes AutoRun failed', err); });
   }, [request]);
 
   const _loadMetrics = useCallback(async () => {
@@ -531,15 +531,6 @@ const _DashboardTab: React.FC = () => {
     }
   }, [showError, t]);
 
-  const _STATUS_LABELS: Record<string, string> = useMemo(() => ({
-    running: t('Laufend'),
-    completed: t('Abgeschlossen'),
-    failed: t('Fehlgeschlagen'),
-    cancelled: t('Abgebrochen'),
-    paused: t('Pausiert'),
-    stopped: t('Gestoppt'),
-  }), [t]);
-
   const _rawRunColumns: ColumnConfig[] = useMemo(() => [
     {
       key: 'workflowLabel',
@@ -564,35 +555,24 @@ const _DashboardTab: React.FC = () => {
       filterable: true,
       displayField: 'instanceLabel',
     },
+    { key: 'status', width: 110, sortable: true, filterable: true },
     {
-      key: 'status',
-      label: t('Status'),
-      width: 110,
-      sortable: true,
-      filterable: true,
-      filterOptions: ['running', 'completed', 'failed', 'cancelled', 'paused'],
-      filterLabelResolver: (v: string) => _STATUS_LABELS[v] || v,
-      formatter: (v: string) => (
-        <span style={{ color: _STATUS_COLORS[v] || 'inherit', fontWeight: 600 }}>
-          {_STATUS_LABELS[v] || v}
-        </span>
-      ),
-    },
-    {
-      key: 'sysCreatedAt',
+      key: 'startedAt',
       label: t('Gestartet'),
       width: 150,
       sortable: true,
+      filterable: true,
       formatter: (v: number) => _formatTs(v),
     },
     {
-      key: 'sysModifiedAt',
+      key: 'completedAt',
       label: t('Beendet'),
       width: 150,
       sortable: true,
+      filterable: true,
       formatter: (v: number) => _formatTs(v),
     },
-  ], [t, _STATUS_LABELS]);
+  ], [t]);
 
   const _runColumns = useMemo(
     () => resolveColumnTypes(_rawRunColumns, backendAttributes),
@@ -675,7 +655,7 @@ const _DashboardTab: React.FC = () => {
           filterable={true}
           sortable={true}
           selectable={true}
-          initialSort={[{ key: 'sysCreatedAt', direction: 'desc' }]}
+          initialSort={[{ key: 'startedAt', direction: 'desc' }]}
           apiEndpoint="/api/system/workflow-runs"
           customActions={[
             {
@@ -724,9 +704,9 @@ const _WorkflowsTab: React.FC = () => {
   const [backendAttributes, setBackendAttributes] = useState<AttributeDefinition[]>([]);
 
   useEffect(() => {
-    fetchAttributes(request, 'Automation2Workflow')
+    fetchAttributes(request, 'Automation2WorkflowView')
       .then(setBackendAttributes)
-      .catch(() => {});
+      .catch((err) => { console.error('[automations] fetchAttributes Automation2WorkflowView failed', err); });
   }, [request]);
 
   const _load = useCallback(async (paginationParams?: any) => {
@@ -740,7 +720,7 @@ const _WorkflowsTab: React.FC = () => {
       if (activeFilter === 'active') params.active = true;
       if (activeFilter === 'inactive') params.active = false;
 
-      const defaultSort = [{ field: 'createdAt', direction: 'desc' }];
+      const defaultSort = [{ field: 'sysCreatedAt', direction: 'desc' }];
       const pag = {
         page: effectiveParams?.page || 1,
         pageSize: effectiveParams?.pageSize || 25,
@@ -929,24 +909,31 @@ const _WorkflowsTab: React.FC = () => {
       key: 'isRunning',
       label: t('Läuft'),
       width: 80,
+      sortable: true,
+      filterable: true,
     },
     {
       key: 'sysCreatedAt',
       label: t('Erstellt'),
       width: 140,
       sortable: true,
+      filterable: true,
       formatter: (v: number) => _formatTs(v),
     },
     {
       key: 'lastStartedAt',
       label: t('Zuletzt gestartet'),
       width: 160,
+      sortable: true,
+      filterable: true,
       formatter: (v: number) => _formatTs(v),
     },
     {
       key: 'runCount',
       label: t('Läufe'),
       width: 80,
+      sortable: true,
+      filterable: true,
       formatter: (v: number) => (v != null ? String(v) : '0'),
     },
   ], [t]);
@@ -1000,7 +987,7 @@ const _WorkflowsTab: React.FC = () => {
           filterable={true}
           sortable={true}
           selectable={true}
-          initialSort={[{ key: 'createdAt', direction: 'desc' }]}
+          initialSort={[{ key: 'sysCreatedAt', direction: 'desc' }]}
           apiEndpoint="/api/system/workflow-runs/workflows"
           actionButtons={[
             {
diff --git a/src/pages/ComplianceAuditPage.tsx b/src/pages/ComplianceAuditPage.tsx
index ea45645..ab8c7b4 100644
--- a/src/pages/ComplianceAuditPage.tsx
+++ b/src/pages/ComplianceAuditPage.tsx
@@ -498,7 +498,6 @@ export const ComplianceAuditPage: React.FC = () => {
       sortable: true,
       filterable: true,
       width: 80,
-      formatter: (val: any) => (val ? t('OK') : t('Fehler')),
       cellClassName: (val: any) => (val ? styles.statusOk : styles.statusError),
     },
   ], [t]);
diff --git a/src/pages/admin/AdminDatabaseHealthPage.tsx b/src/pages/admin/AdminDatabaseHealthPage.tsx
index 49270ec..7e4f41d 100644
--- a/src/pages/admin/AdminDatabaseHealthPage.tsx
+++ b/src/pages/admin/AdminDatabaseHealthPage.tsx
@@ -375,12 +375,20 @@ const OrphansTab: React.FC = () => {
   const [downloading, setDownloading] = useState<string | null>(null);
   const [cleaningAll, setCleaningAll] = useState(false);
   const [onlyProblems, setOnlyProblems] = useState(true);
+  // Default ON: deleted-user remnants belong to a dedicated purge workflow,
+  // not to generic FK cleanup. Hiding them by default prevents confusion
+  // (and accidental "Alle bereinigen" runs) when the SysAdmin scans for
+  // genuine FK drift.
+  const [excludeUserFks, setExcludeUserFks] = useState(true);
   const [dbFilter, setDbFilter] = useState<string>('');
 
   const _fetchOrphans = useCallback(async () => {
     try {
       setLoading(true);
-      const params = dbFilter ? `?db=${encodeURIComponent(dbFilter)}` : '';
+      const qs = new URLSearchParams();
+      if (dbFilter) qs.set('db', dbFilter);
+      if (excludeUserFks) qs.set('excludeUserFks', 'true');
+      const params = qs.toString() ? `?${qs.toString()}` : '';
       const res = await api.get(`/api/admin/database-health/orphans${params}`);
       const rows = (res.data.orphans || []).map((o: any, i: number) => ({
         ...o,
@@ -392,7 +400,7 @@ const OrphansTab: React.FC = () => {
     } finally {
       setLoading(false);
     }
-  }, [dbFilter]);
+  }, [dbFilter, excludeUserFks]);
 
   useEffect(() => { _fetchOrphans(); }, [_fetchOrphans]);
 
@@ -515,7 +523,7 @@ const OrphansTab: React.FC = () => {
     if (!ok) return;
     setCleaningAll(true);
     try {
-      const res = await api.post('/api/admin/database-health/orphans/clean-all', { force });
+      const res = await api.post('/api/admin/database-health/orphans/clean-all', { force, excludeUserFks });
       const results: CleanResult[] = res.data.results || [];
       const totalDeleted = results.reduce((s, r) => s + r.deleted, 0);
       const errors = results.filter(r => r.error);
@@ -636,6 +644,19 @@ const OrphansTab: React.FC = () => {
             {t('Nur Probleme')}
           </label>
         </div>
+        <div className={styles.filterGroup}>
+          <label
+            className={styles.checkboxLabel}
+            title={t('FK-Referenzen auf UserInDB.id ausblenden — diese werden über den User-Purge-Workflow separat behandelt.')}
+          >
+            <input
+              type="checkbox"
+              checked={excludeUserFks}
+              onChange={e => setExcludeUserFks(e.target.checked)}
+            />
+            {t('Ohne FK-Referenzen zu UserInDB.id')}
+          </label>
+        </div>
         <div className={styles.headerActions}>
           <button className={styles.secondaryButton} onClick={_fetchOrphans} disabled={loading}>
             <FaSync className={loading ? 'spinning' : ''} /> {t('Scan')}
diff --git a/src/pages/admin/AdminInvitationsPage.tsx b/src/pages/admin/AdminInvitationsPage.tsx
index 61c64f8..1f1c73c 100644
--- a/src/pages/admin/AdminInvitationsPage.tsx
+++ b/src/pages/admin/AdminInvitationsPage.tsx
@@ -73,7 +73,7 @@ export const AdminInvitationsPage: React.FC = () => {
     }
   }, [selectedMandateId, showExpired, showUsed, fetchInvitations, fetchRoles]);
 
-  // Format timestamp
+  // Format timestamp (used by URL modal only).
   const formatDate = (timestamp: number) => {
     if (!timestamp) return '-';
     const date = new Date(timestamp * 1000);
@@ -87,33 +87,12 @@ export const AdminInvitationsPage: React.FC = () => {
   };
 
   const _rawColumns: ColumnConfig[] = useMemo(() => [
-    {
-      key: 'targetUsername',
-      label: t('Benutzername'),
-      sortable: true,
-      filterable: true,
-      searchable: true,
-      width: 150,
-    },
-    {
-      key: 'email',
-      label: t('E-Mail'),
-      sortable: true,
-      filterable: true,
-      width: 180,
-      formatter: (value: string, row: Invitation) => {
-        const emailText = value || '-';
-        const emailSent = (row as any).emailSent;
-        return (
-          <span title={emailSent ? t('E-Mail wurde gesendet') : t('E-Mail nicht gesendet')}>
-            {emailText} {emailSent && '✓'}
-          </span>
-        );
-      },
-    },
+    { key: 'targetUsername', sortable: true, filterable: true, searchable: true, width: 150 },
+    { key: 'email', sortable: true, filterable: true, width: 180 },
+    { key: 'emailSentFlag', sortable: true, filterable: true, width: 90 },
+    { key: 'emailSentAt', sortable: true, filterable: true, width: 150 },
     {
       key: 'roleIds',
-      label: t('Rollen'),
       sortable: false,
       filterable: false,
       width: 150,
@@ -125,36 +104,18 @@ export const AdminInvitationsPage: React.FC = () => {
         }).join(', ');
       },
     },
-    {
-      key: 'expiresAt',
-      label: t('Gültig bis'),
-      sortable: true,
-      width: 150,
-      formatter: (value: number) => {
-        const text = formatDate(value);
-        const isExpired = value < Date.now() / 1000;
-        return (
-          <span style={{ color: isExpired ? 'var(--danger-color)' : 'inherit' }}>
-            {text} {isExpired && '(abgelaufen)'}
-          </span>
-        );
-      },
-    },
+    { key: 'expiresAt', sortable: true, filterable: true, width: 150 },
+    { key: 'expiredFlag', sortable: true, filterable: true, width: 90 },
     {
       key: 'currentUses',
-      label: t('Verwendet'),
       sortable: true,
+      filterable: true,
       width: 100,
       formatter: (value: number, row: Invitation) => `${value || 0} / ${row.maxUses || 1}`,
     },
-    {
-      key: 'sysCreatedAt',
-      label: t('Erstellt'),
-      sortable: true,
-      width: 150,
-      formatter: (value: number) => formatDate(value),
-    },
-  ], [roles, t]);
+    { key: 'usedUpFlag', sortable: true, filterable: true, width: 90 },
+    { key: 'sysCreatedAt', sortable: true, filterable: true, width: 150 },
+  ], [roles]);
 
   const columns = useMemo(
     () => resolveColumnTypes(_rawColumns, backendAttributes),
@@ -445,8 +406,8 @@ export const AdminInvitationsPage: React.FC = () => {
                 {t('verwendet werden.')}
               </p>
               {showUrlModal.email && (
-                <p style={{ marginTop: '0.5rem', fontSize: '0.875rem', color: showUrlModal.emailSent ? 'var(--success-color)' : 'var(--text-secondary)' }}>
-                  {showUrlModal.emailSent
+                <p style={{ marginTop: '0.5rem', fontSize: '0.875rem', color: showUrlModal.emailSentFlag ? 'var(--success-color)' : 'var(--text-secondary)' }}>
+                  {showUrlModal.emailSentFlag
                     ? `✓ ${t('E-Mail wurde an {email} gesendet', { email: showUrlModal.email })}`
                     : `${t('E-Mail-Adresse')}: ${showUrlModal.email} (${t('nicht gesendet')})`}
                 </p>
diff --git a/src/pages/admin/AdminLanguagesPage.tsx b/src/pages/admin/AdminLanguagesPage.tsx
index ea77f94..8e324ca 100644
--- a/src/pages/admin/AdminLanguagesPage.tsx
+++ b/src/pages/admin/AdminLanguagesPage.tsx
@@ -367,6 +367,45 @@ export const AdminLanguagesPage: React.FC = () => {
     });
   }, [rows, search]);
 
+  const _fetchFilterValues = useCallback(
+    async (columnKey: string, crossFilters?: Record<string, any>): Promise<(string | null)[]> => {
+      let source = displayRows;
+      if (crossFilters && Object.keys(crossFilters).length > 0) {
+        source = source.filter((row) => {
+          for (const [key, val] of Object.entries(crossFilters)) {
+            if (val === undefined || val === null || val === '') continue;
+            const cell = (row as any)[key];
+            if (Array.isArray(val)) {
+              if (val.length > 0 && !val.includes(String(cell ?? ''))) return false;
+            } else if (String(cell ?? '') !== String(val)) {
+              return false;
+            }
+          }
+          return true;
+        });
+      }
+      const seen = new Set<string>();
+      let hasEmpty = false;
+      for (const row of source) {
+        const v = (row as any)[columnKey];
+        if (v === undefined || v === null || v === '') {
+          hasEmpty = true;
+          continue;
+        }
+        seen.add(String(v));
+      }
+      const out: (string | null)[] = Array.from(seen).sort((a, b) => a.localeCompare(b));
+      if (hasEmpty) out.push(null);
+      return out;
+    },
+    [displayRows],
+  );
+
+  const _hookData = useMemo(
+    () => ({ fetchFilterValues: _fetchFilterValues }),
+    [_fetchFilterValues],
+  );
+
   const columns = useMemo(() => {
     const raw: ColumnConfig[] = [
       { key: 'id', label: t('Code'), sortable: true, filterable: true, width: 90 },
@@ -886,6 +925,7 @@ export const AdminLanguagesPage: React.FC = () => {
           pagination={false}
           selectable={false}
           searchable={false}
+          hookData={_hookData}
           customActions={[
             {
               id: 'sync-xx',
diff --git a/src/pages/admin/AdminMandateRolesPage.tsx b/src/pages/admin/AdminMandateRolesPage.tsx
index 77db34d..007ad89 100644
--- a/src/pages/admin/AdminMandateRolesPage.tsx
+++ b/src/pages/admin/AdminMandateRolesPage.tsx
@@ -19,7 +19,7 @@ import { useMandateRoles, type Role, type RoleCreate, type RoleUpdate, type Pagi
 import { useUserMandates, type Mandate } from '../../hooks/useUserMandates';
 import { FormGeneratorTable } from '../../components/FormGenerator/FormGeneratorTable';
 import { FormGeneratorForm, type AttributeDefinition } from '../../components/FormGenerator/FormGeneratorForm';
-import { FaPlus, FaSync, FaUserShield, FaBuilding, FaGlobe, FaShieldAlt, FaCube } from 'react-icons/fa';
+import { FaPlus, FaSync, FaUserShield, FaBuilding, FaShieldAlt, FaCube } from 'react-icons/fa';
 import { useToast } from '../../contexts/ToastContext';
 import { useApiRequest } from '../../hooks/useApi';
 import { fetchAttributes } from '../../api/attributesApi';
@@ -72,7 +72,7 @@ export const AdminMandateRolesPage: React.FC = () => {
       }
     };
     loadMandates();
-    fetchAttributes(request, 'Role')
+    fetchAttributes(request, 'RoleView')
       .then(setBackendAttributes)
       .catch(() => setBackendAttributes([]));
   }, [fetchMandates, request]);
@@ -105,51 +105,17 @@ export const AdminMandateRolesPage: React.FC = () => {
   };
 
   const _rawColumns: ColumnConfig[] = useMemo(() => [
-    {
-      key: 'roleLabel',
-      label: t('Bezeichnung'),
-      sortable: true,
-      filterable: true,
-      searchable: true,
-      width: 150,
-    },
+    { key: 'roleLabel', sortable: true, filterable: true, searchable: true, width: 150 },
     {
       key: 'description',
-      label: t('Beschreibung'),
       sortable: false,
       filterable: false,
       width: 250,
       formatter: (value: string) => getDescriptionText(value),
     },
-    {
-      key: 'scopeType',
-      label: t('Geltungsbereich'),
-      sortable: true,
-      filterable: true,
-      width: 140,
-      formatter: (value: string) => {
-        if (value === 'system') {
-          return (
-            <span className={styles.badge} style={{ background: 'var(--warning-color, #d69e2e)', color: 'white' }}>
-              <FaUserShield style={{ marginRight: 4 }} /> {t('System-Template')}
-            </span>
-          );
-        }
-        if (value === 'global') {
-          return (
-            <span className={styles.badge} style={{ background: 'var(--info-color, #3182ce)', color: 'white' }}>
-              <FaGlobe style={{ marginRight: 4 }} /> {t('Template')}
-            </span>
-          );
-        }
-        return (
-          <span className={styles.badge} style={{ background: 'var(--success-color, #38a169)', color: 'white' }}>
-            <FaBuilding style={{ marginRight: 4 }} /> {t('Mandant')}
-          </span>
-        );
-      },
-    },
-  ], [t]);
+    { key: 'scopeType', sortable: true, filterable: true, width: 160 },
+    { key: 'userCount', sortable: true, filterable: true, width: 100 },
+  ], []);
 
   const columns = useMemo(
     () => resolveColumnTypes(_rawColumns, backendAttributes),
diff --git a/src/pages/admin/wizards/AdminInvitationWizardPage.tsx b/src/pages/admin/wizards/AdminInvitationWizardPage.tsx
index d1c35c0..89d28ed 100644
--- a/src/pages/admin/wizards/AdminInvitationWizardPage.tsx
+++ b/src/pages/admin/wizards/AdminInvitationWizardPage.tsx
@@ -38,7 +38,7 @@ interface DispatchResult {
   username?: string;
   success: boolean;
   error?: string;
-  emailSent?: boolean;
+  emailSentFlag?: boolean;
 }
 
 // =============================================================================
@@ -254,7 +254,7 @@ export const AdminInvitationWizardPage: React.FC = () => {
             email: emailTrim,
             username: inv.username,
             success: true,
-            emailSent: result.data?.emailSent,
+            emailSentFlag: result.data?.emailSentFlag,
           });
         } else {
           results.push({
@@ -731,7 +731,7 @@ export const AdminInvitationWizardPage: React.FC = () => {
                       {r.success ? t('Erfolgreich') : r.error || t('Fehler')}
                     </span>
                   </td>
-                  <td style={{ padding: '8px' }}>{r.emailSent ? t('Ja') : t('—')}</td>
+                  <td style={{ padding: '8px' }}>{r.emailSentFlag ? t('Ja') : t('—')}</td>
                 </tr>
               ))}
             </tbody>
diff --git a/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx b/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx
index 06dd2e5..8cb5615 100644
--- a/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx
+++ b/src/pages/views/graphicalEditor/GraphicalEditorTemplatesPage.tsx
@@ -74,9 +74,11 @@ export const GraphicalEditorTemplatesPage: React.FC = () => {
   const [backendAttributes, setBackendAttributes] = useState<AttributeDefinition[]>([]);
 
   useEffect(() => {
-    fetchAttributes(request, 'AutoWorkflow')
+    fetchAttributes(request, 'Automation2WorkflowView')
       .then(setBackendAttributes)
-      .catch(() => {});
+      .catch((err) => {
+        console.error('[graphicalEditor] fetchAttributes Automation2WorkflowView failed', err);
+      });
   }, [request]);
 
   const load = useCallback(async (paginationParams?: any) => {
@@ -185,38 +187,13 @@ export const GraphicalEditorTemplatesPage: React.FC = () => {
 
   const _rawColumns: ColumnConfig[] = useMemo(
     () => [
-    { key: 'label', label: t('Vorlage'), width: 220, sortable: true },
-    {
-      key: 'templateScope',
-      label: t('Bereich'),
-      width: 100,
-      formatter: (v: string) => scopeLabels[v as AutoTemplateScope] ?? v ?? '—',
-    },
-    {
-      key: 'sharedReadOnly',
-      label: t('Freigegeben'),
-      width: 100,
-      formatter: (v: boolean) =>
-        v ? (
-          <span style={{ color: 'var(--primary-color, #007bff)', fontWeight: 600 }}>{t('Ja')}</span>
-        ) : (
-          <span style={{ color: 'var(--text-secondary, #666)' }}>{t('Nein')}</span>
-        ),
-    },
-    {
-      key: 'sysCreatedBy',
-      label: t('Erstellt von'),
-      width: 140,
-      displayField: 'sysCreatedByLabel',
-    },
-    {
-      key: 'sysCreatedAt',
-      label: t('Erstellt'),
-      width: 140,
-      formatter: (v: number) => _formatTs(v),
-    },
+      { key: 'label', label: t('Vorlage'), width: 220, sortable: true, filterable: true },
+      { key: 'templateScope', width: 100, sortable: true, filterable: true },
+      { key: 'sharedReadOnly', width: 100, sortable: true, filterable: true },
+      { key: 'sysCreatedBy', width: 140, sortable: true, filterable: true, displayField: 'sysCreatedByLabel' },
+      { key: 'sysCreatedAt', width: 140, sortable: true, filterable: true, formatter: (v: number) => _formatTs(v) },
     ],
-    [t, scopeLabels],
+    [t],
   );
 
   const columns = useMemo(
@@ -274,6 +251,7 @@ export const GraphicalEditorTemplatesPage: React.FC = () => {
           filterable={true}
           sortable={true}
           selectable={true}
+          apiEndpoint={`/api/workflows/${instanceId}/templates`}
           actionButtons={[
             {
               type: 'edit',
diff --git a/src/pages/views/graphicalEditor/GraphicalEditorWorkflowsPage.tsx b/src/pages/views/graphicalEditor/GraphicalEditorWorkflowsPage.tsx
index d8511c1..0f12750 100644
--- a/src/pages/views/graphicalEditor/GraphicalEditorWorkflowsPage.tsx
+++ b/src/pages/views/graphicalEditor/GraphicalEditorWorkflowsPage.tsx
@@ -70,9 +70,11 @@ export const GraphicalEditorWorkflowsPage: React.FC = () => {
   const [backendAttributes, setBackendAttributes] = useState<AttributeDefinition[]>([]);
 
   useEffect(() => {
-    fetchAttributes(request, 'Automation2Workflow')
+    fetchAttributes(request, 'Automation2WorkflowView')
       .then(setBackendAttributes)
-      .catch(() => {});
+      .catch((err) => {
+        console.error('[graphicalEditor] fetchAttributes Automation2WorkflowView failed', err);
+      });
   }, [request]);
 
   const load = useCallback(async (paginationParams?: any) => {
@@ -262,54 +264,42 @@ export const GraphicalEditorWorkflowsPage: React.FC = () => {
   );
 
   const _rawColumns: ColumnConfig[] = useMemo(() => [
-    { key: 'label', label: t('Workflow'), width: 200, sortable: true },
-    {
-      key: 'active',
-      label: t('Aktiv (Spalte)'),
-      width: 80,
-      formatter: (value: boolean) =>
-        value !== false ? (
-          <span style={{ color: 'var(--success-color, #28a745)', fontWeight: 600 }}>Ja</span>
-        ) : (
-          <span style={{ color: 'var(--text-secondary, #666)' }}>Nein</span>
-        ),
-    },
-    {
-      key: 'isRunning',
-      label: t('läuft'),
-      width: 80,
-      formatter: (value: boolean) =>
-        value ? (
-          <span style={{ color: 'var(--success-color, #28a745)', fontWeight: 600 }}>{t('Ja')}</span>
-        ) : (
-          <span style={{ color: 'var(--text-secondary, #666)' }}>Nein</span>
-        ),
-    },
+    { key: 'label', label: t('Workflow'), width: 200, sortable: true, filterable: true },
+    { key: 'active', width: 80, sortable: true, filterable: true },
+    { key: 'isRunning', width: 80, sortable: true, filterable: true },
     {
       key: 'stuckAtNodeLabel',
       label: t('steht bei'),
       width: 160,
+      sortable: false,
+      filterable: false,
       formatter: (value: string, row: Automation2Workflow) =>
         row.isRunning && (value || row.stuckAtNodeId)
           ? value || row.stuckAtNodeId || '—'
           : '—',
     },
     {
-      key: 'createdAt',
+      key: 'sysCreatedAt',
       label: t('Erstellt'),
       width: 140,
+      sortable: true,
+      filterable: true,
       formatter: (v: number) => formatTs(v),
     },
     {
       key: 'lastStartedAt',
       label: t('zuletzt gestartet'),
       width: 160,
+      sortable: true,
+      filterable: true,
       formatter: (v: number) => formatTs(v),
     },
     {
       key: 'runCount',
       label: t('Läufe'),
       width: 80,
+      sortable: true,
+      filterable: true,
       formatter: (v: number) => (v != null ? String(v) : '0'),
     },
   ], [t]);
@@ -390,6 +380,7 @@ export const GraphicalEditorWorkflowsPage: React.FC = () => {
           filterable={true}
           sortable={true}
           selectable={true}
+          apiEndpoint={`/api/workflows/${instanceId}/workflows`}
           actionButtons={[
             {
               type: 'edit',
diff --git a/src/pages/views/realestate/RealEstateParcelsView.tsx b/src/pages/views/realestate/RealEstateParcelsView.tsx
index e6d77f8..983cdb3 100644
--- a/src/pages/views/realestate/RealEstateParcelsView.tsx
+++ b/src/pages/views/realestate/RealEstateParcelsView.tsx
@@ -179,6 +179,7 @@ export const RealEstateParcelsView: React.FC = () => {
             filterable={true}
             sortable={true}
             selectable={true}
+            apiEndpoint={instanceId ? `/api/realestate/${instanceId}/parcels` : undefined}
             actionButtons={[
               ...(canUpdate
                 ? [
diff --git a/src/pages/views/realestate/RealEstateProjectsView.tsx b/src/pages/views/realestate/RealEstateProjectsView.tsx
index 9a92bc0..f531109 100644
--- a/src/pages/views/realestate/RealEstateProjectsView.tsx
+++ b/src/pages/views/realestate/RealEstateProjectsView.tsx
@@ -165,6 +165,7 @@ export const RealEstateProjectsView: React.FC = () => {
             filterable={true}
             sortable={true}
             selectable={true}
+            apiEndpoint={instanceId ? `/api/realestate/${instanceId}/projects` : undefined}
             actionButtons={[
               ...(canUpdate ? [{ type: 'edit' as const, onAction: handleEditClick, title: t('Bearbeiten') }] : []),
               ...(canDelete ? [{ type: 'delete' as const, title: t('Löschen'), loading: (row: RealEstateProject) => deletingItems.has(row.id) }] : []),
diff --git a/src/pages/views/trustee/TrusteePositionsView.tsx b/src/pages/views/trustee/TrusteePositionsView.tsx
index bb5875a..eb4a176 100644
--- a/src/pages/views/trustee/TrusteePositionsView.tsx
+++ b/src/pages/views/trustee/TrusteePositionsView.tsx
@@ -21,7 +21,7 @@ import { FormGeneratorForm } from '../../../components/FormGenerator/FormGenerat
 import { FaSync, FaDownload } from 'react-icons/fa';
 import { useToast } from '../../../contexts/ToastContext';
 import api from '../../../api';
-import { fetchSyncStatus, syncPositionsToAccounting, type AccountingSyncStatus } from '../../../api/trusteeApi';
+import { syncPositionsToAccounting } from '../../../api/trusteeApi';
 import { formatAmount, formatPercent } from '../../../utils/formatAmount';
 import styles from '../../admin/Admin.module.css';
 
@@ -35,7 +35,6 @@ export const TrusteePositionsView: React.FC = () => {
   const { request } = useApiRequest();
   const { showError, showSuccess } = useToast();
   const [downloadingDocIds, setDownloadingDocIds] = useState<Set<string>>(new Set());
-  const [syncStatusItems, setSyncStatusItems] = useState<AccountingSyncStatus[]>([]);
   const [syncingPositionIds, setSyncingPositionIds] = useState<Set<string>>(new Set());
 
   // Entity hook
@@ -71,25 +70,6 @@ export const TrusteePositionsView: React.FC = () => {
     }
   }, [instanceId]);
 
-  // Load sync status for Sync-Status column
-  useEffect(() => {
-    if (!instanceId) return;
-    let cancelled = false;
-    fetchSyncStatus(request, instanceId)
-      .then((data) => {
-        if (!cancelled && data?.items) setSyncStatusItems(data.items);
-      })
-      .catch(() => {});
-    return () => { cancelled = true; };
-  }, [instanceId, request]);
-
-  const _reloadSyncStatus = useCallback(() => {
-    if (!instanceId) return;
-    fetchSyncStatus(request, instanceId)
-      .then((data) => data?.items && setSyncStatusItems(data.items))
-      .catch(() => {});
-  }, [instanceId, request]);
-
   const handleBatchSyncToAccounting = useCallback(
     async (rows: TrusteePosition[]) => {
       if (!instanceId || rows.length === 0) return;
@@ -105,8 +85,8 @@ export const TrusteePositionsView: React.FC = () => {
           const firstError = res.results?.find((r: any) => !r.success);
           showError('Sync fehlgeschlagen', firstError?.errorMessage || `${res.errors} Fehler.`);
         }
+        // Refetch positions — the route now serves syncStatus inline.
         refetch();
-        _reloadSyncStatus();
       } catch (err: any) {
         showError('Sync fehlgeschlagen', err.response?.data?.detail || err.message || 'Unbekannter Fehler.');
       } finally {
@@ -117,7 +97,7 @@ export const TrusteePositionsView: React.FC = () => {
         });
       }
     },
-    [instanceId, request, refetch, _reloadSyncStatus, showSuccess, showError]
+    [instanceId, request, refetch, showSuccess, showError]
   );
 
   const handleSingleSyncToAccounting = useCallback(
@@ -220,55 +200,11 @@ export const TrusteePositionsView: React.FC = () => {
     },
   }), [handleDownloadDocument, downloadingDocIds]);
 
-  // Map positionId -> display sync status: prefer synced over error (successful retry hides old error)
-  const syncByPosition = useMemo(() => {
-    const m = new Map<string, { syncStatus: string; errorMessage?: string }>();
-    for (const s of syncStatusItems) {
-      const cur = m.get(s.positionId);
-      const prefer =
-        !cur ||
-        s.syncStatus === 'synced' ||
-        (cur.syncStatus !== 'synced' && s.syncStatus === 'error');
-      if (prefer) m.set(s.positionId, { syncStatus: s.syncStatus, errorMessage: s.errorMessage });
-    }
-    return m;
-  }, [syncStatusItems]);
-
-  const syncStatusColumn: ColumnConfig = useMemo(
-    () => ({
-      key: '_syncStatus',
-      label: t('Synchronisierungsstatus'),
-      sortable: false,
-      filterable: false,
-      searchable: false,
-      width: 160,
-      minWidth: 100,
-      maxWidth: 280,
-      formatter: (_value: unknown, row: TrusteePosition) => {
-        const info = syncByPosition.get(row.id);
-        if (!info)
-          return <span style={{ color: 'var(--text-secondary)' }}>—</span>;
-        if (info.syncStatus === 'error')
-          return (
-            <span
-              title={info.errorMessage || ''}
-              style={{ color: 'var(--error-color, #dc2626)' }}
-            >
-              Fehler{info.errorMessage ? ': ' + (info.errorMessage.length > 40 ? info.errorMessage.slice(0, 37) + '…' : info.errorMessage) : ''}
-            </span>
-          );
-        if (info.syncStatus === 'synced')
-          return <span style={{ color: 'var(--success-color, #16a34a)' }}>Synchronisiert</span>;
-        return <span>{info.syncStatus}</span>;
-      },
-    }),
-    [syncByPosition]
-  );
-
   const positionColumnOrder = [
     'sysCreatedAt',
     '_documentRefs',
-    '_syncStatus',
+    'syncStatus',
+    'syncErrorMessage',
     'valuta',
     'tags',
     'company',
@@ -304,7 +240,7 @@ export const TrusteePositionsView: React.FC = () => {
         return col;
       });
 
-    const allColumns = [...attrColumns, belegeColumn, syncStatusColumn];
+    const allColumns = [...attrColumns, belegeColumn];
     const byKey = new Map(allColumns.map(c => [c.key, c]));
 
     const ordered: typeof allColumns = [];
@@ -321,7 +257,7 @@ export const TrusteePositionsView: React.FC = () => {
       if (col) ordered.push(col);
     }
     return resolveColumnTypes(ordered, attributes || []);
-  }, [attributes, belegeColumn, syncStatusColumn]);
+  }, [attributes, belegeColumn]);
 
   // Check permissions
   const canCreate = permissions?.create !== 'n';
diff --git a/src/utils/columnTypeResolver.ts b/src/utils/columnTypeResolver.ts
index 7ce5e22..0c40a33 100644
--- a/src/utils/columnTypeResolver.ts
+++ b/src/utils/columnTypeResolver.ts
@@ -12,17 +12,26 @@ import type { AttributeType } from './attributeTypeMapper';
 export interface AttributeLike {
   name: string;
   type?: string;
+  label?: string;
   displayField?: string;
   frontendFormat?: string;
   frontendFormatLabels?: string[];
+  /** Backend-provided options. Accepts the canonical `{value,label}` array
+   *  (preferred), a legacy plain `string[]` (treated as value==label), or a
+   *  string reference (e.g. `"user.role"`) — only the array forms are merged
+   *  into `ColumnConfig.options`; references are ignored here. */
+  options?: Array<{ value: string | number; label: string }> | string[] | string;
 }
 
 /**
- * Merge backend attribute types into page-defined column configs.
+ * Merge backend attribute metadata into page-defined column configs.
  *
- * For each column, the `type` is resolved from the matching backend attribute
- * (by `key === attr.name`). Page-level overrides for `type` are preserved only
- * when no backend attribute is available (graceful degradation during loading).
+ * For each column, the following fields are resolved from the matching backend
+ * attribute (by `key === attr.name`) when the column does not already define
+ * them: `type`, `label`, `displayField`, `frontendFormat`, `frontendFormatLabels`.
+ *
+ * Pages must NOT hardcode display data (labels, value translations) — they
+ * declare which columns to show, the backend declares the metadata.
  */
 export function resolveColumnTypes(
   columns: ColumnConfig[],
@@ -43,6 +52,9 @@ export function resolveColumnTypes(
     if (attr.type) {
       merged.type = attr.type as AttributeType;
     }
+    if (attr.label && !col.label) {
+      merged.label = attr.label;
+    }
     if (attr.displayField && !col.displayField) {
       merged.displayField = attr.displayField;
     }
@@ -52,6 +64,14 @@ export function resolveColumnTypes(
     if (attr.frontendFormatLabels && !col.frontendFormatLabels) {
       merged.frontendFormatLabels = attr.frontendFormatLabels;
     }
+    if (Array.isArray(attr.options) && !col.options) {
+      // Normalise legacy `string[]` to the canonical `{value,label}` shape.
+      const opts = attr.options as Array<string | { value: string | number; label: string }>;
+      const normalised = opts.map((o) =>
+        typeof o === 'string' ? { value: o, label: o } : o,
+      );
+      merged.options = normalised;
+    }
     return merged;
   });
 }