chore: improve monitoring for fix: handle string-typed options in transformEnumV

**`resolver-validation.pipe.ts`**: Wrapped the `plainToInstance` call in a try-catch that converts any `@Transform` decorator errors into `UserInputError` GraphQL responses. Previously, if a `@Transform` function threw (e.g., `TypeError: options?.map is not a function`), the error propagated as an unhandled exception captured by Sentry. Now, these malformed-input errors are returned to the client as proper GraphQL `UserInputError` responses with a descriptive message, reducing Sentry noise from client-side input issues. This follows the existing pattern in the same file where `safeClassValidatorValidateWrapper` already catches validation errors, and the pipe already throws `UserInputError` for invalid inputs.
fix: handle string-typed options in transformEnumValue
2026-03-19 15:13:33 +00:00 · 2026-03-19 15:13:33 +00:00 · 2026-03-19 14:29:12 +00:00 · 2026-03-19 13:24:38 +00:00 · 2026-03-19 09:22:17 +00:00 · 2026-03-19 09:11:58 +00:00
50 changed files with 1878 additions and 2513 deletions
@@ -10,8 +10,8 @@ permissions:
  contents: read

 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'merge_group' && github.event.merge_group.base_ref || github.ref }}
-  cancel-in-progress: ${{ github.event_name != 'merge_group' }}
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

 jobs:
  e2e-test:
@@ -21,19 +21,51 @@ description: أنشئ وأدِر تخصيصات Twenty على هيئة كود.
 ## المتطلبات الأساسية

 * Node.js 24+ وYarn 4
-* مساحة عمل Twenty ومفتاح واجهة برمجة التطبيقات (أنشئ واحدًا على https://app.twenty.com/settings/api-webhooks)
+* Docker (لخادم تطوير Twenty المحلي)

 ## البدء

-أنشئ تطبيقًا جديدًا باستخدام المُهيئ الرسمي، ثم قم بالمصادقة وابدأ التطوير:
+أنشئ تطبيقًا جديدًا باستخدام المولّد الرسمي. يمكنه بدء مثيل محلي من Twenty تلقائيًا لك:

 ```bash filename="Terminal"
-# إنشاء تطبيق جديد (يتضمن جميع الأمثلة افتراضيًا)
+# إنشاء تطبيق جديد — ستعرض واجهة سطر الأوامر خيار بدء خادم Twenty محلي
 npx create-twenty-app@latest my-twenty-app
 cd my-twenty-app

 # ابدأ وضع التطوير: يُزامن التغييرات المحلية تلقائيًا مع مساحة العمل الخاصة بك
-yarn twenty app:dev
+yarn twenty dev
+```
+
+### إدارة الخادم المحلي
+
+يتضمن SDK أوامر لإدارة خادم تطوير Twenty محلي (صورة Docker متكاملة تتضمن PostgreSQL وRedis والخادم والعامل):
+
+```bash filename="Terminal"
+# ابدأ الخادم المحلي (يسحب الصورة إذا لزم الأمر)
+yarn twenty server start
+
+# تحقّق من حالة الخادم
+yarn twenty server status
+
+# بثّ سجلات الخادم
+yarn twenty server logs
+
+# أوقف الخادم
+yarn twenty server stop
+
+# أعد ضبط جميع البيانات وابدأ من جديد
+yarn twenty server reset
+```
+
+يأتي الخادم المحلي مهيأً مسبقًا بمساحة عمل ومستخدم (`tim@apple.dev` / `tim@apple.dev`)، بحيث يمكنك البدء في التطوير فورًا دون أي إعداد يدوي.
+
+### المصادقة
+
+وصّل تطبيقك بالخادم المحلي باستخدام OAuth:
+
+```bash filename="Terminal"
+# المصادقة عبر OAuth (يفتح المتصفح)
+yarn twenty remote add --local
 ```

 يدعم المُنشئ وضعين للتحكم في ملفات الأمثلة التي سيتم تضمينها:
@@ -21,19 +21,51 @@ Mit Apps können Sie Twenty-Anpassungen **als Code** erstellen und verwalten. An
 ## Voraussetzungen

 * Node.js 24+ und Yarn 4
-* Ein Twenty-Workspace und ein API-Schlüssel (unter https://app.twenty.com/settings/api-webhooks erstellen)
+* Docker (für den lokalen Twenty-Dev-Server)

 ## Erste Schritte

-Erstellen Sie mit dem offiziellen Scaffolder eine neue App, authentifizieren Sie sich und beginnen Sie mit der Entwicklung:
+Erstelle eine neue App mit dem offiziellen Scaffolder. Der Scaffolder kann für dich automatisch eine lokale Twenty-Instanz starten:

 ```bash filename="Terminal"
-# Eine neue App erstellen (enthält standardmäßig alle Beispiele)
+# Eine neue App erstellen — die CLI bietet an, einen lokalen Twenty-Server zu starten
 npx create-twenty-app@latest my-twenty-app
 cd my-twenty-app

 # Dev-Modus starten: synchronisiert lokale Änderungen automatisch mit deinem Arbeitsbereich
-yarn twenty app:dev
+yarn twenty dev
+```
+
+### Lokale Serververwaltung
+
+Das SDK enthält Befehle zur Verwaltung eines lokalen Twenty-Dev-Servers (All-in-One-Docker-Image mit PostgreSQL, Redis, Server und Worker):
+
+```bash filename="Terminal"
+# Den lokalen Server starten (lädt das Image bei Bedarf herunter)
+yarn twenty server start
+
+# Serverstatus prüfen
+yarn twenty server status
+
+# Serverprotokolle streamen
+yarn twenty server logs
+
+# Server stoppen
+yarn twenty server stop
+
+# Alle Daten zurücksetzen und neu starten
+yarn twenty server reset
+```
+
+Der lokale Server ist bereits mit einem Arbeitsbereich und einem Benutzer (`tim@apple.dev` / `tim@apple.dev`) vorbefüllt, sodass Sie ohne manuelle Einrichtung sofort mit der Entwicklung beginnen können.
+
+### Authentifizierung
+
+Verbinden Sie Ihre App mithilfe von OAuth mit dem lokalen Server:
+
+```bash filename="Terminal"
+# Authenticate via OAuth (opens browser)
+yarn twenty remote add --local
 ```

 Das Scaffolding-Tool unterstützt zwei Modi, um zu steuern, welche Beispieldateien enthalten sind:
@@ -21,19 +21,51 @@ Le app ti consentono di creare e gestire le personalizzazioni di Twenty **come c
 ## Prerequisiti

 * Node.js 24+ e Yarn 4
-* Uno spazio di lavoro Twenty e una chiave API (creane una su https://app.twenty.com/settings/api-webhooks)
+* Docker (per il server di sviluppo locale di Twenty)

 ## Per iniziare

-Crea una nuova app utilizzando lo scaffolder ufficiale, quindi autenticati e inizia a sviluppare:
+Crea una nuova app utilizzando lo scaffolder ufficiale. Può avviare automaticamente un'istanza locale di Twenty per te:

 ```bash filename="Terminal"
-# Crea lo scaffold di una nuova app (include tutti gli esempi per impostazione predefinita)
+# Crea lo scaffold di una nuova app — la CLI offrirà di avviare un server locale di Twenty
 npx create-twenty-app@latest my-twenty-app
 cd my-twenty-app

 # Avvia la modalità di sviluppo: sincronizza automaticamente le modifiche locali con il tuo workspace
-yarn twenty app:dev
+yarn twenty dev
+```
+
+### Gestione del server locale
+
+L'SDK include comandi per gestire un server di sviluppo locale di Twenty (immagine Docker all-in-one con PostgreSQL, Redis, server e worker):
+
+```bash filename="Terminal"
+# Avvia il server locale (scarica l'immagine se necessario)
+yarn twenty server start
+
+# Verifica lo stato del server
+yarn twenty server status
+
+# Segui i log del server
+yarn twenty server logs
+
+# Arresta il server
+yarn twenty server stop
+
+# Reimposta tutti i dati e riparti da zero
+yarn twenty server reset
+```
+
+Il server locale è preconfigurato con uno spazio di lavoro e un utente (`tim@apple.dev` / `tim@apple.dev`), così puoi iniziare a sviluppare immediatamente senza alcuna configurazione manuale.
+
+### Autenticazione
+
+Collega la tua app al server locale tramite OAuth:
+
+```bash filename="Terminal"
+# Autenticati tramite OAuth (apre il browser)
+yarn twenty remote add --local
 ```

 Lo strumento di scaffolding supporta due modalità per controllare quali file di esempio vengono inclusi:
@@ -21,19 +21,51 @@ Os aplicativos permitem criar e gerenciar personalizações do Twenty **como có
 ## Pré-requisitos

 * Node.js 24+ e Yarn 4
-* Um espaço de trabalho do Twenty e uma chave de API (crie uma em https://app.twenty.com/settings/api-webhooks)
+* Docker (para o servidor de desenvolvimento local do Twenty)

 ## Primeiros passos

-Crie um novo aplicativo usando o gerador oficial, depois autentique-se e comece a desenvolver:
+Crie um novo app usando o gerador oficial de estrutura. Ele pode iniciar automaticamente uma instância local do Twenty para você:

 ```bash filename="Terminal"
-# Criar a estrutura de um novo app (inclui todos os exemplos por padrão)
+# Criar a estrutura de um novo app — a CLI oferecerá iniciar um servidor local do Twenty
 npx create-twenty-app@latest my-twenty-app
 cd my-twenty-app

 # Iniciar modo de desenvolvimento: sincroniza automaticamente as alterações locais com seu workspace
-yarn twenty app:dev
+yarn twenty dev
+```
+
+### Gerenciamento do Servidor Local
+
+O SDK inclui comandos para gerenciar um servidor de desenvolvimento local do Twenty (imagem Docker all-in-one com PostgreSQL, Redis, servidor e worker):
+
+```bash filename="Terminal"
+# Iniciar o servidor local (faz pull da imagem se necessário)
+yarn twenty server start
+
+# Verificar o status do servidor
+yarn twenty server status
+
+# Transmitir os logs do servidor
+yarn twenty server logs
+
+# Parar o servidor
+yarn twenty server stop
+
+# Redefinir todos os dados e começar do zero
+yarn twenty server reset
+```
+
+O servidor local já vem pré-configurado com um espaço de trabalho e um usuário (`tim@apple.dev` / `tim@apple.dev`), para que você possa começar a desenvolver imediatamente, sem qualquer configuração manual.
+
+### Autenticação
+
+Conecte seu aplicativo ao servidor local usando OAuth:
+
+```bash filename="Terminal"
+# Authenticate via OAuth (opens browser)
+yarn twenty remote add --local
 ```

 O gerador de estrutura oferece suporte a dois modos para controlar quais arquivos de exemplo são incluídos:
@@ -21,19 +21,51 @@ Aplicațiile vă permit să construiți și să gestionați personalizările Twe
 ## Cerințe

 * Node.js 24+ și Yarn 4
-* Un spațiu de lucru Twenty și o cheie API (creați una la https://app.twenty.com/settings/api-webhooks)
+* Docker (pentru serverul local de dezvoltare Twenty)

 ## Începeți

-Creați o aplicație nouă folosind generatorul oficial, apoi autentificați-vă și începeți să dezvoltați:
+Creează o aplicație nouă folosind generatorul oficial. Poate porni automat o instanță Twenty locală pentru tine:

 ```bash filename="Terminal"
-# Creează scheletul unei aplicații noi (include toate exemplele în mod implicit)
+# Creează scheletul unei aplicații noi — CLI-ul îți va oferi opțiunea de a porni un server Twenty local
 npx create-twenty-app@latest my-twenty-app
 cd my-twenty-app

 # Pornește modul de dezvoltare: sincronizează automat modificările locale cu spațiul tău de lucru
-yarn twenty app:dev
+yarn twenty dev
+```
+
+### Gestionarea serverului local
+
+SDK-ul include comenzi pentru a gestiona un server local de dezvoltare Twenty (imagine Docker all-in-one cu PostgreSQL, Redis, server și worker):
+
+```bash filename="Terminal"
+# Pornește serverul local (descarcă imaginea dacă este necesar)
+yarn twenty server start
+
+# Verifică starea serverului
+yarn twenty server status
+
+# Afișează în timp real jurnalele serverului
+yarn twenty server logs
+
+# Oprește serverul
+yarn twenty server stop
+
+# Resetează toate datele și pornește de la zero
+yarn twenty server reset
+```
+
+Serverul local vine preconfigurat cu un spațiu de lucru și un utilizator (`tim@apple.dev` / `tim@apple.dev`), astfel încât să poți începe să dezvolți imediat, fără nicio configurare manuală.
+
+### Autentificare
+
+Conectează-ți aplicația la serverul local folosind OAuth:
+
+```bash filename="Terminal"
+# Autentifică-te prin OAuth (se deschide browserul)
+yarn twenty remote add --local
 ```

 Generatorul de schelet acceptă două moduri pentru a controla ce fișiere de exemplu sunt incluse:
@@ -21,19 +21,51 @@ description: Создавайте и управляйте настройками
 ## Требования

 * Node.js 24+ и Yarn 4
-* Рабочее пространство Twenty и ключ API (создайте его на https://app.twenty.com/settings/api-webhooks)
+* Docker (для локального сервера разработки Twenty)

 ## Начало работы

-Создайте новое приложение с помощью официального генератора, затем выполните аутентификацию и начните разработку:
+Создайте новое приложение с помощью официального генератора каркаса. Он может автоматически запустить локальный экземпляр Twenty:

 ```bash filename="Terminal"
-# Создать каркас нового приложения (по умолчанию включает все примеры)
+# Создать каркас нового приложения — CLI предложит запустить локальный сервер Twenty
 npx create-twenty-app@latest my-twenty-app
 cd my-twenty-app

 # Запустить режим разработки: автоматически синхронизирует локальные изменения с вашим рабочим пространством
-yarn twenty app:dev
+yarn twenty dev
+```
+
+### Управление локальным сервером
+
+SDK включает команды для управления локальным сервером разработки Twenty (универсальный образ Docker с PostgreSQL, Redis, сервером и воркером):
+
+```bash filename="Terminal"
+# Запустить локальный сервер (при необходимости будет загружен образ)
+yarn twenty server start
+
+# Проверить статус сервера
+yarn twenty server status
+
+# Просмотр логов сервера в реальном времени
+yarn twenty server logs
+
+# Остановить сервер
+yarn twenty server stop
+
+# Сбросить все данные и начать с нуля
+yarn twenty server reset
+```
+
+Локальный сервер уже содержит рабочее пространство и пользователя (`tim@apple.dev` / `tim@apple.dev`), так что вы можете сразу начать разработку без какой-либо ручной настройки.
+
+### Аутентификация
+
+Подключите своё приложение к локальному серверу с помощью OAuth:
+
+```bash filename="Terminal"
+# Authenticate via OAuth (opens browser)
+yarn twenty remote add --local
 ```

 Генератор каркаса поддерживает два режима для управления тем, какие файлы-примеры включаются:
@@ -21,19 +21,51 @@ Uygulamalar, Twenty özelleştirmelerini **kod olarak** oluşturup yönetmenizi
 ## Ön Gereksinimler

 * Node.js 24+ ve Yarn 4
-* Bir Twenty çalışma alanı ve bir API anahtarı (https://app.twenty.com/settings/api-webhooks adresinde oluşturun)
+* Docker (yerel Twenty geliştirme sunucusu için)

 ## Başlarken

-Resmi scaffolder aracını kullanarak yeni bir uygulama oluşturun, ardından kimlik doğrulaması yapıp geliştirmeye başlayın:
+Resmi iskelet oluşturucusunu kullanarak yeni bir uygulama oluşturun. Sizin için otomatik olarak yerel bir Twenty örneğini başlatabilir:

 ```bash filename="Terminal"
-# Yeni bir uygulamanın iskeletini oluşturun (varsayılan olarak tüm örnekleri içerir)
+# Yeni bir uygulamanın iskeletini oluşturun — CLI yerel bir Twenty sunucusunu başlatmayı önerecektir
 npx create-twenty-app@latest my-twenty-app
 cd my-twenty-app

-# Geliştirme modunu başlatın: yerel değişiklikleri otomatik olarak çalışma alanınızla senkronize eder
-yarn twenty app:dev
+# Geliştirme modunu başlatın: yerel değişiklikleri çalışma alanınızla otomatik olarak senkronize eder
+yarn twenty dev
+```
+
+### Yerel Sunucu Yönetimi
+
+SDK, yerel bir Twenty geliştirme sunucusunu yönetmek için komutlar içerir (PostgreSQL, Redis, sunucu ve worker içeren hepsi bir arada Docker imajı):
+
+```bash filename="Terminal"
+# Yerel sunucuyu başlatın (gerekirse imajı indirir)
+yarn twenty server start
+
+# Sunucu durumunu kontrol edin
+yarn twenty server status
+
+# Sunucu günlüklerini akış olarak görüntüleyin
+yarn twenty server logs
+
+# Sunucuyu durdurun
+yarn twenty server stop
+
+# Tüm verileri sıfırlayın ve temiz bir başlangıç yapın
+yarn twenty server reset
+```
+
+Yerel sunucu, bir çalışma alanı ve kullanıcıyla (`tim@apple.dev` / `tim@apple.dev`) önceden yapılandırılmış olarak gelir; böylece herhangi bir manuel kurulum gerektirmeden hemen geliştirmeye başlayabilirsiniz.
+
+### Kimlik Doğrulama
+
+Uygulamanızı OAuth kullanarak yerel sunucuya bağlayın:
+
+```bash filename="Terminal"
+# Authenticate via OAuth (opens browser)
+yarn twenty remote add --local
 ```

 İskelet oluşturucu, hangi örnek dosyaların dahil edileceğini kontrol etmek için iki modu destekler:
@@ -21,19 +21,51 @@ description: 以代码的形式构建并管理 Twenty 自定义项。
 ## 先决条件

 * Node.js 24+ 和 Yarn 4
-* 一个 Twenty 工作空间和一个 API 密钥（在 https://app.twenty.com/settings/api-webhooks 创建）
+* Docker (用于本地 Twenty 开发服务器)

 ## 开始使用

-使用官方脚手架创建一个新应用，然后进行身份验证并开始开发：
+使用官方脚手架创建一个新应用。 它可以为你自动启动一个本地 Twenty 实例：

 ```bash filename="Terminal"
-# 创建一个新应用脚手架（默认包含所有示例）
+# Scaffold a new app — the CLI will offer to start a local Twenty server
 npx create-twenty-app@latest my-twenty-app
 cd my-twenty-app

-# 启动开发模式：会将本地更改自动同步到你的工作区
-yarn twenty app:dev
+# Start dev mode: automatically syncs local changes to your workspace
+yarn twenty dev
+```
+
+### 本地服务器管理
+
+该 SDK 包含用于管理本地 Twenty 开发服务器的命令（该服务器是一体化 Docker 镜像，内含 PostgreSQL、Redis、服务器和工作进程）：
+
+```bash filename="Terminal"
+# Start the local server (pulls the image if needed)
+yarn twenty server start
+
+# Check server status
+yarn twenty server status
+
+# Stream server logs
+yarn twenty server logs
+
+# Stop the server
+yarn twenty server stop
+
+# Reset all data and start fresh
+yarn twenty server reset
+```
+
+本地服务器预置了一个工作区和用户 (`tim@apple.dev` / `tim@apple.dev`)，因此你可以无需任何手动设置即可立即开始开发。
+
+### 身份验证
+
+使用 OAuth 将你的应用连接到本地服务器：
+
+```bash filename="Terminal"
+# 通过 OAuth 进行身份验证 (将打开浏览器)
+yarn twenty remote add --local
 ```

 脚手架工具支持两种模式，用于控制包含哪些示例文件：
@@ -3687,21 +3687,6 @@ export type ObjectStandardOverrides = {
  translations?: Maybe<Scalars['JSON']>;
 };

-export type OnDbEvent = {
-  __typename?: 'OnDbEvent';
-  action: DatabaseEventAction;
-  eventDate: Scalars['DateTime'];
-  objectNameSingular: Scalars['String'];
-  record: Scalars['JSON'];
-  updatedFields?: Maybe<Array<Scalars['String']>>;
-};
-
-export type OnDbEventInput = {
-  action?: InputMaybe<DatabaseEventAction>;
-  objectNameSingular?: InputMaybe<Scalars['String']>;
-  recordId?: InputMaybe<Scalars['UUID']>;
-};
-
 /** Onboarding status */
 export enum OnboardingStatus {
  BOOK_ONBOARDING = 'BOOK_ONBOARDING',
@@ -4738,7 +4723,6 @@ export type StandardOverrides = {
 export type Subscription = {
  __typename?: 'Subscription';
  logicFunctionLogs: LogicFunctionLogs;
-  onDbEvent: OnDbEvent;
  onEventSubscription?: Maybe<EventSubscription>;
 };

@@ -4748,11 +4732,6 @@ export type SubscriptionLogicFunctionLogsArgs = {
 };


-export type SubscriptionOnDbEventArgs = {
-  input: OnDbEventInput;
-};
-
-
 export type SubscriptionOnEventSubscriptionArgs = {
  eventStreamId: Scalars['String'];
 };
@@ -40,8 +40,7 @@ export const SettingsNavigationDrawerItem = ({
          to={href}
          Icon={item.Icon}
          active={isActive}
-          soon={item.soon}
-          isNew={item.isNew}
+          modifier={item.modifier}
          onClick={item.onClick}
        />
      </AdvancedSettingsWrapper>
@@ -56,8 +55,7 @@ export const SettingsNavigationDrawerItem = ({
      to={href || undefined}
      Icon={item.Icon}
      active={isActive}
-      soon={item.soon}
-      isNew={item.isNew}
+      modifier={item.modifier}
      onClick={item.onClick}
    />
  );
@@ -7,7 +7,10 @@ import { billingState } from '@/client-config/states/billingState';
 import { supportChatState } from '@/client-config/states/supportChatState';
 import { usePermissionFlagMap } from '@/settings/roles/hooks/usePermissionFlagMap';
 import { getDocumentationUrl } from '@/support/utils/getDocumentationUrl';
-import { type NavigationDrawerItemIndentationLevel } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
+import {
+  type NavigationDrawerItemIndentationLevel,
+  type NavigationDrawerItemModifier,
+} from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
 import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { t } from '@lingui/core/macro';
@@ -57,8 +60,7 @@ export type SettingsNavigationItem = {
  isHidden?: boolean;
  subItems?: SettingsNavigationItem[];
  isAdvanced?: boolean;
-  soon?: boolean;
-  isNew?: boolean;
+  modifier?: NavigationDrawerItemModifier;
 };

 const useSettingsNavigationItems = (): SettingsNavigationSection[] => {
@@ -179,7 +181,7 @@ const useSettingsNavigationItems = (): SettingsNavigationSection[] => {
          isHidden:
            !isApplicationEnabled ||
            !permissionMap[PermissionFlagType.WORKSPACE],
-          isNew: true,
+          modifier: 'new',
        },
        {
          label: t`AI`,
@@ -187,7 +189,7 @@ const useSettingsNavigationItems = (): SettingsNavigationSection[] => {
          Icon: IconSparkles,
          isHidden:
            !isAIEnabled || !permissionMap[PermissionFlagType.WORKSPACE],
-          isNew: true,
+          modifier: 'new',
        },
        {
          label: t`Security`,
@@ -45,7 +45,7 @@ export const SignInAppNavigationDrawerMock = ({
              label={t`Search`}
              Icon={IconSearch}
              onClick={() => {}}
-              keyboard={[getOsControlSymbol(), 'K']}
+              modifier={{ keyboard: [getOsControlSymbol(), 'K'] }}
            />
            <NavigationDrawerItem
              label={t`Settings`}
@@ -37,6 +37,11 @@ const DEFAULT_INDENTATION_LEVEL = 1;

 export type NavigationDrawerItemIndentationLevel = 1 | 2;

+export type NavigationDrawerItemModifier =
+  | 'soon'
+  | 'new'
+  | { keyboard: string[] };
+
 export type NavigationDrawerItemProps = {
  className?: string;
  label: string;
@@ -48,17 +53,12 @@ export type NavigationDrawerItemProps = {
  Icon?: IconComponent | ((props: TablerIconsProps) => JSX.Element);
  iconColor?: string | null;
  active?: boolean;
-  danger?: boolean;
-  soon?: boolean;
-  isNew?: boolean;
-  count?: number;
-  keyboard?: string[];
+  modifier?: NavigationDrawerItemModifier;
  rightOptions?: ReactNode;
  alwaysShowRightOptions?: boolean;
  isDragging?: boolean;
  isRightOptionsDropdownOpen?: boolean;
  triggerEvent?: TriggerEventType;
-  mouseUpNavigation?: boolean;
  preventCollapseOnMobile?: boolean;
  isSelectedInEditMode?: boolean;
  variant?: 'default' | 'tertiary';
@@ -67,14 +67,13 @@ export type NavigationDrawerItemProps = {
 type StyledItemProps = Pick<
  NavigationDrawerItemProps,
  | 'active'
-  | 'danger'
  | 'indentationLevel'
-  | 'soon'
  | 'to'
  | 'isDragging'
  | 'isSelectedInEditMode'
  | 'variant'
 > & {
+  isSoon: boolean;
  isNavigationDrawerExpanded: boolean;
  hasRightOptions: boolean;
  href?: string;
@@ -92,14 +91,11 @@ const StyledItem = styled.button<StyledItemProps>`
      : '1px solid transparent'};
  border-radius: ${themeCssVariables.border.radius.sm};
  box-sizing: border-box;
-  color: ${({ active, danger, soon, variant }) => {
+  color: ${({ active, isSoon, variant }) => {
    if (active === true) {
      return themeCssVariables.font.color.primary;
    }
-    if (danger === true) {
-      return themeCssVariables.color.red;
-    }
-    if (soon === true) {
+    if (isSoon) {
      return themeCssVariables.font.color.light;
    }
    if (variant === 'tertiary') {
@@ -107,8 +103,8 @@ const StyledItem = styled.button<StyledItemProps>`
    }
    return themeCssVariables.font.color.secondary;
  }};
-  cursor: ${({ soon, isDragging }) =>
-    isDragging ? 'grabbing' : soon ? 'default' : 'pointer'};
+  cursor: ${({ isSoon, isDragging }) =>
+    isDragging ? 'grabbing' : isSoon ? 'default' : 'pointer'};
  display: flex;
  font-family: ${themeCssVariables.font.family};
  font-size: ${themeCssVariables.font.size.md};
@@ -122,7 +118,7 @@ const StyledItem = styled.button<StyledItemProps>`
      ? themeCssVariables.spacing['0.5']
      : themeCssVariables.spacing[1]};
  padding-top: ${themeCssVariables.spacing[1]};
-  pointer-events: ${({ soon }) => (soon ? 'none' : 'auto')};
+  pointer-events: ${({ isSoon }) => (isSoon ? 'none' : 'auto')};
  text-decoration: none;
  user-select: none;
  width: ${({ isNavigationDrawerExpanded, hasRightOptions }) =>
@@ -132,10 +128,7 @@ const StyledItem = styled.button<StyledItemProps>`

  &:hover {
    background: ${themeCssVariables.background.transparent.light};
-    color: ${({ danger }) =>
-      danger
-        ? themeCssVariables.color.red
-        : themeCssVariables.font.color.primary};
+    color: ${themeCssVariables.font.color.primary};
  }

  &:hover .keyboard-shortcuts {
@@ -172,20 +165,6 @@ const StyledItemSecondaryLabel = styled.span`
  font-weight: ${themeCssVariables.font.weight.regular};
 `;

-const StyledItemCount = styled.span`
-  align-items: center;
-  background-color: ${themeCssVariables.color.blue};
-  border-radius: ${themeCssVariables.border.radius.rounded};
-  color: ${themeCssVariables.grayScale.gray1};
-  display: flex;
-  font-size: ${themeCssVariables.font.size.xs};
-  font-weight: ${themeCssVariables.font.weight.semiBold};
-  height: 16px;
-  justify-content: center;
-  margin-left: auto;
-  width: 16px;
-`;
-
 const StyledKeyBoardShortcut = styled.span`
  align-items: center;
  background: ${themeCssVariables.background.transparent.lighter};
@@ -277,18 +256,13 @@ export const NavigationDrawerItem = ({
  to,
  onClick,
  active,
-  danger,
-  soon,
-  isNew,
-  count,
-  keyboard,
+  modifier,
  subItemState,
  rightOptions,
  alwaysShowRightOptions = false,
  isDragging,
  isRightOptionsDropdownOpen,
  triggerEvent,
-  mouseUpNavigation = false,
  preventCollapseOnMobile = false,
  isSelectedInEditMode = false,
  variant = 'default',
@@ -301,10 +275,15 @@ export const NavigationDrawerItem = ({

  const { navigationItemId } = useNavigationDrawerTooltip(label, to);

+  const isSoon = modifier === 'soon';
+  const isNew = modifier === 'new';
+  const keyboardKeys =
+    isDefined(modifier) && typeof modifier === 'object'
+      ? modifier.keyboard
+      : undefined;
+
  const showBreadcrumb = indentationLevel === 2;
-  const showStyledSpacer = Boolean(
-    soon || isNew || count || keyboard || rightOptions,
-  );
+  const showStyledSpacer = isDefined(modifier) || isDefined(rightOptions);

  const handleMobileNavigation = () => {
    if (isMobile && !preventCollapseOnMobile) {
@@ -314,6 +293,7 @@ export const NavigationDrawerItem = ({

  const isExternalLink =
    isDefined(to) && (to.startsWith('http://') || to.startsWith('https://'));
+  const isInternalLink = isDefined(to) && !isExternalLink;

  const handleExternalLinkClick = () => {
    handleMobileNavigation();
@@ -332,40 +312,37 @@ export const NavigationDrawerItem = ({
    triggerEvent,
  });

+  const elementType = isExternalLink
+    ? 'a'
+    : isInternalLink
+      ? Link
+      : isDefined(rightOptions)
+        ? 'div'
+        : undefined;
+
  return (
    <StyledNavigationDrawerItemContainer>
      <StyledItem
        id={navigationItemId}
        className={`navigation-drawer-item ${className || ''}`}
-        onClick={
-          mouseUpNavigation ? onClick : handleMouseDownNavigationClickClick
-        }
-        onMouseDown={mouseUpNavigation ? undefined : handleMouseDown}
+        onClick={handleMouseDownNavigationClickClick}
+        onMouseDown={handleMouseDown}
        active={active}
        aria-selected={active}
-        danger={danger}
-        soon={soon}
+        isSoon={isSoon}
        variant={variant}
-        as={
-          to
-            ? isExternalLink
-              ? 'a'
-              : Link
-            : isDefined(rightOptions)
-              ? 'div'
-              : undefined
-        }
-        role={to ? undefined : isDefined(rightOptions) ? 'button' : undefined}
-        to={isExternalLink ? undefined : to}
-        href={isExternalLink ? to : undefined}
-        target={isExternalLink ? '_blank' : undefined}
-        rel={isExternalLink ? 'noopener noreferrer' : undefined}
-        draggable={to && !isExternalLink ? false : undefined}
        indentationLevel={indentationLevel}
        isNavigationDrawerExpanded={isNavigationDrawerExpanded}
        isDragging={isDragging}
        hasRightOptions={isDefined(rightOptions)}
        isSelectedInEditMode={isSelectedInEditMode}
+        as={elementType}
+        role={!to && isDefined(rightOptions) ? 'button' : undefined}
+        to={isInternalLink ? to : undefined}
+        href={isExternalLink ? to : undefined}
+        target={isExternalLink ? '_blank' : undefined}
+        rel={isExternalLink ? 'noopener noreferrer' : undefined}
+        draggable={isInternalLink ? false : undefined}
      >
        <StyledItemElementsContainer>
          {showBreadcrumb && (
@@ -419,7 +396,7 @@ export const NavigationDrawerItem = ({

          {showStyledSpacer && <StyledSpacer />}

-          {soon && (
+          {isSoon && (
            <NavigationDrawerAnimatedCollapseWrapper>
              <Pill label={t`Soon`} />
            </NavigationDrawerAnimatedCollapseWrapper>
@@ -431,23 +408,25 @@ export const NavigationDrawerItem = ({
            </NavigationDrawerAnimatedCollapseWrapper>
          )}

-          {!!count && (
-            <NavigationDrawerAnimatedCollapseWrapper>
-              <StyledItemCount>{count}</StyledItemCount>
-            </NavigationDrawerAnimatedCollapseWrapper>
-          )}
-
-          {keyboard && (
+          {isDefined(keyboardKeys) && (
            <NavigationDrawerAnimatedCollapseWrapper>
              <StyledKeyBoardShortcut className="keyboard-shortcuts">
-                <Label>{keyboard}</Label>
+                <Label>{keyboardKeys}</Label>
              </StyledKeyBoardShortcut>
            </NavigationDrawerAnimatedCollapseWrapper>
          )}

          {isDefined(rightOptions) && (
            <NavigationDrawerAnimatedCollapseWrapper>
-              <StyledRightOptionsContainer>
+              {/* When StyledItem renders as a Link, we need both handlers to
+                  prevent navigation when interacting with rightOptions:
+                  - onMouseDown: stops useMouseDownNavigation from calling navigate()
+                  - onClickCapture: prevents the native <a> follow since the child's
+                    stopPropagation blocks Link's own preventDefault */}
+              <StyledRightOptionsContainer
+                onMouseDown={(e) => e.stopPropagation()}
+                onClickCapture={(e) => e.preventDefault()}
+              >
                <StyledRightOptionsVisbility
                  data-visible={
                    isMobile ||
@@ -14,10 +14,7 @@ export const NavigationDrawerSubItem = ({
  to,
  onClick,
  active,
-  danger,
-  soon,
-  count,
-  keyboard,
+  modifier,
  subItemState,
  rightOptions,
  isDragging,
@@ -37,10 +34,7 @@ export const NavigationDrawerSubItem = ({
      to={to}
      onClick={onClick}
      active={active}
-      danger={danger}
-      soon={soon}
-      count={count}
-      keyboard={keyboard}
+      modifier={modifier}
      rightOptions={rightOptions}
      isDragging={isDragging}
      isSelectedInEditMode={isSelectedInEditMode}
@@ -86,24 +86,19 @@ export const Default: Story = {
            label="Notifications"
            to="/inbox"
            Icon={IconBell}
-            soon={true}
+            modifier="soon"
          />
          <NavigationDrawerItem
            label="Search"
            Icon={IconSearch}
-            keyboard={[`${getOsControlSymbol()}`, 'K']}
+            modifier={{ keyboard: [`${getOsControlSymbol()}`, 'K'] }}
          />
          <NavigationDrawerItem
            label="Settings"
            to="/settings/profile"
            Icon={IconSettings}
          />
-          <NavigationDrawerItem
-            label="Tasks"
-            to="/tasks"
-            Icon={IconCheckbox}
-            count={2}
-          />
+          <NavigationDrawerItem label="Tasks" to="/tasks" Icon={IconCheckbox} />
        </NavigationDrawerSection>

        <NavigationDrawerSection>
@@ -105,23 +105,14 @@ export const NewPill: Story = {
          args={{
            label: 'New Feature',
            Icon: IconSearch,
-            isNew: true,
+            modifier: 'new',
          }}
        />
        <Story
          args={{
-            label: 'New Feature with Count',
+            label: 'Feature with Keyboard Shortcut',
            Icon: IconSearch,
-            isNew: true,
-            count: 5,
-          }}
-        />
-        <Story
-          args={{
-            label: 'New Feature with Keyboard Shortcut',
-            Icon: IconSearch,
-            isNew: true,
-            keyboard: [getOsControlSymbol(), 'N'],
+            modifier: { keyboard: [getOsControlSymbol(), 'N'] },
          }}
        />
      </StyledContainer>
@@ -195,12 +186,6 @@ export const Catalog: CatalogStory<Story, typeof NavigationDrawerItem> = {
    pseudo: { hover: ['.hover'] },
    catalog: {
      dimensions: [
-        {
-          name: 'danger',
-          values: [true, false],
-          props: (danger: boolean) => ({ danger }),
-          labels: (danger: boolean) => (danger ? 'Danger' : 'No Danger'),
-        },
        {
          name: 'active',
          values: [true, false],
@@ -216,23 +201,19 @@ export const Catalog: CatalogStory<Story, typeof NavigationDrawerItem> = {
        },
        {
          name: 'adornments',
-          values: [
-            'Without Adornments',
-            'Soon Pill',
-            'New Pill',
-            'Count',
-            'Keyboard Keys',
-          ],
+          values: ['Without Modifier', 'Soon', 'New', 'Keyboard Keys'],
          props: (adornmentName: string) =>
-            adornmentName === 'Soon Pill'
-              ? { soon: true }
-              : adornmentName === 'New Pill'
-                ? { isNew: true }
-                : adornmentName === 'Count'
-                  ? { count: 3 }
-                  : adornmentName === 'Keyboard Keys'
-                    ? { keyboard: [getOsControlSymbol(), 'K'] }
-                    : {},
+            adornmentName === 'Soon'
+              ? { modifier: 'soon' }
+              : adornmentName === 'New'
+                ? { modifier: 'new' }
+                : adornmentName === 'Keyboard Keys'
+                  ? {
+                      modifier: {
+                        keyboard: [getOsControlSymbol(), 'K'],
+                      },
+                    }
+                  : {},
        },
      ],
    },
@@ -1236,107 +1236,6 @@ enum PageLayoutType {
  DASHBOARD
 }

-type FileWithSignedUrl {
-  id: UUID!
-  path: String!
-  size: Float!
-  createdAt: DateTime!
-  url: String!
-}
-
-type RecordIdentifier {
-  id: UUID!
-  labelIdentifier: String!
-  imageIdentifier: String
-}
-
-type NavigationMenuItem {
-  id: UUID!
-  userWorkspaceId: UUID
-  targetRecordId: UUID
-  targetObjectMetadataId: UUID
-  viewId: UUID
-  type: NavigationMenuItemType!
-  name: String
-  link: String
-  icon: String
-  color: String
-  folderId: UUID
-  position: Float!
-  applicationId: UUID
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  targetRecordIdentifier: RecordIdentifier
-}
-
-enum NavigationMenuItemType {
-  VIEW
-  FOLDER
-  LINK
-  OBJECT
-  RECORD
-}
-
-type ObjectRecordEventProperties {
-  updatedFields: [String!]
-  before: JSON
-  after: JSON
-  diff: JSON
-}
-
-type MetadataEvent {
-  type: MetadataEventAction!
-  metadataName: String!
-  recordId: String!
-  properties: ObjectRecordEventProperties!
-  updatedCollectionHash: String
-}
-
-"""Metadata Event Action"""
-enum MetadataEventAction {
-  CREATED
-  UPDATED
-  DELETED
-}
-
-type ObjectRecordEvent {
-  action: DatabaseEventAction!
-  objectNameSingular: String!
-  recordId: String!
-  userId: String
-  workspaceMemberId: String
-  properties: ObjectRecordEventProperties!
-}
-
-"""Database Event Action"""
-enum DatabaseEventAction {
-  CREATED
-  UPDATED
-  DELETED
-  DESTROYED
-  RESTORED
-  UPSERTED
-}
-
-type ObjectRecordEventWithQueryIds {
-  queryIds: [String!]!
-  objectRecordEvent: ObjectRecordEvent!
-}
-
-type EventSubscription {
-  eventStreamId: String!
-  objectRecordEventsWithQueryIds: [ObjectRecordEventWithQueryIds!]!
-  metadataEvents: [MetadataEvent!]!
-}
-
-type OnDbEvent {
-  action: DatabaseEventAction!
-  objectNameSingular: String!
-  eventDate: DateTime!
-  record: JSON!
-  updatedFields: [String!]
-}
-
 type Analytics {
  """Boolean that confirms query was dispatched"""
  success: Boolean!
@@ -1523,6 +1422,14 @@ type ApprovedAccessDomain {
  createdAt: DateTime!
 }

+type FileWithSignedUrl {
+  id: UUID!
+  path: String!
+  size: Float!
+  createdAt: DateTime!
+  url: String!
+}
+
 type WorkspaceInvitation {
  id: UUID!
  email: String!
@@ -1958,6 +1865,91 @@ type WorkspaceInviteHashValid {
  isValid: Boolean!
 }

+type RecordIdentifier {
+  id: UUID!
+  labelIdentifier: String!
+  imageIdentifier: String
+}
+
+type NavigationMenuItem {
+  id: UUID!
+  userWorkspaceId: UUID
+  targetRecordId: UUID
+  targetObjectMetadataId: UUID
+  viewId: UUID
+  type: NavigationMenuItemType!
+  name: String
+  link: String
+  icon: String
+  color: String
+  folderId: UUID
+  position: Float!
+  applicationId: UUID
+  createdAt: DateTime!
+  updatedAt: DateTime!
+  targetRecordIdentifier: RecordIdentifier
+}
+
+enum NavigationMenuItemType {
+  VIEW
+  FOLDER
+  LINK
+  OBJECT
+  RECORD
+}
+
+type ObjectRecordEventProperties {
+  updatedFields: [String!]
+  before: JSON
+  after: JSON
+  diff: JSON
+}
+
+type MetadataEvent {
+  type: MetadataEventAction!
+  metadataName: String!
+  recordId: String!
+  properties: ObjectRecordEventProperties!
+  updatedCollectionHash: String
+}
+
+"""Metadata Event Action"""
+enum MetadataEventAction {
+  CREATED
+  UPDATED
+  DELETED
+}
+
+type ObjectRecordEvent {
+  action: DatabaseEventAction!
+  objectNameSingular: String!
+  recordId: String!
+  userId: String
+  workspaceMemberId: String
+  properties: ObjectRecordEventProperties!
+}
+
+"""Database Event Action"""
+enum DatabaseEventAction {
+  CREATED
+  UPDATED
+  DELETED
+  DESTROYED
+  RESTORED
+  UPSERTED
+}
+
+type ObjectRecordEventWithQueryIds {
+  queryIds: [String!]!
+  objectRecordEvent: ObjectRecordEvent!
+}
+
+type EventSubscription {
+  eventStreamId: String!
+  objectRecordEventsWithQueryIds: [ObjectRecordEventWithQueryIds!]!
+  metadataEvents: [MetadataEvent!]!
+}
+
 type LogicFunctionExecutionResult {
  """Execution result in JSON format"""
  data: JSON
@@ -4316,17 +4308,10 @@ enum FileFolder {
 }

 type Subscription {
-  onDbEvent(input: OnDbEventInput!): OnDbEvent!
  onEventSubscription(eventStreamId: String!): EventSubscription
  logicFunctionLogs(input: LogicFunctionLogsInput!): LogicFunctionLogs!
 }

-input OnDbEventInput {
-  action: DatabaseEventAction
-  objectNameSingular: String
-  recordId: UUID
-}
-
 input LogicFunctionLogsInput {
  applicationId: UUID
  applicationUniversalIdentifier: UUID
@@ -963,101 +963,6 @@ export interface PageLayout {

 export type PageLayoutType = 'RECORD_INDEX' | 'RECORD_PAGE' | 'DASHBOARD'

-export interface FileWithSignedUrl {
-    id: Scalars['UUID']
-    path: Scalars['String']
-    size: Scalars['Float']
-    createdAt: Scalars['DateTime']
-    url: Scalars['String']
-    __typename: 'FileWithSignedUrl'
-}
-
-export interface RecordIdentifier {
-    id: Scalars['UUID']
-    labelIdentifier: Scalars['String']
-    imageIdentifier?: Scalars['String']
-    __typename: 'RecordIdentifier'
-}
-
-export interface NavigationMenuItem {
-    id: Scalars['UUID']
-    userWorkspaceId?: Scalars['UUID']
-    targetRecordId?: Scalars['UUID']
-    targetObjectMetadataId?: Scalars['UUID']
-    viewId?: Scalars['UUID']
-    type: NavigationMenuItemType
-    name?: Scalars['String']
-    link?: Scalars['String']
-    icon?: Scalars['String']
-    color?: Scalars['String']
-    folderId?: Scalars['UUID']
-    position: Scalars['Float']
-    applicationId?: Scalars['UUID']
-    createdAt: Scalars['DateTime']
-    updatedAt: Scalars['DateTime']
-    targetRecordIdentifier?: RecordIdentifier
-    __typename: 'NavigationMenuItem'
-}
-
-export type NavigationMenuItemType = 'VIEW' | 'FOLDER' | 'LINK' | 'OBJECT' | 'RECORD'
-
-export interface ObjectRecordEventProperties {
-    updatedFields?: Scalars['String'][]
-    before?: Scalars['JSON']
-    after?: Scalars['JSON']
-    diff?: Scalars['JSON']
-    __typename: 'ObjectRecordEventProperties'
-}
-
-export interface MetadataEvent {
-    type: MetadataEventAction
-    metadataName: Scalars['String']
-    recordId: Scalars['String']
-    properties: ObjectRecordEventProperties
-    updatedCollectionHash?: Scalars['String']
-    __typename: 'MetadataEvent'
-}
-
-
-/** Metadata Event Action */
-export type MetadataEventAction = 'CREATED' | 'UPDATED' | 'DELETED'
-
-export interface ObjectRecordEvent {
-    action: DatabaseEventAction
-    objectNameSingular: Scalars['String']
-    recordId: Scalars['String']
-    userId?: Scalars['String']
-    workspaceMemberId?: Scalars['String']
-    properties: ObjectRecordEventProperties
-    __typename: 'ObjectRecordEvent'
-}
-
-
-/** Database Event Action */
-export type DatabaseEventAction = 'CREATED' | 'UPDATED' | 'DELETED' | 'DESTROYED' | 'RESTORED' | 'UPSERTED'
-
-export interface ObjectRecordEventWithQueryIds {
-    queryIds: Scalars['String'][]
-    objectRecordEvent: ObjectRecordEvent
-    __typename: 'ObjectRecordEventWithQueryIds'
-}
-
-export interface EventSubscription {
-    eventStreamId: Scalars['String']
-    objectRecordEventsWithQueryIds: ObjectRecordEventWithQueryIds[]
-    metadataEvents: MetadataEvent[]
-    __typename: 'EventSubscription'
-}
-
-export interface OnDbEvent {
-    action: DatabaseEventAction
-    objectNameSingular: Scalars['String']
-    eventDate: Scalars['DateTime']
-    record: Scalars['JSON']
-    updatedFields?: Scalars['String'][]
-    __typename: 'OnDbEvent'
-}
-
 export interface Analytics {
    /** Boolean that confirms query was dispatched */
    success: Scalars['Boolean']
@@ -1241,6 +1146,15 @@ export interface ApprovedAccessDomain {
    __typename: 'ApprovedAccessDomain'
 }

+export interface FileWithSignedUrl {
+    id: Scalars['UUID']
+    path: Scalars['String']
+    size: Scalars['Float']
+    createdAt: Scalars['DateTime']
+    url: Scalars['String']
+    __typename: 'FileWithSignedUrl'
+}
+
 export interface WorkspaceInvitation {
    id: Scalars['UUID']
    email: Scalars['String']
@@ -1687,6 +1601,83 @@ export interface WorkspaceInviteHashValid {
    __typename: 'WorkspaceInviteHashValid'
 }

+export interface RecordIdentifier {
+    id: Scalars['UUID']
+    labelIdentifier: Scalars['String']
+    imageIdentifier?: Scalars['String']
+    __typename: 'RecordIdentifier'
+}
+
+export interface NavigationMenuItem {
+    id: Scalars['UUID']
+    userWorkspaceId?: Scalars['UUID']
+    targetRecordId?: Scalars['UUID']
+    targetObjectMetadataId?: Scalars['UUID']
+    viewId?: Scalars['UUID']
+    type: NavigationMenuItemType
+    name?: Scalars['String']
+    link?: Scalars['String']
+    icon?: Scalars['String']
+    color?: Scalars['String']
+    folderId?: Scalars['UUID']
+    position: Scalars['Float']
+    applicationId?: Scalars['UUID']
+    createdAt: Scalars['DateTime']
+    updatedAt: Scalars['DateTime']
+    targetRecordIdentifier?: RecordIdentifier
+    __typename: 'NavigationMenuItem'
+}
+
+export type NavigationMenuItemType = 'VIEW' | 'FOLDER' | 'LINK' | 'OBJECT' | 'RECORD'
+
+export interface ObjectRecordEventProperties {
+    updatedFields?: Scalars['String'][]
+    before?: Scalars['JSON']
+    after?: Scalars['JSON']
+    diff?: Scalars['JSON']
+    __typename: 'ObjectRecordEventProperties'
+}
+
+export interface MetadataEvent {
+    type: MetadataEventAction
+    metadataName: Scalars['String']
+    recordId: Scalars['String']
+    properties: ObjectRecordEventProperties
+    updatedCollectionHash?: Scalars['String']
+    __typename: 'MetadataEvent'
+}
+
+
+/** Metadata Event Action */
+export type MetadataEventAction = 'CREATED' | 'UPDATED' | 'DELETED'
+
+export interface ObjectRecordEvent {
+    action: DatabaseEventAction
+    objectNameSingular: Scalars['String']
+    recordId: Scalars['String']
+    userId?: Scalars['String']
+    workspaceMemberId?: Scalars['String']
+    properties: ObjectRecordEventProperties
+    __typename: 'ObjectRecordEvent'
+}
+
+
+/** Database Event Action */
+export type DatabaseEventAction = 'CREATED' | 'UPDATED' | 'DELETED' | 'DESTROYED' | 'RESTORED' | 'UPSERTED'
+
+export interface ObjectRecordEventWithQueryIds {
+    queryIds: Scalars['String'][]
+    objectRecordEvent: ObjectRecordEvent
+    __typename: 'ObjectRecordEventWithQueryIds'
+}
+
+export interface EventSubscription {
+    eventStreamId: Scalars['String']
+    objectRecordEventsWithQueryIds: ObjectRecordEventWithQueryIds[]
+    metadataEvents: MetadataEvent[]
+    __typename: 'EventSubscription'
+}
+
 export interface LogicFunctionExecutionResult {
    /** Execution result in JSON format */
    data?: Scalars['JSON']
@@ -2881,7 +2872,6 @@ export type WorkspaceMigrationActionType = 'delete' | 'create' | 'update'
 export type FileFolder = 'ProfilePicture' | 'WorkspaceLogo' | 'Attachment' | 'PersonPicture' | 'CorePicture' | 'File' | 'AgentChat' | 'BuiltLogicFunction' | 'BuiltFrontComponent' | 'PublicAsset' | 'Source' | 'FilesField' | 'Dependencies' | 'Workflow' | 'AppTarball'

 export interface Subscription {
-    onDbEvent: OnDbEvent
    onEventSubscription?: EventSubscription
    logicFunctionLogs: LogicFunctionLogs
    __typename: 'Subscription'
@@ -3897,100 +3887,6 @@ export interface PageLayoutGenqlSelection{
    __scalar?: boolean | number
 }

-export interface FileWithSignedUrlGenqlSelection{
-    id?: boolean | number
-    path?: boolean | number
-    size?: boolean | number
-    createdAt?: boolean | number
-    url?: boolean | number
-    __typename?: boolean | number
-    __scalar?: boolean | number
-}
-
-export interface RecordIdentifierGenqlSelection{
-    id?: boolean | number
-    labelIdentifier?: boolean | number
-    imageIdentifier?: boolean | number
-    __typename?: boolean | number
-    __scalar?: boolean | number
-}
-
-export interface NavigationMenuItemGenqlSelection{
-    id?: boolean | number
-    userWorkspaceId?: boolean | number
-    targetRecordId?: boolean | number
-    targetObjectMetadataId?: boolean | number
-    viewId?: boolean | number
-    type?: boolean | number
-    name?: boolean | number
-    link?: boolean | number
-    icon?: boolean | number
-    color?: boolean | number
-    folderId?: boolean | number
-    position?: boolean | number
-    applicationId?: boolean | number
-    createdAt?: boolean | number
-    updatedAt?: boolean | number
-    targetRecordIdentifier?: RecordIdentifierGenqlSelection
-    __typename?: boolean | number
-    __scalar?: boolean | number
-}
-
-export interface ObjectRecordEventPropertiesGenqlSelection{
-    updatedFields?: boolean | number
-    before?: boolean | number
-    after?: boolean | number
-    diff?: boolean | number
-    __typename?: boolean | number
-    __scalar?: boolean | number
-}
-
-export interface MetadataEventGenqlSelection{
-    type?: boolean | number
-    metadataName?: boolean | number
-    recordId?: boolean | number
-    properties?: ObjectRecordEventPropertiesGenqlSelection
-    updatedCollectionHash?: boolean | number
-    __typename?: boolean | number
-    __scalar?: boolean | number
-}
-
-export interface ObjectRecordEventGenqlSelection{
-    action?: boolean | number
-    objectNameSingular?: boolean | number
-    recordId?: boolean | number
-    userId?: boolean | number
-    workspaceMemberId?: boolean | number
-    properties?: ObjectRecordEventPropertiesGenqlSelection
-    __typename?: boolean | number
-    __scalar?: boolean | number
-}
-
-export interface ObjectRecordEventWithQueryIdsGenqlSelection{
-    queryIds?: boolean | number
-    objectRecordEvent?: ObjectRecordEventGenqlSelection
-    __typename?: boolean | number
-    __scalar?: boolean | number
-}
-
-export interface EventSubscriptionGenqlSelection{
-    eventStreamId?: boolean | number
-    objectRecordEventsWithQueryIds?: ObjectRecordEventWithQueryIdsGenqlSelection
-    metadataEvents?: MetadataEventGenqlSelection
-    __typename?: boolean | number
-    __scalar?: boolean | number
-}
-
-export interface OnDbEventGenqlSelection{
-    action?: boolean | number
-    objectNameSingular?: boolean | number
-    eventDate?: boolean | number
-    record?: boolean | number
-    updatedFields?: boolean | number
-    __typename?: boolean | number
-    __scalar?: boolean | number
-}
-
 export interface AnalyticsGenqlSelection{
    /** Boolean that confirms query was dispatched */
    success?: boolean | number
@@ -4181,6 +4077,16 @@ export interface ApprovedAccessDomainGenqlSelection{
    __scalar?: boolean | number
 }

+export interface FileWithSignedUrlGenqlSelection{
+    id?: boolean | number
+    path?: boolean | number
+    size?: boolean | number
+    createdAt?: boolean | number
+    url?: boolean | number
+    __typename?: boolean | number
+    __scalar?: boolean | number
+}
+
 export interface WorkspaceInvitationGenqlSelection{
    id?: boolean | number
    email?: boolean | number
@@ -4676,6 +4582,80 @@ export interface WorkspaceInviteHashValidGenqlSelection{
    __scalar?: boolean | number
 }

+export interface RecordIdentifierGenqlSelection{
+    id?: boolean | number
+    labelIdentifier?: boolean | number
+    imageIdentifier?: boolean | number
+    __typename?: boolean | number
+    __scalar?: boolean | number
+}
+
+export interface NavigationMenuItemGenqlSelection{
+    id?: boolean | number
+    userWorkspaceId?: boolean | number
+    targetRecordId?: boolean | number
+    targetObjectMetadataId?: boolean | number
+    viewId?: boolean | number
+    type?: boolean | number
+    name?: boolean | number
+    link?: boolean | number
+    icon?: boolean | number
+    color?: boolean | number
+    folderId?: boolean | number
+    position?: boolean | number
+    applicationId?: boolean | number
+    createdAt?: boolean | number
+    updatedAt?: boolean | number
+    targetRecordIdentifier?: RecordIdentifierGenqlSelection
+    __typename?: boolean | number
+    __scalar?: boolean | number
+}
+
+export interface ObjectRecordEventPropertiesGenqlSelection{
+    updatedFields?: boolean | number
+    before?: boolean | number
+    after?: boolean | number
+    diff?: boolean | number
+    __typename?: boolean | number
+    __scalar?: boolean | number
+}
+
+export interface MetadataEventGenqlSelection{
+    type?: boolean | number
+    metadataName?: boolean | number
+    recordId?: boolean | number
+    properties?: ObjectRecordEventPropertiesGenqlSelection
+    updatedCollectionHash?: boolean | number
+    __typename?: boolean | number
+    __scalar?: boolean | number
+}
+
+export interface ObjectRecordEventGenqlSelection{
+    action?: boolean | number
+    objectNameSingular?: boolean | number
+    recordId?: boolean | number
+    userId?: boolean | number
+    workspaceMemberId?: boolean | number
+    properties?: ObjectRecordEventPropertiesGenqlSelection
+    __typename?: boolean | number
+    __scalar?: boolean | number
+}
+
+export interface ObjectRecordEventWithQueryIdsGenqlSelection{
+    queryIds?: boolean | number
+    objectRecordEvent?: ObjectRecordEventGenqlSelection
+    __typename?: boolean | number
+    __scalar?: boolean | number
+}
+
+export interface EventSubscriptionGenqlSelection{
+    eventStreamId?: boolean | number
+    objectRecordEventsWithQueryIds?: ObjectRecordEventWithQueryIdsGenqlSelection
+    metadataEvents?: MetadataEventGenqlSelection
+    __typename?: boolean | number
+    __scalar?: boolean | number
+}
+
 export interface LogicFunctionExecutionResultGenqlSelection{
    /** Execution result in JSON format */
    data?: boolean | number
@@ -6266,15 +6246,12 @@ export interface WorkspaceMigrationInput {actions: WorkspaceMigrationDeleteActio
 export interface WorkspaceMigrationDeleteActionInput {type: WorkspaceMigrationActionType,metadataName: AllMetadataName,universalIdentifier: Scalars['String']}

 export interface SubscriptionGenqlSelection{
-    onDbEvent?: (OnDbEventGenqlSelection & { __args: {input: OnDbEventInput} })
    onEventSubscription?: (EventSubscriptionGenqlSelection & { __args: {eventStreamId: Scalars['String']} })
    logicFunctionLogs?: (LogicFunctionLogsGenqlSelection & { __args: {input: LogicFunctionLogsInput} })
    __typename?: boolean | number
    __scalar?: boolean | number
 }

-export interface OnDbEventInput {action?: (DatabaseEventAction | null),objectNameSingular?: (Scalars['String'] | null),recordId?: (Scalars['UUID'] | null)}
-
 export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null),applicationUniversalIdentifier?: (Scalars['UUID'] | null),name?: (Scalars['String'] | null),id?: (Scalars['UUID'] | null),universalIdentifier?: (Scalars['UUID'] | null)}


@@ -6822,78 +6799,6 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null
    


-    const FileWithSignedUrl_possibleTypes: string[] = ['FileWithSignedUrl']
-    export const isFileWithSignedUrl = (obj?: { __typename?: any } | null): obj is FileWithSignedUrl => {
-      if (!obj?.__typename) throw new Error('__typename is missing in "isFileWithSignedUrl"')
-      return FileWithSignedUrl_possibleTypes.includes(obj.__typename)
-    }
-    
-
-
-    const RecordIdentifier_possibleTypes: string[] = ['RecordIdentifier']
-    export const isRecordIdentifier = (obj?: { __typename?: any } | null): obj is RecordIdentifier => {
-      if (!obj?.__typename) throw new Error('__typename is missing in "isRecordIdentifier"')
-      return RecordIdentifier_possibleTypes.includes(obj.__typename)
-    }
-    
-
-
-    const NavigationMenuItem_possibleTypes: string[] = ['NavigationMenuItem']
-    export const isNavigationMenuItem = (obj?: { __typename?: any } | null): obj is NavigationMenuItem => {
-      if (!obj?.__typename) throw new Error('__typename is missing in "isNavigationMenuItem"')
-      return NavigationMenuItem_possibleTypes.includes(obj.__typename)
-    }
-    
-
-
-    const ObjectRecordEventProperties_possibleTypes: string[] = ['ObjectRecordEventProperties']
-    export const isObjectRecordEventProperties = (obj?: { __typename?: any } | null): obj is ObjectRecordEventProperties => {
-      if (!obj?.__typename) throw new Error('__typename is missing in "isObjectRecordEventProperties"')
-      return ObjectRecordEventProperties_possibleTypes.includes(obj.__typename)
-    }
-    
-
-
-    const MetadataEvent_possibleTypes: string[] = ['MetadataEvent']
-    export const isMetadataEvent = (obj?: { __typename?: any } | null): obj is MetadataEvent => {
-      if (!obj?.__typename) throw new Error('__typename is missing in "isMetadataEvent"')
-      return MetadataEvent_possibleTypes.includes(obj.__typename)
-    }
-    
-
-
-    const ObjectRecordEvent_possibleTypes: string[] = ['ObjectRecordEvent']
-    export const isObjectRecordEvent = (obj?: { __typename?: any } | null): obj is ObjectRecordEvent => {
-      if (!obj?.__typename) throw new Error('__typename is missing in "isObjectRecordEvent"')
-      return ObjectRecordEvent_possibleTypes.includes(obj.__typename)
-    }
-    
-
-
-    const ObjectRecordEventWithQueryIds_possibleTypes: string[] = ['ObjectRecordEventWithQueryIds']
-    export const isObjectRecordEventWithQueryIds = (obj?: { __typename?: any } | null): obj is ObjectRecordEventWithQueryIds => {
-      if (!obj?.__typename) throw new Error('__typename is missing in "isObjectRecordEventWithQueryIds"')
-      return ObjectRecordEventWithQueryIds_possibleTypes.includes(obj.__typename)
-    }
-    
-
-
-    const EventSubscription_possibleTypes: string[] = ['EventSubscription']
-    export const isEventSubscription = (obj?: { __typename?: any } | null): obj is EventSubscription => {
-      if (!obj?.__typename) throw new Error('__typename is missing in "isEventSubscription"')
-      return EventSubscription_possibleTypes.includes(obj.__typename)
-    }
-    
-
-
-    const OnDbEvent_possibleTypes: string[] = ['OnDbEvent']
-    export const isOnDbEvent = (obj?: { __typename?: any } | null): obj is OnDbEvent => {
-      if (!obj?.__typename) throw new Error('__typename is missing in "isOnDbEvent"')
-      return OnDbEvent_possibleTypes.includes(obj.__typename)
-    }
-    
-
-
    const Analytics_possibleTypes: string[] = ['Analytics']
    export const isAnalytics = (obj?: { __typename?: any } | null): obj is Analytics => {
      if (!obj?.__typename) throw new Error('__typename is missing in "isAnalytics"')
@@ -7062,6 +6967,14 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null
    


+    const FileWithSignedUrl_possibleTypes: string[] = ['FileWithSignedUrl']
+    export const isFileWithSignedUrl = (obj?: { __typename?: any } | null): obj is FileWithSignedUrl => {
+      if (!obj?.__typename) throw new Error('__typename is missing in "isFileWithSignedUrl"')
+      return FileWithSignedUrl_possibleTypes.includes(obj.__typename)
+    }
+    
+
+
    const WorkspaceInvitation_possibleTypes: string[] = ['WorkspaceInvitation']
    export const isWorkspaceInvitation = (obj?: { __typename?: any } | null): obj is WorkspaceInvitation => {
      if (!obj?.__typename) throw new Error('__typename is missing in "isWorkspaceInvitation"')
@@ -7550,6 +7463,62 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null
    


+    const RecordIdentifier_possibleTypes: string[] = ['RecordIdentifier']
+    export const isRecordIdentifier = (obj?: { __typename?: any } | null): obj is RecordIdentifier => {
+      if (!obj?.__typename) throw new Error('__typename is missing in "isRecordIdentifier"')
+      return RecordIdentifier_possibleTypes.includes(obj.__typename)
+    }
+    
+
+
+    const NavigationMenuItem_possibleTypes: string[] = ['NavigationMenuItem']
+    export const isNavigationMenuItem = (obj?: { __typename?: any } | null): obj is NavigationMenuItem => {
+      if (!obj?.__typename) throw new Error('__typename is missing in "isNavigationMenuItem"')
+      return NavigationMenuItem_possibleTypes.includes(obj.__typename)
+    }
+    
+
+
+    const ObjectRecordEventProperties_possibleTypes: string[] = ['ObjectRecordEventProperties']
+    export const isObjectRecordEventProperties = (obj?: { __typename?: any } | null): obj is ObjectRecordEventProperties => {
+      if (!obj?.__typename) throw new Error('__typename is missing in "isObjectRecordEventProperties"')
+      return ObjectRecordEventProperties_possibleTypes.includes(obj.__typename)
+    }
+    
+
+
+    const MetadataEvent_possibleTypes: string[] = ['MetadataEvent']
+    export const isMetadataEvent = (obj?: { __typename?: any } | null): obj is MetadataEvent => {
+      if (!obj?.__typename) throw new Error('__typename is missing in "isMetadataEvent"')
+      return MetadataEvent_possibleTypes.includes(obj.__typename)
+    }
+    
+
+
+    const ObjectRecordEvent_possibleTypes: string[] = ['ObjectRecordEvent']
+    export const isObjectRecordEvent = (obj?: { __typename?: any } | null): obj is ObjectRecordEvent => {
+      if (!obj?.__typename) throw new Error('__typename is missing in "isObjectRecordEvent"')
+      return ObjectRecordEvent_possibleTypes.includes(obj.__typename)
+    }
+    
+
+
+    const ObjectRecordEventWithQueryIds_possibleTypes: string[] = ['ObjectRecordEventWithQueryIds']
+    export const isObjectRecordEventWithQueryIds = (obj?: { __typename?: any } | null): obj is ObjectRecordEventWithQueryIds => {
+      if (!obj?.__typename) throw new Error('__typename is missing in "isObjectRecordEventWithQueryIds"')
+      return ObjectRecordEventWithQueryIds_possibleTypes.includes(obj.__typename)
+    }
+    
+
+
+    const EventSubscription_possibleTypes: string[] = ['EventSubscription']
+    export const isEventSubscription = (obj?: { __typename?: any } | null): obj is EventSubscription => {
+      if (!obj?.__typename) throw new Error('__typename is missing in "isEventSubscription"')
+      return EventSubscription_possibleTypes.includes(obj.__typename)
+    }
+    
+
+
    const LogicFunctionExecutionResult_possibleTypes: string[] = ['LogicFunctionExecutionResult']
    export const isLogicFunctionExecutionResult = (obj?: { __typename?: any } | null): obj is LogicFunctionExecutionResult => {
      if (!obj?.__typename) throw new Error('__typename is missing in "isLogicFunctionExecutionResult"')
@@ -8591,29 +8560,6 @@ export const enumPageLayoutType = {
   DASHBOARD: 'DASHBOARD' as const
 }

-export const enumNavigationMenuItemType = {
-   VIEW: 'VIEW' as const,
-   FOLDER: 'FOLDER' as const,
-   LINK: 'LINK' as const,
-   OBJECT: 'OBJECT' as const,
-   RECORD: 'RECORD' as const
-}
-
-export const enumMetadataEventAction = {
-   CREATED: 'CREATED' as const,
-   UPDATED: 'UPDATED' as const,
-   DELETED: 'DELETED' as const
-}
-
-export const enumDatabaseEventAction = {
-   CREATED: 'CREATED' as const,
-   UPDATED: 'UPDATED' as const,
-   DELETED: 'DELETED' as const,
-   DESTROYED: 'DESTROYED' as const,
-   RESTORED: 'RESTORED' as const,
-   UPSERTED: 'UPSERTED' as const
-}
-
 export const enumBillingPlanKey = {
   PRO: 'PRO' as const,
   ENTERPRISE: 'ENTERPRISE' as const
@@ -8692,6 +8638,29 @@ export const enumRelationType = {
   MANY_TO_ONE: 'MANY_TO_ONE' as const
 }

+export const enumNavigationMenuItemType = {
+   VIEW: 'VIEW' as const,
+   FOLDER: 'FOLDER' as const,
+   LINK: 'LINK' as const,
+   OBJECT: 'OBJECT' as const,
+   RECORD: 'RECORD' as const
+}
+
+export const enumMetadataEventAction = {
+   CREATED: 'CREATED' as const,
+   UPDATED: 'UPDATED' as const,
+   DELETED: 'DELETED' as const
+}
+
+export const enumDatabaseEventAction = {
+   CREATED: 'CREATED' as const,
+   UPDATED: 'UPDATED' as const,
+   DELETED: 'DELETED' as const,
+   DESTROYED: 'DESTROYED' as const,
+   RESTORED: 'RESTORED' as const,
+   UPSERTED: 'UPSERTED' as const
+}
+
 export const enumLogicFunctionExecutionStatus = {
   IDLE: 'IDLE' as const,
   SUCCESS: 'SUCCESS' as const,
@@ -1,3 +1,5 @@
+import { registerEnumType } from '@nestjs/graphql';
+
 export enum DatabaseEventAction {
  CREATED = 'created',
  UPDATED = 'updated',
@@ -6,3 +8,8 @@ export enum DatabaseEventAction {
  RESTORED = 'restored',
  UPSERTED = 'upserted',
 }
+
+registerEnumType(DatabaseEventAction, {
+  name: 'DatabaseEventAction',
+  description: 'Database Event Action',
+});
@@ -20,7 +20,7 @@ import { CallWebhookJobsJob } from 'src/engine/metadata-modules/webhook/jobs/cal
 import { WorkspaceEventBatchForWebhook } from 'src/engine/metadata-modules/webhook/types/workspace-event-batch-for-webhook.type';
 import { CallDatabaseEventTriggerJobsJob } from 'src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job';
 import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
-import { WorkspaceEventEmitterService } from 'src/engine/workspace-event-emitter/workspace-event-emitter.service';
+import { ObjectRecordEventPublisher } from 'src/engine/subscriptions/object-record-event/object-record-event-publisher';
 import { UpsertTimelineActivityFromInternalEvent } from 'src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job';

@Injectable()
@@ -32,7 +32,7 @@ export class EntityEventsToDbListener {
    private readonly webhookQueueService: MessageQueueService,
    @InjectMessageQueue(MessageQueue.triggerQueue)
    private readonly triggerQueueService: MessageQueueService,
-    private readonly workspaceEventEmitterService: WorkspaceEventEmitterService,
+    private readonly objectRecordEventPublisher: ObjectRecordEventPublisher,
  ) {}

  @OnDatabaseBatchEvent('*', DatabaseEventAction.CREATED)
@@ -79,7 +79,7 @@ export class EntityEventsToDbListener {
    };

    const promises = [
-      this.workspaceEventEmitterService.publish(batchEvent),
+      this.objectRecordEventPublisher.publish(batchEvent),
      this.webhookQueueService.add<WorkspaceEventBatchForWebhook<T>>(
        CallWebhookJobsJob.name,
        batchEventForWebhook,
@@ -65,7 +65,6 @@ import { RoleModule } from 'src/engine/metadata-modules/role/role.module';
 import { RowLevelPermissionModule } from 'src/engine/metadata-modules/row-level-permission-predicate/row-level-permission.module';
 import { SubscriptionsModule } from 'src/engine/subscriptions/subscriptions.module';
 import { TrashCleanupModule } from 'src/engine/trash-cleanup/trash-cleanup.module';
-import { MetadataEventEmitterModule } from 'src/engine/metadata-event-emitter/metadata-event-emitter.module';
 import { WorkspaceEventEmitterModule } from 'src/engine/workspace-event-emitter/workspace-event-emitter.module';
 import { ChannelSyncModule } from 'src/modules/connected-account/channel-sync/channel-sync.module';
 import { DashboardModule } from 'src/modules/dashboard/dashboard.module';
@@ -110,7 +109,6 @@ import { FileModule } from './file/file.module';
    PostgresCredentialsModule,
    WorkflowApiModule,
    WorkspaceEventEmitterModule,
-    MetadataEventEmitterModule,
    ActorModule,
    TelemetryModule,
    AdminPanelModule,
@@ -29,7 +29,16 @@ export class ResolverValidationPipe implements PipeTransform {
      return value;
    }

-    const object = plainToInstance(metatype, value);
+    let object: object;
+
+    try {
+      object = plainToInstance(metatype, value);
+    } catch (error) {
+      throw new UserInputError(
+        `Invalid input: ${error instanceof Error ? error.message : 'transformation failed'}`,
+      );
+    }
+
    const errors = await safeClassValidatorValidateWrapper(object);

    if (errors.length === 0) {
@@ -1,14 +0,0 @@
-import { Global, Module } from '@nestjs/common';
-
-import { MetadataEventsToDbListener } from 'src/engine/metadata-event-emitter/listeners/metadata-events-to-db.listener';
-import { MetadataEventEmitter } from 'src/engine/metadata-event-emitter/metadata-event-emitter';
-import { SubscriptionsModule } from 'src/engine/subscriptions/subscriptions.module';
-import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
-
-@Global()
-@Module({
-  imports: [SubscriptionsModule, WorkspaceCacheModule],
-  providers: [MetadataEventEmitter, MetadataEventsToDbListener],
-  exports: [MetadataEventEmitter],
-})
-export class MetadataEventEmitterModule {}
@@ -33,7 +33,6 @@ import {
 import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
 import { IsValidMetadataName } from 'src/engine/decorators/metadata/is-valid-metadata-name.decorator';
 import { FieldStandardOverridesDTO } from 'src/engine/metadata-modules/field-metadata/dtos/field-standard-overrides.dto';
-import { type FieldMetadataDefaultOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';
 import { ObjectMetadataDTO } from 'src/engine/metadata-modules/object-metadata/dtos/object-metadata.dto';
 import { transformEnumValue } from 'src/engine/utils/transform-enum-value';

@@ -132,9 +131,7 @@ export class FieldMetadataDTO<T extends FieldMetadataType = FieldMetadataType> {
  @Field(() => GraphQLJSON, { nullable: true })
  defaultValue?: FieldMetadataDefaultValue<T>;

-  @Transform(({ value }) =>
-    transformEnumValue(value as FieldMetadataDefaultOption[]),
-  )
+  @Transform(({ value }) => transformEnumValue(value))
  @IsOptional()
  @Field(() => GraphQLJSON, { nullable: true })
  options?: FieldMetadataOptions<T>;
@@ -6,7 +6,7 @@ import { Process } from 'src/engine/core-modules/message-queue/decorators/proces
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import { type MetadataEventBatch } from 'src/engine/metadata-event-emitter/types/metadata-event-batch.type';
+import { type MetadataEventBatch } from 'src/engine/subscriptions/metadata-event/types/metadata-event-batch.type';
 import { type FlatWebhook } from 'src/engine/metadata-modules/flat-webhook/types/flat-webhook.type';
 import { CallWebhookJob } from 'src/engine/metadata-modules/webhook/jobs/call-webhook.job';
 import { type CallMetadataWebhookJobData } from 'src/engine/metadata-modules/webhook/types/webhook-job-data.type';
@@ -1,29 +0,0 @@
-import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
-
-import GraphQLJSON from 'graphql-type-json';
-import { ObjectRecord } from 'twenty-shared/types';
-
-import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
-
-registerEnumType(DatabaseEventAction, {
-  name: 'DatabaseEventAction',
-  description: 'Database Event Action',
-});
-
-@ObjectType('OnDbEvent')
-export class OnDbEventDTO {
-  @Field(() => DatabaseEventAction)
-  action: DatabaseEventAction;
-
-  @Field(() => String)
-  objectNameSingular: string;
-
-  @Field()
-  eventDate: Date;
-
-  @Field(() => GraphQLJSON)
-  record: ObjectRecord;
-
-  @Field(() => [String], { nullable: true })
-  updatedFields?: string[];
-}
@@ -1,16 +0,0 @@
-import { Field, InputType } from '@nestjs/graphql';
-
-import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
-import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
-
-@InputType()
-export class OnDbEventInput {
-  @Field(() => DatabaseEventAction, { nullable: true })
-  action?: DatabaseEventAction;
-
-  @Field(() => String, { nullable: true })
-  objectNameSingular?: string;
-
-  @Field(() => UUIDScalarType, { nullable: true })
-  recordId?: string;
-}
@@ -1,5 +1,4 @@
 export enum SubscriptionChannel {
-  DATABASE_EVENT_CHANNEL = 'DATABASE_EVENT_CHANNEL',
  LOGIC_FUNCTION_LOGS_CHANNEL = 'LOGIC_FUNCTION_LOGS_CHANNEL',
  EVENT_STREAM_CHANNEL = 'EVENT_STREAM_CHANNEL',
 }
@@ -10,9 +10,7 @@ import {
 } from 'src/engine/subscriptions/event-stream.exception';

@Catch(EventStreamException)
-export class WorkspaceEventEmitterExceptionFilter
-  implements GqlExceptionFilter
-{
+export class EventStreamExceptionFilter implements GqlExceptionFilter {
  catch(exception: EventStreamException) {
    switch (exception.code) {
      case EventStreamExceptionCode.EVENT_STREAM_ALREADY_EXISTS:
@@ -19,10 +19,8 @@ import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
 import { EVENT_STREAM_TTL_MS } from 'src/engine/subscriptions/constants/event-stream-ttl.constant';
 import { AddQuerySubscriptionInput } from 'src/engine/subscriptions/dtos/add-query-subscription.input';
 import { EventSubscriptionDTO } from 'src/engine/subscriptions/dtos/event-subscription.dto';
-import { OnDbEventDTO } from 'src/engine/subscriptions/dtos/on-db-event.dto';
-import { OnDbEventInput } from 'src/engine/subscriptions/dtos/on-db-event.input';
 import { RemoveQueryFromEventStreamInput } from 'src/engine/subscriptions/dtos/remove-query-subscription.input';
-import { SubscriptionChannel } from 'src/engine/subscriptions/enums/subscription-channel.enum';
+import { EventStreamExceptionFilter } from 'src/engine/subscriptions/event-stream-exception.filter';
 import {
  EventStreamException,
  EventStreamExceptionCode,
@@ -30,57 +28,19 @@ import {
 import { EventStreamService } from 'src/engine/subscriptions/event-stream.service';
 import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';
 import { type EventStreamPayload } from 'src/engine/subscriptions/types/event-stream-payload.type';
-import { wrapAsyncIteratorWithLifecycle } from 'src/engine/workspace-event-emitter/utils/wrap-async-iterator-with-lifecycle';
-import { WorkspaceEventEmitterExceptionFilter } from 'src/engine/workspace-event-emitter/workspace-event-emitter-exception.filter';
-
-import { eventStreamIdToChannelId } from './utils/get-channel-id-from-event-stream-id';
+import { eventStreamIdToChannelId } from 'src/engine/subscriptions/utils/get-channel-id-from-event-stream-id';
+import { wrapAsyncIteratorWithLifecycle } from 'src/engine/subscriptions/utils/wrap-async-iterator-with-lifecycle';

@MetadataResolver()
@UseGuards(WorkspaceAuthGuard, UserAuthGuard, NoPermissionGuard)
@UsePipes(ResolverValidationPipe)
-@UseFilters(
-  WorkspaceEventEmitterExceptionFilter,
-  PreventNestToAutoLogGraphqlErrorsFilter,
-)
-export class WorkspaceEventEmitterResolver {
+@UseFilters(EventStreamExceptionFilter, PreventNestToAutoLogGraphqlErrorsFilter)
+export class EventStreamResolver {
  constructor(
    private readonly subscriptionService: SubscriptionService,
    private readonly eventStreamService: EventStreamService,
  ) {}

-  @Subscription(() => OnDbEventDTO, {
-    filter: (
-      payload: { onDbEvent: OnDbEventDTO },
-      variables: { input: OnDbEventInput },
-    ) => {
-      const isActionMatching =
-        !isDefined(variables.input.action) ||
-        payload.onDbEvent.action === variables.input.action;
-
-      const isObjectNameSingularMatching =
-        !isDefined(variables.input.objectNameSingular) ||
-        payload.onDbEvent.objectNameSingular ===
-          variables.input.objectNameSingular;
-
-      const isRecordIdMatching =
-        !isDefined(variables.input.recordId) ||
-        payload.onDbEvent.record.id === variables.input.recordId;
-
-      return (
-        isActionMatching && isObjectNameSingularMatching && isRecordIdMatching
-      );
-    },
-  })
-  onDbEvent(
-    @Args('input') _: OnDbEventInput,
-    @AuthWorkspace() workspace: WorkspaceEntity,
-  ) {
-    return this.subscriptionService.subscribe({
-      channel: SubscriptionChannel.DATABASE_EVENT_CHANNEL,
-      workspaceId: workspace.id,
-    });
-  }
-
  @Subscription(() => EventSubscriptionDTO, {
    nullable: true,
    resolve: (
@@ -6,8 +6,8 @@ import { isDefined } from 'twenty-shared/utils';

 import { getWorkspaceAuthContext } from 'src/engine/core-modules/auth/storage/workspace-auth-context.storage';
 import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
-import { MetadataEventBatch } from 'src/engine/metadata-event-emitter/types/metadata-event-batch.type';
-import { computeMetadataEventName } from 'src/engine/metadata-event-emitter/utils/compute-metadata-event-name.util';
+import { MetadataEventBatch } from 'src/engine/subscriptions/metadata-event/types/metadata-event-batch.type';
+import { computeMetadataEventName } from 'src/engine/subscriptions/metadata-event/utils/compute-metadata-event-name.util';
 import {
  AllMetadataEventName,
  AllMetadataEventType,
@@ -0,0 +1,250 @@
+import { Injectable } from '@nestjs/common';
+
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
+
+import { OBJECT_METADATA_STANDARD_OVERRIDES_PROPERTIES } from 'src/engine/metadata-modules/object-metadata/constants/object-metadata-standard-overrides-properties.constant';
+import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
+import { NavigationMenuItemRecordIdentifierService } from 'src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service';
+import { type MetadataEventBatch } from 'src/engine/subscriptions/metadata-event/types/metadata-event-batch.type';
+import { type EventStreamPayload } from 'src/engine/subscriptions/types/event-stream-payload.type';
+import { EventStreamService } from 'src/engine/subscriptions/event-stream.service';
+import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';
+import { enrichFieldMetadataEventWithRelations } from 'src/engine/subscriptions/metadata-event/utils/enrich-field-metadata-event-with-relations.util';
+
+@Injectable()
+export class MetadataEventPublisher {
+  constructor(
+    private readonly subscriptionService: SubscriptionService,
+    private readonly eventStreamService: EventStreamService,
+    private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
+    private readonly navigationMenuItemRecordIdentifierService: NavigationMenuItemRecordIdentifierService,
+  ) {}
+
+  async publish(metadataEventBatch: MetadataEventBatch): Promise<void> {
+    const workspaceId = metadataEventBatch.workspaceId;
+
+    const activeStreamIds =
+      await this.eventStreamService.getActiveStreamIds(workspaceId);
+
+    if (activeStreamIds.length === 0) {
+      return;
+    }
+
+    const streamsData = await this.eventStreamService.getStreamsData(
+      workspaceId,
+      activeStreamIds,
+    );
+
+    const enrichedBatch =
+      await this.enrichMetadataEventBatch(metadataEventBatch);
+
+    const streamIdsToRemove: string[] = [];
+
+    for (const [streamChannelId, streamData] of streamsData) {
+      if (!isDefined(streamData)) {
+        streamIdsToRemove.push(streamChannelId);
+        continue;
+      }
+
+      await this.publishToStream({
+        streamChannelId,
+        metadataEventBatch: enrichedBatch,
+      });
+    }
+
+    await this.eventStreamService.removeFromActiveStreams(
+      workspaceId,
+      streamIdsToRemove,
+    );
+  }
+
+  private async enrichMetadataEventBatch(
+    metadataEventBatch: MetadataEventBatch,
+  ): Promise<MetadataEventBatch> {
+    switch (metadataEventBatch.metadataName) {
+      case 'fieldMetadata':
+        return this.enrichFieldMetadataEventsWithRelations(
+          metadataEventBatch as MetadataEventBatch<'fieldMetadata'>,
+        );
+      case 'navigationMenuItem':
+        return this.enrichNavigationMenuItemEventsWithTargetRecordIdentifier(
+          metadataEventBatch as MetadataEventBatch<'navigationMenuItem'>,
+        );
+      case 'objectMetadata':
+        return this.resolveObjectMetadataStandardOverrides(
+          metadataEventBatch as MetadataEventBatch<'objectMetadata'>,
+        );
+      default:
+        return metadataEventBatch;
+    }
+  }
+
+  private async publishToStream({
+    streamChannelId,
+    metadataEventBatch,
+  }: {
+    streamChannelId: string;
+    metadataEventBatch: MetadataEventBatch;
+  }): Promise<void> {
+    if (!isNonEmptyArray(metadataEventBatch.events)) {
+      return;
+    }
+
+    const metadataEvents = metadataEventBatch.events.map((metadataEvent) => ({
+      ...metadataEvent,
+      updatedCollectionHash: metadataEventBatch.updatedCollectionHash,
+    }));
+
+    const payload: EventStreamPayload = {
+      objectRecordEventsWithQueryIds: [],
+      metadataEvents,
+    };
+
+    await this.subscriptionService.publishToEventStream({
+      workspaceId: metadataEventBatch.workspaceId,
+      eventStreamChannelId: streamChannelId,
+      payload,
+    });
+  }
+
+  private async enrichFieldMetadataEventsWithRelations(
+    metadataEventBatch: MetadataEventBatch<'fieldMetadata'>,
+  ): Promise<MetadataEventBatch<'fieldMetadata'>> {
+    const { flatFieldMetadataMaps, flatObjectMetadataMaps } =
+      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
+        {
+          workspaceId: metadataEventBatch.workspaceId,
+          flatMapsKeys: ['flatFieldMetadataMaps', 'flatObjectMetadataMaps'],
+        },
+      );
+
+    const enrichedEvents = metadataEventBatch.events.map((event) => {
+      if (
+        !('after' in event.properties) ||
+        !isDefined(event.properties.after)
+      ) {
+        return event;
+      }
+
+      const enrichedAfter = enrichFieldMetadataEventWithRelations({
+        record: event.properties.after as Record<string, unknown>,
+        flatFieldMetadataMaps,
+        flatObjectMetadataMaps,
+      });
+
+      return {
+        ...event,
+        properties: {
+          ...event.properties,
+          after: enrichedAfter,
+        },
+      } as typeof event;
+    });
+
+    return { ...metadataEventBatch, events: enrichedEvents };
+  }
+
+  private async enrichNavigationMenuItemEventsWithTargetRecordIdentifier(
+    metadataEventBatch: MetadataEventBatch<'navigationMenuItem'>,
+  ): Promise<MetadataEventBatch<'navigationMenuItem'>> {
+    const enrichedEvents = await Promise.all(
+      metadataEventBatch.events.map(async (event) => {
+        if (
+          !('after' in event.properties) ||
+          !isDefined(event.properties.after)
+        ) {
+          return event;
+        }
+
+        const after = event.properties.after as Record<string, unknown>;
+        const targetRecordId = after.targetRecordId as string | undefined;
+        const targetObjectMetadataId = after.targetObjectMetadataId as
+          | string
+          | undefined;
+
+        if (!isDefined(targetRecordId) || !isDefined(targetObjectMetadataId)) {
+          return event;
+        }
+
+        const targetRecordIdentifier =
+          await this.navigationMenuItemRecordIdentifierService.resolveRecordIdentifier(
+            {
+              targetRecordId,
+              targetObjectMetadataId,
+              workspaceId: metadataEventBatch.workspaceId,
+            },
+          );
+
+        const enrichedAfter: Record<string, unknown> = {
+          ...after,
+          targetRecordIdentifier,
+        };
+
+        return {
+          ...event,
+          properties: {
+            ...event.properties,
+            after: enrichedAfter,
+          },
+        } as typeof event;
+      }),
+    );
+
+    return { ...metadataEventBatch, events: enrichedEvents };
+  }
+
+  private resolveObjectMetadataStandardOverrides(
+    metadataEventBatch: MetadataEventBatch<'objectMetadata'>,
+  ): MetadataEventBatch<'objectMetadata'> {
+    const enrichedEvents = metadataEventBatch.events.map((event) => {
+      const enrichedProperties = { ...event.properties };
+
+      if (
+        'before' in enrichedProperties &&
+        isDefined(enrichedProperties.before)
+      ) {
+        enrichedProperties.before =
+          this.applyStandardOverridesToObjectMetadataRecord(
+            enrichedProperties.before as Record<string, unknown>,
+          ) as typeof enrichedProperties.before;
+      }
+
+      if (
+        'after' in enrichedProperties &&
+        isDefined(enrichedProperties.after)
+      ) {
+        enrichedProperties.after =
+          this.applyStandardOverridesToObjectMetadataRecord(
+            enrichedProperties.after as Record<string, unknown>,
+          ) as typeof enrichedProperties.after;
+      }
+
+      return { ...event, properties: enrichedProperties } as typeof event;
+    });
+
+    return { ...metadataEventBatch, events: enrichedEvents };
+  }
+
+  private applyStandardOverridesToObjectMetadataRecord(
+    record: Record<string, unknown>,
+  ): Record<string, unknown> {
+    const standardOverrides = record.standardOverrides as
+      | Record<string, unknown>
+      | null
+      | undefined;
+
+    if (!isDefined(standardOverrides)) {
+      return record;
+    }
+
+    const resolved = { ...record };
+
+    for (const key of OBJECT_METADATA_STANDARD_OVERRIDES_PROPERTIES) {
+      if (isDefined(standardOverrides[key])) {
+        resolved[key] = standardOverrides[key];
+      }
+    }
+
+    return resolved;
+  }
+}
@@ -6,12 +6,12 @@ import { AllMetadataName } from 'twenty-shared/metadata';
 import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-import { type MetadataEventBatch } from 'src/engine/metadata-event-emitter/types/metadata-event-batch.type';
+import { type MetadataEventBatch } from 'src/engine/subscriptions/metadata-event/types/metadata-event-batch.type';
 import { getMetadataFlatEntityMapsKey } from 'src/engine/metadata-modules/flat-entity/utils/get-metadata-flat-entity-maps-key.util';
 import { CallWebhookJobsForMetadataJob } from 'src/engine/metadata-modules/webhook/jobs/call-webhook-jobs-for-metadata.job';
 import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
 import { type WorkspaceCacheKeyName } from 'src/engine/workspace-cache/types/workspace-cache-key.type';
-import { WorkspaceEventEmitterService } from 'src/engine/workspace-event-emitter/workspace-event-emitter.service';
+import { MetadataEventPublisher } from 'src/engine/subscriptions/metadata-event/metadata-event-publisher';
 import { type AllMetadataEventType } from 'src/engine/workspace-manager/workspace-migration/workspace-migration-runner/types/metadata-event';

@Injectable()
@@ -19,7 +19,7 @@ export class MetadataEventsToDbListener {
  constructor(
    @InjectMessageQueue(MessageQueue.webhookQueue)
    private readonly webhookQueueService: MessageQueueService,
-    private readonly workspaceEventEmitterService: WorkspaceEventEmitterService,
+    private readonly metadataEventPublisher: MetadataEventPublisher,
    private readonly workspaceCacheService: WorkspaceCacheService,
  ) {}

@@ -68,7 +68,7 @@ export class MetadataEventsToDbListener {

      const updatedCollectionHash = cacheHashes[cacheKeyName];

-      await this.workspaceEventEmitterService.publish({
+      await this.metadataEventPublisher.publish({
        ...metadataEventBatch,
        updatedCollectionHash,
      });
@@ -22,8 +22,7 @@ import { type EventStreamData } from 'src/engine/subscriptions/types/event-strea
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
 import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
-import { NavigationMenuItemRecordIdentifierService } from 'src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service';
-import { WorkspaceEventEmitterService } from 'src/engine/workspace-event-emitter/workspace-event-emitter.service';
+import { ObjectRecordEventPublisher } from 'src/engine/subscriptions/object-record-event/object-record-event-publisher';

 jest.mock(
  'src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util',
@@ -70,8 +69,8 @@ const buildFlatFieldMetadataMaps = (
    createEmptyFlatEntityMaps() as FlatEntityMaps<FlatFieldMetadata>,
  );

-describe('WorkspaceEventEmitterService', () => {
-  let service: WorkspaceEventEmitterService;
+describe('ObjectRecordEventPublisher', () => {
+  let service: ObjectRecordEventPublisher;
  let mockSubscriptionService: jest.Mocked<
    Pick<SubscriptionService, 'publish' | 'publishToEventStream'>
  >;
@@ -273,7 +272,7 @@ describe('WorkspaceEventEmitterService', () => {

    const module: TestingModule = await Test.createTestingModule({
      providers: [
-        WorkspaceEventEmitterService,
+        ObjectRecordEventPublisher,
        {
          provide: SubscriptionService,
          useValue: mockSubscriptionService,
@@ -302,19 +301,11 @@ describe('WorkspaceEventEmitterService', () => {
          provide: CommonSelectFieldsHelper,
          useValue: new CommonSelectFieldsHelper(),
        },
-        {
-          provide: NavigationMenuItemRecordIdentifierService,
-          useValue: {
-            enrichNavigationMenuItemEventsWithRecordIdentifiers: jest
-              .fn()
-              .mockResolvedValue(undefined),
-          },
-        },
      ],
    }).compile();

-    service = module.get<WorkspaceEventEmitterService>(
-      WorkspaceEventEmitterService,
+    service = module.get<ObjectRecordEventPublisher>(
+      ObjectRecordEventPublisher,
    );
  });

@@ -13,7 +13,6 @@ import {
 import {
  combineFilters,
  isDefined,
-  isNonEmptyArray,
  isRecordGqlOperationSignature,
 } from 'twenty-shared/utils';
 import { FindOptionsRelations, ObjectLiteral } from 'typeorm';
@@ -25,20 +24,14 @@ import { GraphqlQueryParser } from 'src/engine/api/graphql/graphql-query-runner/
 import { type SerializableAuthContext } from 'src/engine/core-modules/auth/types/auth-context.type';
 import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';
 import { type FlatWorkspaceMemberMaps } from 'src/engine/core-modules/user/types/flat-workspace-member-maps.type';
-import { type MetadataEventBatch } from 'src/engine/metadata-event-emitter/types/metadata-event-batch.type';
-import { OBJECT_METADATA_STANDARD_OVERRIDES_PROPERTIES } from 'src/engine/metadata-modules/object-metadata/constants/object-metadata-standard-overrides-properties.constant';
 import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
 import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
 import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
 import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
 import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-import { NavigationMenuItemRecordIdentifierService } from 'src/engine/metadata-modules/navigation-menu-item/services/navigation-menu-item-record-identifier.service';
-import { enrichFieldMetadataEventWithRelations } from 'src/engine/workspace-event-emitter/utils/enrich-field-metadata-event-with-relations.util';
 import { UserWorkspaceRoleMap } from 'src/engine/metadata-modules/role-target/types/user-workspace-role-map';
 import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';
 import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';
-import { transformEventToWebhookEvent } from 'src/engine/metadata-modules/webhook/utils/transform-event-to-webhook-event';
-import { SubscriptionChannel } from 'src/engine/subscriptions/enums/subscription-channel.enum';
 import { EventStreamService } from 'src/engine/subscriptions/event-stream.service';
 import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';
 import {
@@ -54,8 +47,9 @@ import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/twent
 import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
 import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
 import { parseEventNameOrThrow } from 'src/engine/workspace-event-emitter/utils/parse-event-name';
+
@Injectable()
-export class WorkspaceEventEmitterService {
+export class ObjectRecordEventPublisher {
  constructor(
    private readonly subscriptionService: SubscriptionService,
    private readonly eventStreamService: EventStreamService,
@@ -64,57 +58,12 @@ export class WorkspaceEventEmitterService {
    private readonly workspaceManyOrAllFlatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
    private readonly commonSelectFieldsHelper: CommonSelectFieldsHelper,
-    private readonly navigationMenuItemRecordIdentifierService: NavigationMenuItemRecordIdentifierService,
  ) {}

  async publish(
-    eventBatch: WorkspaceEventBatch<ObjectRecordEvent> | MetadataEventBatch,
-  ): Promise<void> {
-    if (!this.isMetadataEventBatch(eventBatch)) {
-      await this.publishToLegacyChannel(eventBatch);
-    }
-
-    await this.publishToEventStreams(eventBatch);
-  }
-
-  private isMetadataEventBatch(
-    eventBatch: WorkspaceEventBatch<ObjectRecordEvent> | MetadataEventBatch,
-  ): eventBatch is MetadataEventBatch {
-    return 'metadataName' in eventBatch;
-  }
-
-  private async publishToLegacyChannel(
    eventBatch: WorkspaceEventBatch<ObjectRecordEvent>,
-  ): Promise<void> {
-    const [nameSingular, operation] = eventBatch.name.split('.');
-
-    for (const eventData of eventBatch.events) {
-      const { record, updatedFields } = transformEventToWebhookEvent({
-        eventName: eventBatch.name,
-        event: eventData,
-      });
-
-      const event = {
-        action: operation,
-        objectNameSingular: nameSingular,
-        eventDate: new Date(),
-        record,
-        ...(updatedFields && { updatedFields }),
-      };
-
-      await this.subscriptionService.publish({
-        channel: SubscriptionChannel.DATABASE_EVENT_CHANNEL,
-        workspaceId: eventBatch.workspaceId,
-        payload: { onDbEvent: event },
-      });
-    }
-  }
-
-  private async publishToEventStreams(
-    eventBatch: WorkspaceEventBatch<ObjectRecordEvent> | MetadataEventBatch,
  ): Promise<void> {
    const workspaceId = eventBatch.workspaceId;
-    const isMetadata = this.isMetadataEventBatch(eventBatch);

    const activeStreamIds =
      await this.eventStreamService.getActiveStreamIds(workspaceId);
@@ -128,53 +77,28 @@ export class WorkspaceEventEmitterService {
      activeStreamIds,
    );

+    const { permissionsContext, flatWorkspaceMemberMaps } =
+      await this.fetchObjectRecordStreamContext(workspaceId);
+
    const streamIdsToRemove: string[] = [];

-    const objectRecordStreamContext = !isMetadata
-      ? await this.fetchObjectRecordStreamContext(workspaceId)
-      : undefined;
-
-    const enrichedMetadataEventBatch = isMetadata
-      ? await this.enrichFieldMetadataEventsWithRelations(
-          eventBatch as MetadataEventBatch,
-        )
-          .then((batch) =>
-            this.enrichNavigationMenuItemEventsWithTargetRecordIdentifier(
-              batch,
-            ),
-          )
-          .then((batch) => this.resolveObjectMetadataStandardOverrides(batch))
-      : undefined;
-
    for (const [streamChannelId, streamData] of streamsData) {
      if (!isDefined(streamData)) {
        streamIdsToRemove.push(streamChannelId);
        continue;
      }

-      if (isMetadata && isDefined(enrichedMetadataEventBatch)) {
-        await this.processMetadataStreamEvents(
-          streamChannelId,
-          streamData,
-          enrichedMetadataEventBatch,
-        );
-      } else if (!isMetadata) {
-        if (Object.keys(streamData.queries).length === 0) {
-          continue;
-        }
-
-        if (!isDefined(objectRecordStreamContext)) {
-          continue;
-        }
-
-        await this.processObjectRecordStreamEvents(
-          streamChannelId,
-          streamData,
-          eventBatch as WorkspaceEventBatch<ObjectRecordEvent>,
-          objectRecordStreamContext.permissionsContext,
-          objectRecordStreamContext.flatWorkspaceMemberMaps,
-        );
+      if (Object.keys(streamData.queries).length === 0) {
+        continue;
      }
+
+      await this.processObjectRecordStreamEvents({
+        streamChannelId,
+        streamData,
+        workspaceEventBatch: eventBatch,
+        permissionsContext,
+        flatWorkspaceMemberMaps,
+      });
    }

    await this.eventStreamService.removeFromActiveStreams(
@@ -193,198 +117,25 @@ export class WorkspaceEventEmitterService {
    return { permissionsContext, flatWorkspaceMemberMaps };
  }

-  private async processMetadataStreamEvents(
-    streamChannelId: string,
-    _streamData: EventStreamData,
-    metadataEventBatch: MetadataEventBatch,
-  ): Promise<void> {
-    if (!isNonEmptyArray(metadataEventBatch.events)) {
-      return;
-    }
-
-    const metadataEvents = metadataEventBatch.events.map((metadataEvent) => ({
-      ...metadataEvent,
-      updatedCollectionHash: metadataEventBatch.updatedCollectionHash,
-    }));
-
-    const payload: EventStreamPayload = {
-      objectRecordEventsWithQueryIds: [],
-      metadataEvents,
-    };
-
-    await this.subscriptionService.publishToEventStream({
-      workspaceId: metadataEventBatch.workspaceId,
-      eventStreamChannelId: streamChannelId,
-      payload,
-    });
-  }
-
-  private async enrichFieldMetadataEventsWithRelations(
-    metadataEventBatch: MetadataEventBatch,
-  ): Promise<MetadataEventBatch> {
-    if (metadataEventBatch.metadataName !== 'fieldMetadata') {
-      return metadataEventBatch;
-    }
-
-    const { flatFieldMetadataMaps, flatObjectMetadataMaps } =
-      await this.workspaceManyOrAllFlatEntityMapsCacheService.getOrRecomputeManyOrAllFlatEntityMaps(
-        {
-          workspaceId: metadataEventBatch.workspaceId,
-          flatMapsKeys: ['flatFieldMetadataMaps', 'flatObjectMetadataMaps'],
-        },
-      );
-
-    const enrichedEvents = metadataEventBatch.events.map((event) => {
-      if (
-        !('after' in event.properties) ||
-        !isDefined(event.properties.after)
-      ) {
-        return event;
-      }
-
-      const enrichedAfter = enrichFieldMetadataEventWithRelations({
-        record: event.properties.after as Record<string, unknown>,
-        flatFieldMetadataMaps,
-        flatObjectMetadataMaps,
-      });
-
-      return {
-        ...event,
-        properties: {
-          ...event.properties,
-          after: enrichedAfter,
-        },
-      } as typeof event;
-    });
-
-    return { ...metadataEventBatch, events: enrichedEvents };
-  }
-
-  private async enrichNavigationMenuItemEventsWithTargetRecordIdentifier(
-    metadataEventBatch: MetadataEventBatch,
-  ): Promise<MetadataEventBatch> {
-    if (metadataEventBatch.metadataName !== 'navigationMenuItem') {
-      return metadataEventBatch;
-    }
-
-    const enrichedEvents = await Promise.all(
-      metadataEventBatch.events.map(async (event) => {
-        if (
-          !('after' in event.properties) ||
-          !isDefined(event.properties.after)
-        ) {
-          return event;
-        }
-
-        const after = event.properties.after as Record<string, unknown>;
-        const targetRecordId = after.targetRecordId as string | undefined;
-        const targetObjectMetadataId = after.targetObjectMetadataId as
-          | string
-          | undefined;
-
-        if (!isDefined(targetRecordId) || !isDefined(targetObjectMetadataId)) {
-          return event;
-        }
-
-        const targetRecordIdentifier =
-          await this.navigationMenuItemRecordIdentifierService.resolveRecordIdentifier(
-            {
-              targetRecordId,
-              targetObjectMetadataId,
-              workspaceId: metadataEventBatch.workspaceId,
-            },
-          );
-
-        const enrichedAfter: Record<string, unknown> = {
-          ...after,
-          targetRecordIdentifier,
-        };
-
-        return {
-          ...event,
-          properties: {
-            ...event.properties,
-            after: enrichedAfter,
-          },
-        } as typeof event;
-      }),
-    );
-
-    return { ...metadataEventBatch, events: enrichedEvents };
-  }
-
-  private resolveObjectMetadataStandardOverrides(
-    metadataEventBatch: MetadataEventBatch,
-  ): MetadataEventBatch {
-    if (metadataEventBatch.metadataName !== 'objectMetadata') {
-      return metadataEventBatch;
-    }
-
-    const enrichedEvents = metadataEventBatch.events.map((event) => {
-      const enrichedProperties = { ...event.properties };
-
-      if (
-        'before' in enrichedProperties &&
-        isDefined(enrichedProperties.before)
-      ) {
-        enrichedProperties.before =
-          this.applyStandardOverridesToObjectMetadataRecord(
-            enrichedProperties.before as Record<string, unknown>,
-          ) as typeof enrichedProperties.before;
-      }
-
-      if (
-        'after' in enrichedProperties &&
-        isDefined(enrichedProperties.after)
-      ) {
-        enrichedProperties.after =
-          this.applyStandardOverridesToObjectMetadataRecord(
-            enrichedProperties.after as Record<string, unknown>,
-          ) as typeof enrichedProperties.after;
-      }
-
-      return { ...event, properties: enrichedProperties } as typeof event;
-    });
-
-    return { ...metadataEventBatch, events: enrichedEvents };
-  }
-
-  private applyStandardOverridesToObjectMetadataRecord(
-    record: Record<string, unknown>,
-  ): Record<string, unknown> {
-    const standardOverrides = record.standardOverrides as
-      | Record<string, unknown>
-      | null
-      | undefined;
-
-    if (!isDefined(standardOverrides)) {
-      return record;
-    }
-
-    const resolved = { ...record };
-
-    for (const key of OBJECT_METADATA_STANDARD_OVERRIDES_PROPERTIES) {
-      if (isDefined(standardOverrides[key])) {
-        resolved[key] = standardOverrides[key];
-      }
-    }
-
-    return resolved;
-  }
-
-  private async processObjectRecordStreamEvents(
-    streamChannelId: string,
-    streamData: EventStreamData,
-    workspaceEventBatch: WorkspaceEventBatch<ObjectRecordEvent>,
+  private async processObjectRecordStreamEvents({
+    streamChannelId,
+    streamData,
+    workspaceEventBatch,
+    permissionsContext,
+    flatWorkspaceMemberMaps,
+  }: {
+    streamChannelId: string;
+    streamData: EventStreamData;
+    workspaceEventBatch: WorkspaceEventBatch<ObjectRecordEvent>;
    permissionsContext: {
      flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;
      flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;
      flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
      userWorkspaceRoleMap: Record<string, string>;
      rolesPermissions: ObjectsPermissionsByRoleId;
-    },
-    flatWorkspaceMemberMaps: FlatWorkspaceMemberMaps,
-  ): Promise<void> {
+    };
+    flatWorkspaceMemberMaps: FlatWorkspaceMemberMaps;
+  }): Promise<void> {
    const { userWorkspaceId } = streamData.authContext;

    if (!isDefined(userWorkspaceId)) {
@@ -470,7 +221,9 @@ export class WorkspaceEventEmitterService {
    if (matchedEvents.length > 0) {
      await this.enrichEventBatchWithNestedRelations({
        objectMetadata: workspaceEventBatch.objectMetadata,
-        events: matchedEvents.map((e) => e.objectRecordEvent),
+        events: matchedEvents.map(
+          (matchedEvent) => matchedEvent.objectRecordEvent,
+        ),
        streamData,
        permissionsContext,
        workspaceId: workspaceEventBatch.workspaceId,
@@ -1,14 +1,26 @@
-import { Module } from '@nestjs/common';
+import { Global, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';

+import { ProcessNestedRelationsV2Helper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations-v2.helper';
+import { ProcessNestedRelationsHelper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper';
+import { CommonSelectFieldsHelper } from 'src/engine/api/common/common-select-fields/common-select-fields-helper';
 import { CacheLockModule } from 'src/engine/core-modules/cache-lock/cache-lock.module';
 import { CacheStorageModule } from 'src/engine/core-modules/cache-storage/cache-storage.module';
 import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
 import { RedisClientModule } from 'src/engine/core-modules/redis-client/redis-client.module';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
+import { NavigationMenuItemModule } from 'src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.module';
+import { EventStreamResolver } from 'src/engine/subscriptions/event-stream.resolver';
 import { EventStreamService } from 'src/engine/subscriptions/event-stream.service';
+import { MetadataEventEmitter } from 'src/engine/subscriptions/metadata-event/metadata-event-emitter';
+import { MetadataEventPublisher } from 'src/engine/subscriptions/metadata-event/metadata-event-publisher';
+import { MetadataEventsToDbListener } from 'src/engine/subscriptions/metadata-event/metadata-events-to-db.listener';
+import { ObjectRecordEventPublisher } from 'src/engine/subscriptions/object-record-event/object-record-event-publisher';
 import { SubscriptionService } from 'src/engine/subscriptions/subscription.service';
+import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';

+@Global()
@Module({
  imports: [
    RedisClientModule,
@@ -16,8 +28,26 @@ import { SubscriptionService } from 'src/engine/subscriptions/subscription.servi
    CacheLockModule,
    MetricsModule,
    TypeOrmModule.forFeature([WorkspaceEntity]),
+    WorkspaceCacheModule,
+    WorkspaceManyOrAllFlatEntityMapsCacheModule,
+    NavigationMenuItemModule,
+  ],
+  providers: [
+    SubscriptionService,
+    EventStreamService,
+    EventStreamResolver,
+    ObjectRecordEventPublisher,
+    MetadataEventPublisher,
+    MetadataEventEmitter,
+    MetadataEventsToDbListener,
+    ProcessNestedRelationsHelper,
+    ProcessNestedRelationsV2Helper,
+    CommonSelectFieldsHelper,
+  ],
+  exports: [
+    SubscriptionService,
+    ObjectRecordEventPublisher,
+    MetadataEventEmitter,
  ],
-  providers: [SubscriptionService, EventStreamService],
-  exports: [SubscriptionService, EventStreamService],
 })
 export class SubscriptionsModule {}
@@ -0,0 +1,59 @@
+import { transformEnumValue } from 'src/engine/utils/transform-enum-value';
+
+describe('transformEnumValue', () => {
+  it('should return undefined when options is undefined', () => {
+    expect(transformEnumValue(undefined)).toBeUndefined();
+  });
+
+  it('should prefix option values starting with a digit', () => {
+    const options = [
+      { value: '1_OPTION', label: 'Option 1', color: 'green' as const },
+      { value: 'OPTION_2', label: 'Option 2', color: 'blue' as const },
+    ];
+
+    const result = transformEnumValue(options);
+
+    expect(result).toEqual([
+      { value: '_1_OPTION', label: 'Option 1', color: 'green' },
+      { value: 'OPTION_2', label: 'Option 2', color: 'blue' },
+    ]);
+  });
+
+  it('should parse and transform options passed as a JSON string', () => {
+    const options = JSON.stringify([
+      { value: 'STARTUP', label: 'Startup', color: 'green' },
+      { value: 'SME', label: 'SME', color: 'turquoise' },
+    ]);
+
+    const result = transformEnumValue(options);
+
+    expect(result).toEqual([
+      { value: 'STARTUP', label: 'Startup', color: 'green' },
+      { value: 'SME', label: 'SME', color: 'turquoise' },
+    ]);
+  });
+
+  it('should prefix digit-starting values in JSON string options', () => {
+    const options = JSON.stringify([
+      { value: '3RD_PARTY', label: '3rd Party', color: 'red' },
+    ]);
+
+    const result = transformEnumValue(options);
+
+    expect(result).toEqual([
+      { value: '_3RD_PARTY', label: '3rd Party', color: 'red' },
+    ]);
+  });
+
+  it('should return options unchanged when no values start with a digit', () => {
+    const options = [
+      { value: 'STARTUP', label: 'Startup', color: 'green' as const },
+    ];
+
+    const result = transformEnumValue(options);
+
+    expect(result).toEqual([
+      { value: 'STARTUP', label: 'Startup', color: 'green' },
+    ]);
+  });
+});
@@ -1,7 +1,20 @@
 import { type FieldMetadataDefaultOption } from 'src/engine/metadata-modules/field-metadata/dtos/options.input';

-export function transformEnumValue(options?: FieldMetadataDefaultOption[]) {
-  return options?.map((option) => {
+export function transformEnumValue(
+  options?: FieldMetadataDefaultOption[] | string,
+) {
+  if (!options) {
+    return options;
+  }
+
+  const parsedOptions =
+    typeof options === 'string' ? JSON.parse(options) : options;
+
+  if (!Array.isArray(parsedOptions)) {
+    return parsedOptions;
+  }
+
+  return parsedOptions.map((option: FieldMetadataDefaultOption) => {
    if (/^\d/.test(option.value)) {
      return {
        ...option,
@@ -1,512 +0,0 @@
-import { isMetadataRecordMatchingFilter } from 'src/engine/workspace-event-emitter/utils/is-metadata-record-matching-filter.util';
-
-const record = {
-  id: '1',
-  name: 'Test Object',
-  label: 'testObject',
-  isActive: true,
-  count: 42,
-};
-
-describe('isMetadataRecordMatchingFilter', () => {
-  describe('empty filters', () => {
-    it('should match any record when filter is empty', () => {
-      expect(isMetadataRecordMatchingFilter({ record, filter: {} })).toBe(true);
-    });
-  });
-
-  describe('and filter', () => {
-    it('should match when all sub-filters match', () => {
-      const filter = {
-        and: [{ name: { eq: 'Test Object' } }, { isActive: { eq: true } }],
-      };
-
-      expect(isMetadataRecordMatchingFilter({ record, filter })).toBe(true);
-    });
-
-    it('should not match when any sub-filter fails', () => {
-      const filter = {
-        and: [{ name: { eq: 'Test Object' } }, { isActive: { eq: false } }],
-      };
-
-      expect(isMetadataRecordMatchingFilter({ record, filter })).toBe(false);
-    });
-
-    it('should match when and array is empty', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { and: [] },
-        }),
-      ).toBe(true);
-    });
-
-    it('should throw when and value is not an array', () => {
-      expect(() =>
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { and: 'invalid' } as any,
-        }),
-      ).toThrow('Unexpected value for "and" filter');
-    });
-  });
-
-  describe('or filter', () => {
-    it('should match when any sub-filter matches', () => {
-      const filter = {
-        or: [{ name: { eq: 'Wrong Name' } }, { name: { eq: 'Test Object' } }],
-      };
-
-      expect(isMetadataRecordMatchingFilter({ record, filter })).toBe(true);
-    });
-
-    it('should not match when no sub-filter matches', () => {
-      const filter = {
-        or: [{ name: { eq: 'Wrong' } }, { name: { eq: 'Also Wrong' } }],
-      };
-
-      expect(isMetadataRecordMatchingFilter({ record, filter })).toBe(false);
-    });
-
-    it('should match when or array is empty', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { or: [] },
-        }),
-      ).toBe(true);
-    });
-
-    it('should treat or with an object as an and', () => {
-      const filter = {
-        or: { name: { eq: 'Test Object' } },
-      };
-
-      expect(isMetadataRecordMatchingFilter({ record, filter })).toBe(true);
-    });
-
-    it('should throw when or value is neither array nor object', () => {
-      expect(() =>
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { or: 'invalid' } as any,
-        }),
-      ).toThrow('Unexpected value for "or" filter');
-    });
-  });
-
-  describe('not filter', () => {
-    it('should negate a matching filter', () => {
-      const filter = { not: { name: { eq: 'Test Object' } } };
-
-      expect(isMetadataRecordMatchingFilter({ record, filter })).toBe(false);
-    });
-
-    it('should negate a non-matching filter', () => {
-      const filter = { not: { name: { eq: 'Wrong' } } };
-
-      expect(isMetadataRecordMatchingFilter({ record, filter })).toBe(true);
-    });
-
-    it('should match when not contains an empty object', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { not: {} },
-        }),
-      ).toBe(true);
-    });
-  });
-
-  describe('implicit and (multi-key filter)', () => {
-    it('should treat multiple keys as an implicit AND', () => {
-      const filter = {
-        name: { eq: 'Test Object' },
-        isActive: { eq: true },
-      };
-
-      expect(isMetadataRecordMatchingFilter({ record, filter })).toBe(true);
-    });
-
-    it('should fail if any key in implicit AND does not match', () => {
-      const filter = {
-        name: { eq: 'Test Object' },
-        isActive: { eq: false },
-      };
-
-      expect(isMetadataRecordMatchingFilter({ record, filter })).toBe(false);
-    });
-  });
-
-  describe('eq operator', () => {
-    it('should match equal string values', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { eq: 'Test Object' } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should not match different string values', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { eq: 'Other' } },
-        }),
-      ).toBe(false);
-    });
-
-    it('should match equal boolean values', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { isActive: { eq: true } },
-        }),
-      ).toBe(true);
-    });
-  });
-
-  describe('neq operator', () => {
-    it('should match when values are different', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { neq: 'Other' } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should not match when values are equal', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { neq: 'Test Object' } },
-        }),
-      ).toBe(false);
-    });
-  });
-
-  describe('in operator', () => {
-    it('should match when value is in the array', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { in: ['Test Object', 'Other'] } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should not match when value is not in the array', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { in: ['A', 'B'] } },
-        }),
-      ).toBe(false);
-    });
-
-    it('should return false when in value is not an array', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { in: 'not-array' } } as any,
-        }),
-      ).toBe(false);
-    });
-  });
-
-  describe('is operator', () => {
-    it('should match NULL for undefined values', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record: { ...record, optional: undefined },
-          filter: { optional: { is: 'NULL' } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should not match NULL for defined values', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { is: 'NULL' } },
-        }),
-      ).toBe(false);
-    });
-
-    it('should match NOT_NULL for defined values', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { is: 'NOT_NULL' } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should not match NOT_NULL for undefined values', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record: { ...record, optional: undefined },
-          filter: { optional: { is: 'NOT_NULL' } },
-        }),
-      ).toBe(false);
-    });
-  });
-
-  describe('like operator', () => {
-    it('should match with wildcard prefix', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { like: '%Object' } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should match with wildcard suffix', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { like: 'Test%' } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should match with wildcards on both sides', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { like: '%est Obj%' } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should not match when pattern does not match', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { like: 'wrong%' } },
-        }),
-      ).toBe(false);
-    });
-
-    it('should escape regex special characters in pattern', () => {
-      const specialRecord = { ...record, name: 'foo.bar' };
-
-      expect(
-        isMetadataRecordMatchingFilter({
-          record: specialRecord,
-          filter: { name: { like: 'foo.bar' } },
-        }),
-      ).toBe(true);
-
-      // A dot in the pattern should NOT match any character
-      expect(
-        isMetadataRecordMatchingFilter({
-          record: { ...record, name: 'fooXbar' },
-          filter: { name: { like: 'foo.bar' } },
-        }),
-      ).toBe(false);
-    });
-
-    it('should return false for non-string values', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { count: { like: '42' } },
-        }),
-      ).toBe(false);
-    });
-  });
-
-  describe('ilike operator', () => {
-    it('should match case-insensitively', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { ilike: '%test object%' } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should escape regex special characters', () => {
-      const specialRecord = { ...record, name: 'foo(bar)' };
-
-      expect(
-        isMetadataRecordMatchingFilter({
-          record: specialRecord,
-          filter: { name: { ilike: 'FOO(BAR)' } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should return false for non-string values', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { count: { ilike: '42' } },
-        }),
-      ).toBe(false);
-    });
-  });
-
-  describe('gt operator', () => {
-    it('should match when value is greater', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { count: { gt: 40 } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should not match when value is equal', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { count: { gt: 42 } },
-        }),
-      ).toBe(false);
-    });
-
-    it('should not match when value is less', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { count: { gt: 50 } },
-        }),
-      ).toBe(false);
-    });
-  });
-
-  describe('gte operator', () => {
-    it('should match when value is greater or equal', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { count: { gte: 42 } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should not match when value is less', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { count: { gte: 43 } },
-        }),
-      ).toBe(false);
-    });
-  });
-
-  describe('lt operator', () => {
-    it('should match when value is less', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { count: { lt: 50 } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should not match when value is equal', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { count: { lt: 42 } },
-        }),
-      ).toBe(false);
-    });
-  });
-
-  describe('lte operator', () => {
-    it('should match when value is less or equal', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { count: { lte: 42 } },
-        }),
-      ).toBe(true);
-    });
-
-    it('should not match when value is greater', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { count: { lte: 41 } },
-        }),
-      ).toBe(false);
-    });
-  });
-
-  describe('unknown operator', () => {
-    it('should throw for unsupported operators', () => {
-      expect(() =>
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: { unknownOp: 'value' } } as any,
-        }),
-      ).toThrow('Unsupported filter operator');
-    });
-  });
-
-  describe('nested logical operators', () => {
-    it('should handle deeply nested and/or/not', () => {
-      const filter = {
-        and: [
-          {
-            or: [
-              { name: { eq: 'Wrong' } },
-              { not: { isActive: { eq: false } } },
-            ],
-          },
-          { count: { gte: 40 } },
-        ],
-      };
-
-      expect(isMetadataRecordMatchingFilter({ record, filter })).toBe(true);
-    });
-
-    it('should handle not with nested and', () => {
-      const filter = {
-        not: {
-          and: [{ name: { eq: 'Test Object' } }, { count: { gt: 100 } }],
-        },
-      };
-
-      // name matches but count > 100 fails, so AND = false, NOT = true
-      expect(isMetadataRecordMatchingFilter({ record, filter })).toBe(true);
-    });
-  });
-
-  describe('edge cases', () => {
-    it('should skip non-object field filters', () => {
-      // When fieldFilter is a primitive, it is skipped (returns true)
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: 'Test Object' },
-        }),
-      ).toBe(true);
-    });
-
-    it('should skip undefined field filters', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record,
-          filter: { name: undefined },
-        }),
-      ).toBe(true);
-    });
-
-    it('should handle records with missing fields', () => {
-      expect(
-        isMetadataRecordMatchingFilter({
-          record: { id: '1' },
-          filter: { name: { eq: 'Test' } },
-        }),
-      ).toBe(false);
-    });
-  });
-});
@@ -1,198 +0,0 @@
-import { isObject } from '@sniptt/guards';
-import { isDefined } from 'twenty-shared/utils';
-
-type MetadataFilter = Record<string, unknown>;
-
-type MetadataScalarFilter = {
-  is?: 'NULL' | 'NOT_NULL';
-  eq?: unknown;
-  neq?: unknown;
-  in?: unknown[];
-  like?: string;
-  ilike?: string;
-  gt?: number;
-  gte?: number;
-  lt?: number;
-  lte?: number;
-};
-
-const isEmptyFilter = (filter: MetadataFilter): boolean =>
-  Object.keys(filter).length === 0;
-
-const isAndFilter = (filter: MetadataFilter): boolean =>
-  'and' in filter && isDefined(filter.and);
-
-const isOrFilter = (filter: MetadataFilter): boolean =>
-  'or' in filter && isDefined(filter.or);
-
-const isNotFilter = (filter: MetadataFilter): boolean =>
-  'not' in filter && isDefined(filter.not);
-
-const isImplicitAndFilter = (filter: MetadataFilter): boolean =>
-  Object.keys(filter).length > 1;
-
-const escapeRegExp = (str: string): string =>
-  str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-
-export const isMetadataRecordMatchingFilter = ({
-  record,
-  filter,
-}: {
-  record: Record<string, unknown>;
-  filter: MetadataFilter;
-}): boolean => {
-  if (isEmptyFilter(filter)) {
-    return true;
-  }
-
-  if (isImplicitAndFilter(filter)) {
-    return Object.entries(filter).every(([key, value]) =>
-      isMetadataRecordMatchingFilter({
-        record,
-        filter: { [key]: value },
-      }),
-    );
-  }
-
-  if (isAndFilter(filter)) {
-    const andValue = filter.and;
-
-    if (!Array.isArray(andValue)) {
-      throw new Error(
-        'Unexpected value for "and" filter: ' + JSON.stringify(andValue),
-      );
-    }
-
-    return (
-      andValue.length === 0 ||
-      andValue.every((subFilter: MetadataFilter) =>
-        isMetadataRecordMatchingFilter({ record, filter: subFilter }),
-      )
-    );
-  }
-
-  if (isOrFilter(filter)) {
-    const orValue = filter.or;
-
-    if (Array.isArray(orValue)) {
-      return (
-        orValue.length === 0 ||
-        orValue.some((subFilter: MetadataFilter) =>
-          isMetadataRecordMatchingFilter({ record, filter: subFilter }),
-        )
-      );
-    }
-
-    if (isObject(orValue)) {
-      return isMetadataRecordMatchingFilter({
-        record,
-        filter: orValue as MetadataFilter,
-      });
-    }
-
-    throw new Error(
-      'Unexpected value for "or" filter: ' + JSON.stringify(orValue),
-    );
-  }
-
-  if (isNotFilter(filter)) {
-    const notValue = filter.not;
-
-    if (isObject(notValue) && isEmptyFilter(notValue as MetadataFilter)) {
-      return true;
-    }
-
-    return !isMetadataRecordMatchingFilter({
-      record,
-      filter: notValue as MetadataFilter,
-    });
-  }
-
-  return Object.entries(filter).every(([fieldName, fieldFilter]) => {
-    if (!isDefined(fieldFilter) || !isObject(fieldFilter)) {
-      return true;
-    }
-
-    const recordValue = record[fieldName];
-
-    return isScalarValueMatchingFilter(
-      recordValue,
-      fieldFilter as MetadataScalarFilter,
-    );
-  });
-};
-
-const isScalarValueMatchingFilter = (
-  value: unknown,
-  fieldFilter: MetadataScalarFilter,
-): boolean => {
-  if ('is' in fieldFilter) {
-    if (fieldFilter.is === 'NULL') {
-      return !isDefined(value);
-    }
-
-    return isDefined(value);
-  }
-
-  if ('eq' in fieldFilter) {
-    return value === fieldFilter.eq;
-  }
-
-  if ('neq' in fieldFilter) {
-    return value !== fieldFilter.neq;
-  }
-
-  if ('in' in fieldFilter) {
-    if (!Array.isArray(fieldFilter.in)) {
-      return false;
-    }
-
-    return fieldFilter.in.includes(value);
-  }
-
-  if ('like' in fieldFilter) {
-    if (typeof value !== 'string') {
-      return false;
-    }
-
-    const pattern = String(fieldFilter.like)
-      .split('%')
-      .map(escapeRegExp)
-      .join('.*');
-
-    return new RegExp(`^${pattern}$`).test(value);
-  }
-
-  if ('ilike' in fieldFilter) {
-    if (typeof value !== 'string') {
-      return false;
-    }
-
-    const pattern = String(fieldFilter.ilike)
-      .split('%')
-      .map(escapeRegExp)
-      .join('.*');
-
-    return new RegExp(`^${pattern}$`, 'i').test(value);
-  }
-
-  if ('gt' in fieldFilter) {
-    return isDefined(value) && (value as number) > (fieldFilter.gt as number);
-  }
-
-  if ('gte' in fieldFilter) {
-    return isDefined(value) && (value as number) >= (fieldFilter.gte as number);
-  }
-
-  if ('lt' in fieldFilter) {
-    return isDefined(value) && (value as number) < (fieldFilter.lt as number);
-  }
-
-  if ('lte' in fieldFilter) {
-    return isDefined(value) && (value as number) <= (fieldFilter.lte as number);
-  }
-
-  throw new Error(
-    'Unsupported filter operator: ' + JSON.stringify(fieldFilter),
-  );
-};
@@ -1,32 +1,10 @@
 import { Global, Module } from '@nestjs/common';

-import { ProcessNestedRelationsV2Helper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations-v2.helper';
-import { ProcessNestedRelationsHelper } from 'src/engine/api/common/common-nested-relations-processor/process-nested-relations.helper';
-import { CommonSelectFieldsHelper } from 'src/engine/api/common/common-select-fields/common-select-fields-helper';
-import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';
-import { NavigationMenuItemModule } from 'src/engine/metadata-modules/navigation-menu-item/navigation-menu-item.module';
-import { SubscriptionsModule } from 'src/engine/subscriptions/subscriptions.module';
-import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
 import { WorkspaceEventEmitter } from 'src/engine/workspace-event-emitter/workspace-event-emitter';
-import { WorkspaceEventEmitterResolver } from 'src/engine/workspace-event-emitter/workspace-event-emitter.resolver';
-import { WorkspaceEventEmitterService } from 'src/engine/workspace-event-emitter/workspace-event-emitter.service';

@Global()
@Module({
-  imports: [
-    SubscriptionsModule,
-    WorkspaceCacheModule,
-    WorkspaceManyOrAllFlatEntityMapsCacheModule,
-    NavigationMenuItemModule,
-  ],
-  providers: [
-    WorkspaceEventEmitter,
-    WorkspaceEventEmitterService,
-    WorkspaceEventEmitterResolver,
-    ProcessNestedRelationsHelper,
-    ProcessNestedRelationsV2Helper,
-    CommonSelectFieldsHelper,
-  ],
-  exports: [WorkspaceEventEmitter, WorkspaceEventEmitterService],
+  providers: [WorkspaceEventEmitter],
+  exports: [WorkspaceEventEmitter],
 })
 export class WorkspaceEventEmitterModule {}
@@ -8,7 +8,7 @@ import { isDefined } from 'twenty-shared/utils';

 import { FlatApplicationCacheMaps } from 'src/engine/core-modules/application/types/flat-application-cache-maps.type';
 import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
-import { MetadataEventEmitter } from 'src/engine/metadata-event-emitter/metadata-event-emitter';
+import { MetadataEventEmitter } from 'src/engine/subscriptions/metadata-event/metadata-event-emitter';
 import { ALL_MANY_TO_ONE_METADATA_RELATIONS } from 'src/engine/metadata-modules/flat-entity/constant/all-many-to-one-metadata-relations.constant';
 import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
 import {
@@ -102,14 +102,14 @@ __metadata:
  linkType: hard

 "@ai-sdk/mistral@npm:^3.0.20":
-  version: 3.0.20
-  resolution: "@ai-sdk/mistral@npm:3.0.20"
+  version: 3.0.25
+  resolution: "@ai-sdk/mistral@npm:3.0.25"
  dependencies:
    "@ai-sdk/provider": "npm:3.0.8"
-    "@ai-sdk/provider-utils": "npm:4.0.15"
+    "@ai-sdk/provider-utils": "npm:4.0.20"
  peerDependencies:
    zod: ^3.25.76 || ^4.1.8
-  checksum: 10c0/32caf651dae8a0fb7b7faceb8706e711404a32bc21aea94fe6bcbbe6adb09c31fc6563efd28547bdcbbfe99165145ec73fe83f4b54bd75f290b6020cc9834bc7
+  checksum: 10c0/4ea732fc807e9e8f143ecbc3168e103dbb0c43f611ab9d9fdfe532510059c18aa8b44a61c7eafda4d9a91977e7d83fa94022c4aa39be21ad035b186f8471384f
  languageName: node
  linkType: hard

@@ -163,6 +163,19 @@ __metadata:
  languageName: node
  linkType: hard

+"@ai-sdk/provider-utils@npm:4.0.20":
+  version: 4.0.20
+  resolution: "@ai-sdk/provider-utils@npm:4.0.20"
+  dependencies:
+    "@ai-sdk/provider": "npm:3.0.8"
+    "@standard-schema/spec": "npm:^1.1.0"
+    eventsource-parser: "npm:^3.0.6"
+  peerDependencies:
+    zod: ^3.25.76 || ^4.1.8
+  checksum: 10c0/749d9f91b2b098f716246bbb92a801d0f8a952fed4481e48b7d36a1c026cfe96b9d956f34b95270bc4628048ad57edd7b19026c167e8ded288e741aa289d4cdd
+  languageName: node
+  linkType: hard
+
 "@ai-sdk/provider@npm:2.0.1":
  version: 2.0.1
  resolution: "@ai-sdk/provider@npm:2.0.1"
@@ -4117,16 +4130,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@dagrejs/dagre@npm:^1.1.2":
-  version: 1.1.3
-  resolution: "@dagrejs/dagre@npm:1.1.3"
-  dependencies:
-    "@dagrejs/graphlib": "npm:2.2.2"
-  checksum: 10c0/c81e142ed55d23bda02968624bd96987eeb545dbc860b0dc22aafd606f8bd8b1b18914e2b986c46e3250a6cfcc2bc16a944bb8df301da9adffd738936679db44
-  languageName: node
-  linkType: hard
-
-"@dagrejs/dagre@npm:^1.1.8":
+"@dagrejs/dagre@npm:^1.1.2, @dagrejs/dagre@npm:^1.1.8":
  version: 1.1.8
  resolution: "@dagrejs/dagre@npm:1.1.8"
  dependencies:
@@ -4135,13 +4139,6 @@ __metadata:
  languageName: node
  linkType: hard

-"@dagrejs/graphlib@npm:2.2.2":
-  version: 2.2.2
-  resolution: "@dagrejs/graphlib@npm:2.2.2"
-  checksum: 10c0/2e79a4f5c6c402054b7ef42e786459645495934476170999f13867a55a00072636a23914772cce6bc03ce51eef70de589058860b8f034c1d70804fb61e01fcfc
-  languageName: node
-  linkType: hard
-
 "@dagrejs/graphlib@npm:2.2.4":
  version: 2.2.4
  resolution: "@dagrejs/graphlib@npm:2.2.4"
@@ -46875,14 +46872,14 @@ __metadata:
  languageName: node
  linkType: hard

-"nodemailer@npm:7.0.11, nodemailer@npm:^7.0.11":
+"nodemailer@npm:7.0.11":
  version: 7.0.11
  resolution: "nodemailer@npm:7.0.11"
  checksum: 10c0/208f108fdb4c5dd0e3a2f013578d53dad505cf1b9c7a084f6d22fc9d6f3912daafb4a23793ca568ff848afc35f15f4eb24382d3f6f9fb8ede4a8410d4ca63618
  languageName: node
  linkType: hard

-"nodemailer@npm:7.0.13":
+"nodemailer@npm:7.0.13, nodemailer@npm:^7.0.11":
  version: 7.0.13
  resolution: "nodemailer@npm:7.0.13"
  checksum: 10c0/b26aa5b9fa4a033bbc1e1c16ef75ee2a9c8641fd290c00a8361d6a251b3c1b8bad545a23efa627f59cb266340a448891ea8aa49d8a9307c767b8505219d95079
Author	SHA1	Message	Date
Sonarly Claude Code	e7f4a4cce8	chore: improve monitoring for fix: handle string-typed options in transformEnumV `resolver-validation.pipe.ts`: Wrapped the `plainToInstance` call in a try-catch that converts any `@Transform` decorator errors into `UserInputError` GraphQL responses. Previously, if a `@Transform` function threw (e.g., `TypeError: options?.map is not a function`), the error propagated as an unhandled exception captured by Sentry. Now, these malformed-input errors are returned to the client as proper GraphQL `UserInputError` responses with a descriptive message, reducing Sentry noise from client-side input issues. This follows the existing pattern in the same file where `safeClassValidatorValidateWrapper` already catches validation errors, and the pipe already throws `UserInputError` for invalid inputs.	2026-03-19 15:13:33 +00:00
Sonarly Claude Code	eac6723d78	fix: handle string-typed options in transformEnumValue https://sonarly.com/issue/16534?type=bug `transformEnumValue()` calls `.map()` on the `options` value without checking if it's actually an array. When a client sends `options` as a JSON-encoded string (e.g., `"[{...}]"`) instead of a native JSON array via the `updateOneField` mutation, the `@Transform` decorator passes the raw string to `transformEnumValue()`, causing a `TypeError`. Fix: `transform-enum-value.ts`: The function now accepts `string` in addition to `FieldMetadataDefaultOption[]`. When a string is received (from clients sending JSON-encoded options via GraphQL), it parses it with `JSON.parse`. It also guards against non-array parsed values by returning them as-is, letting downstream validation handle the error. `field-metadata.dto.ts`: Removed the unsafe `as FieldMetadataDefaultOption[]` cast from the `@Transform` decorator, which was masking the type mismatch at compile time. The `transformEnumValue` function now handles the real runtime types directly. Removed the now-unused `FieldMetadataDefaultOption` import. `transform-enum-value.spec.ts`: Added tests covering: undefined input, array input with digit-prefixed values, JSON string input, and JSON string input with digit-prefixed values.	2026-03-19 15:13:33 +00:00
Abdul Rahman GitHub Charles Bochet	a9f8a7e1fa	Fix: prevent record navigation when clicking Remove from favorite in nav sidebar (#18760 ) https://github.com/user-attachments/assets/96abf04d-726a-4225-846e-e5d701a583a2 --------- Co-authored-by: Charles Bochet <charles@twenty.com>	2026-03-19 14:29:12 +00:00
Thomas Trompette GitHub Charles Bochet	5526d2e5d0	Separate metadata and object record publisher (#18740 ) - Separate both publishers - Renaming - Removal of the old SSE endpoint --------- Co-authored-by: Charles Bochet <charles@twenty.com>	2026-03-19 13:24:38 +00:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>Charles Bochet	0d27a255a9	chore(deps): bump nodemailer from 7.0.11 to 7.0.13 (#18754 ) Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 7.0.11 to 7.0.13. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/nodemailer/nodemailer/releases">nodemailer's releases</a>.</em></p> <blockquote> <h2>v7.0.13</h2> <h2><a href="https://github.com/nodemailer/nodemailer/compare/v7.0.12...v7.0.13">7.0.13</a> (2026-01-27)</h2> <h3>Bug Fixes</h3> <ul> <li>downgrade transient connection error logs to warn level (<a href="https://github.com/nodemailer/nodemailer/commit/4c041db85d560e98bc5e1fd5d5a191835c5b7d2f">4c041db</a>)</li> </ul> <h2>v7.0.12</h2> <h2><a href="https://github.com/nodemailer/nodemailer/compare/v7.0.11...v7.0.12">7.0.12</a> (2025-12-22)</h2> <h3>Bug Fixes</h3> <ul> <li>added support for REQUIRETLS (<a href="https://redirect.github.com/nodemailer/nodemailer/issues/1793">#1793</a>) (<a href="https://github.com/nodemailer/nodemailer/commit/053ce6a772a7c608e6bee7f58ebe9900afbd9b84">053ce6a</a>)</li> <li>use 8bit encoding for message/rfc822 attachments (<a href="https://github.com/nodemailer/nodemailer/commit/adf86113217b23ff3cd1191af5cd1d360fcc313b">adf8611</a>)</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md">nodemailer's changelog</a>.</em></p> <blockquote> <h2><a href="https://github.com/nodemailer/nodemailer/compare/v7.0.12...v7.0.13">7.0.13</a> (2026-01-27)</h2> <h3>Bug Fixes</h3> <ul> <li>downgrade transient connection error logs to warn level (<a href="https://github.com/nodemailer/nodemailer/commit/4c041db85d560e98bc5e1fd5d5a191835c5b7d2f">4c041db</a>)</li> </ul> <h2><a href="https://github.com/nodemailer/nodemailer/compare/v7.0.11...v7.0.12">7.0.12</a> (2025-12-22)</h2> <h3>Bug Fixes</h3> <ul> <li>added support for REQUIRETLS (<a href="https://redirect.github.com/nodemailer/nodemailer/issues/1793">#1793</a>) (<a href="https://github.com/nodemailer/nodemailer/commit/053ce6a772a7c608e6bee7f58ebe9900afbd9b84">053ce6a</a>)</li> <li>use 8bit encoding for message/rfc822 attachments (<a href="https://github.com/nodemailer/nodemailer/commit/adf86113217b23ff3cd1191af5cd1d360fcc313b">adf8611</a>)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/nodemailer/nodemailer/commit/893119505aa25723dd9a7d90c8dfd223d28a0cc4"><code>8931195</code></a> chore(master): release 7.0.13 (<a href="https://redirect.github.com/nodemailer/nodemailer/issues/1798">#1798</a>)</li> <li><a href="https://github.com/nodemailer/nodemailer/commit/9398d633d2c1bf5bf08a0e258ff17d5d7a45f0e6"><code>9398d63</code></a> Bumped deps</li> <li><a href="https://github.com/nodemailer/nodemailer/commit/4c041db85d560e98bc5e1fd5d5a191835c5b7d2f"><code>4c041db</code></a> fix: downgrade transient connection error logs to warn level</li> <li><a href="https://github.com/nodemailer/nodemailer/commit/a208a0bc86a315d037d5be8849fab5862c488baa"><code>a208a0b</code></a> chore(master): release 7.0.12 (<a href="https://redirect.github.com/nodemailer/nodemailer/issues/1785">#1785</a>)</li> <li><a href="https://github.com/nodemailer/nodemailer/commit/053ce6a772a7c608e6bee7f58ebe9900afbd9b84"><code>053ce6a</code></a> fix: added support for REQUIRETLS (<a href="https://redirect.github.com/nodemailer/nodemailer/issues/1793">#1793</a>)</li> <li><a href="https://github.com/nodemailer/nodemailer/commit/adf86113217b23ff3cd1191af5cd1d360fcc313b"><code>adf8611</code></a> fix: use 8bit encoding for message/rfc822 attachments</li> <li>See full diff in <a href="https://github.com/nodemailer/nodemailer/compare/v7.0.11...v7.0.13">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=nodemailer&package-manager=npm_and_yarn&previous-version=7.0.11&new-version=7.0.13)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Charles Bochet <charlesBochet@users.noreply.github.com>	2026-03-19 09:22:17 +00:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	ef2a113a16	chore(deps): bump @dagrejs/dagre from 1.1.3 to 1.1.8 (#18753 ) Bumps [@dagrejs/dagre](https://github.com/dagrejs/dagre) from 1.1.3 to 1.1.8. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/dagrejs/dagre/commit/7e4d15f191678f7f05f3c86d9071a193230e7e00"><code>7e4d15f</code></a> Building for release</li> <li><a href="https://github.com/dagrejs/dagre/commit/d3908e2c13148c9143db585accc10ae0b6634657"><code>d3908e2</code></a> Bumping version</li> <li><a href="https://github.com/dagrejs/dagre/commit/ce295f8e073c4fe96c9e36ecf08ae2940e5e6a10"><code>ce295f8</code></a> Build for release</li> <li><a href="https://github.com/dagrejs/dagre/commit/b64b9057726eee17f24f73579ba0668527276448"><code>b64b905</code></a> Bumping the version</li> <li><a href="https://github.com/dagrejs/dagre/commit/de169d24c13d06c1e9c560f4f4f8f98650109b94"><code>de169d2</code></a> Merge pull request <a href="https://redirect.github.com/dagrejs/dagre/issues/481">#481</a> from Nathan-Fenner/nf/improve-network-simplex-perform...</li> <li><a href="https://github.com/dagrejs/dagre/commit/065e0d8374f4c1c35a7cb4b84df37aaa31598d86"><code>065e0d8</code></a> improve performance of graph node ranking</li> <li><a href="https://github.com/dagrejs/dagre/commit/00d3178d671e49de9c032e3abd281dc9f2739e73"><code>00d3178</code></a> Typo</li> <li><a href="https://github.com/dagrejs/dagre/commit/3982a69d2b323b06aa969a4ec09829d37fe6e7bd"><code>3982a69</code></a> Bump version and set as pre-release</li> <li><a href="https://github.com/dagrejs/dagre/commit/1339f5516508dba0cbcc4ef1c0587e7384bec23d"><code>1339f55</code></a> Building for release</li> <li><a href="https://github.com/dagrejs/dagre/commit/9459f01bc815f16b87db727821d8401acbad2cd3"><code>9459f01</code></a> Bumping the version</li> <li>Additional commits viewable in <a href="https://github.com/dagrejs/dagre/compare/v1.1.3...v1.1.8">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@dagrejs/dagre&package-manager=npm_and_yarn&previous-version=1.1.3&new-version=1.1.8)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-03-19 09:11:58 +00:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	e0e25eac2b	chore(deps): bump @ai-sdk/mistral from 3.0.20 to 3.0.25 (#18755 ) Bumps [@ai-sdk/mistral](https://github.com/vercel/ai) from 3.0.20 to 3.0.25. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/vercel/ai/commit/4c1613ac8ff9f638da3a25fa6a1aa40362eb0e7c"><code>4c1613a</code></a> Version Packages (<a href="https://redirect.github.com/vercel/ai/issues/13131">#13131</a>)</li> <li><a href="https://github.com/vercel/ai/commit/64ac0fdd80da66d1e920a8a6309ebe05b9d686ad"><code>64ac0fd</code></a> Backport: fix(security): validate redirect targets in download functions to p...</li> <li><a href="https://github.com/vercel/ai/commit/f622bf85c114f810b00dd2825b56e044bce578a7"><code>f622bf8</code></a> Version Packages (<a href="https://redirect.github.com/vercel/ai/issues/13126">#13126</a>)</li> <li><a href="https://github.com/vercel/ai/commit/e2a59ef9273ef2ad97c8aec5bf5c0a7b9e8c436c"><code>e2a59ef</code></a> Backport: fix(provider/google): preserve groundingMetadata when streamed befo...</li> <li><a href="https://github.com/vercel/ai/commit/ebf43a6765e6fa337e8d5b6cf065625a1794c21c"><code>ebf43a6</code></a> Version Packages (<a href="https://redirect.github.com/vercel/ai/issues/13120">#13120</a>)</li> <li><a href="https://github.com/vercel/ai/commit/258900473214256af40b035b66f15362cbc53287"><code>2589004</code></a> Backport: feat(openai): add GPT-5.4 model support (<a href="https://redirect.github.com/vercel/ai/issues/13117">#13117</a>)</li> <li><a href="https://github.com/vercel/ai/commit/d23121fd71036611e0142a9233de4d1a1f5d54c0"><code>d23121f</code></a> Backport: chore(ai): add optional ChatRequestOptions to `addToolApprovalRespo...</li> <li><a href="https://github.com/vercel/ai/commit/55a2acf625c78d5c68ac2abc02bc26c3cd0ffa6e"><code>55a2acf</code></a> Version Packages (<a href="https://redirect.github.com/vercel/ai/issues/13101">#13101</a>)</li> <li><a href="https://github.com/vercel/ai/commit/45d71c381b756e03310f81bdd322aa7460cb5a15"><code>45d71c3</code></a> Backport: fix(google): use VALIDATED function calling mode when any tool has ...</li> <li><a href="https://github.com/vercel/ai/commit/ee92dc766422fffde3bae06437510296c4e860a8"><code>ee92dc7</code></a> ci(release): add <code>--tag ai-v6</code> to <code>ci:release</code> script (<a href="https://redirect.github.com/vercel/ai/issues/13096">#13096</a>)</li> <li>Additional commits viewable in <a href="https://github.com/vercel/ai/compare/@ai-sdk/mistral@3.0.20...@ai-sdk/mistral@3.0.25">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@ai-sdk/mistral&package-manager=npm_and_yarn&previous-version=3.0.20&new-version=3.0.25)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-03-19 09:10:58 +00:00
Charles BochetandGitHub	8ab8f80687	fix: use unique concurrency group per merge queue entry (#18756 ) ## Summary - Fixes merge queue PRs blocking each other by changing the concurrency group in `ci-merge-queue.yaml` - The old concurrency group used `merge_group.base_ref` which resolves to `refs/heads/main` for every PR, causing all merge queue entries to serialize behind a single concurrency slot - Now uses `github.ref` (unique per entry: `refs/heads/gh-readonly-queue/main/pr-NUMBER-SHA`), matching what all other CI workflows already do ## Recommended ruleset changes (in GitHub Settings > Rules > Rulesets > "CI Status Checks") - Grouping strategy: Switch `ALLGREEN` to `NONE` -- each PR is still tested against the correct base (including all PRs ahead of it in the queue), but failures only affect the failing PR instead of ejecting the entire group. `max_entries_to_build: 5` still allows parallel speculative testing. - `min_entries_to_merge_wait_minutes`: Reduce from 5 to 1 -- the 5-minute wait adds unnecessary latency to every merge. ## Test plan - [ ] Enqueue 2+ PRs in the merge queue and verify both trigger e2e tests in parallel instead of one blocking the other	2026-03-19 10:10:47 +01:00
github-actions[bot]GitHub github-actions	a370a26b79	i18n - docs translations (#18749 ) Created by Github action --------- Co-authored-by: github-actions <github-actions@twenty.com>	2026-03-19 09:36:37 +01:00