@open-mercato/core 0.6.2-develop.3467.1.2a1818709d → 0.6.2

package/src/modules/data_sync/components/IntegrationScheduleTab.tsx

@@ -32,6 +32,8 @@ type SyncOption = {
   integrationId: string
   title: string
   direction: 'import' | 'export' | 'bidirectional'
+  runMode?: 'generic' | 'provider'
+  canStartRun?: boolean
   supportedEntities: string[]
   hasCredentials: boolean
   isEnabled: boolean
@@ -204,6 +206,10 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
       flash(t('data_sync.integrationTab.credentialsMissing', 'Configure credentials before starting a sync.'), 'error')
       return
     }
+    if (option?.canStartRun === false) {
+      flash(t('data_sync.integrationTab.providerManaged', 'Start this integration from its provider-specific setup flow.'), 'error')
+      return
+    }
 
     setRunningKey(scheduleKey)
     try {
@@ -231,7 +237,7 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
     } finally {
       setRunningKey(null)
     }
-  }, [props.hasCredentials, props.integrationId, props.isEnabled, schedules, t])
+  }, [option?.canStartRun, props.hasCredentials, props.integrationId, props.isEnabled, schedules, t])
 
   const handleSaveSchedule = React.useCallback(async (entityType: string, direction: 'import' | 'export', scheduleKey: string) => {
     const scheduleState = schedules[scheduleKey] ?? buildDefaultScheduleState(entityType)
@@ -369,6 +375,14 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
         </Alert>
       ) : null}
 
+      {option.canStartRun === false ? (
+        <Alert variant="info">
+          <AlertDescription>
+            {t('data_sync.integrationTab.providerManagedNotice', 'This provider needs its own setup flow before a run can start. Use the provider tab on this page instead of generic schedules.')}
+          </AlertDescription>
+        </Alert>
+      ) : null}
+
       {rows.length === 0 ? (
         <Alert variant="info">
           <AlertDescription>
@@ -469,7 +483,7 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
                           type="button"
                           size="sm"
                           onClick={() => void handleStartSync(row.entityType, row.direction, row.key)}
-                          disabled={controlsDisabled || !props.isEnabled || !props.hasCredentials}
+                          disabled={controlsDisabled || !props.isEnabled || !props.hasCredentials || option.canStartRun === false}
                         >
                           {isRunning ? <Spinner className="mr-2 h-4 w-4" /> : <Play className="mr-2 h-4 w-4" />}
                           {isRunning
@@ -481,7 +495,7 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
                           size="sm"
                           variant="outline"
                           onClick={() => void handleSaveSchedule(row.entityType, row.direction, row.key)}
-                          disabled={controlsDisabled}
+                          disabled={controlsDisabled || option.canStartRun === false}
                         >
                           {isSaving ? <Spinner className="mr-2 h-4 w-4" /> : <Save className="mr-2 h-4 w-4" />}
                           {isSaving

package/src/modules/data_sync/i18n/de.json

@@ -54,6 +54,7 @@
   "data_sync.dashboard.start.fullSync": "Run as full sync",
   "data_sync.dashboard.start.fullSyncHelp": "Ignore the saved cursor and process the entire source again for this run.",
   "data_sync.dashboard.start.invalidBatchSize": "Batch size must be between 1 and 1000.",
+  "data_sync.dashboard.start.providerManaged": "Diese Integration startet Synchronisierungsläufe über ihren eigenen Einrichtungsablauf. Öffne die Integrationseinstellungen, um fortzufahren.",
   "data_sync.dashboard.start.runNowDescription": "Use this for the next immediate sync. Batch size and full-sync mode apply only to this manual run.",
   "data_sync.dashboard.start.runNowFootnote": "Manual runs show progress immediately and land on the run detail page after launch.",
   "data_sync.dashboard.start.runNowTitle": "Run once now",
@@ -83,6 +84,8 @@
   "data_sync.integrationTab.integrationDisabledNotice": "The integration is disabled. You can save schedules now, but runs will stay blocked until the integration is enabled.",
   "data_sync.integrationTab.loadError": "Failed to load sync schedules.",
   "data_sync.integrationTab.notAvailable": "This integration is not registered as a data sync provider.",
+  "data_sync.integrationTab.providerManaged": "Starte diese Integration über ihren anbieterspezifischen Einrichtungsablauf.",
+  "data_sync.integrationTab.providerManagedNotice": "Dieser Anbieter benötigt einen eigenen Einrichtungsablauf, bevor ein Lauf gestartet werden kann. Verwende den Anbieter-Tab auf dieser Seite statt der generischen Zeitpläne.",
   "data_sync.integrationTab.refresh": "Refresh",
   "data_sync.integrationTab.runError": "Failed to start sync.",
   "data_sync.integrationTab.runNowHelp": "Run now uses the full-sync checkbox from the same row and starts progress tracking immediately in Data Sync.",

package/src/modules/data_sync/i18n/en.json

@@ -54,6 +54,7 @@
   "data_sync.dashboard.start.fullSync": "Run as full sync",
   "data_sync.dashboard.start.fullSyncHelp": "Ignore the saved cursor and process the entire source again for this run.",
   "data_sync.dashboard.start.invalidBatchSize": "Batch size must be between 1 and 1000.",
+  "data_sync.dashboard.start.providerManaged": "This integration starts sync runs from its own setup flow. Open the integration settings page to continue.",
   "data_sync.dashboard.start.runNowDescription": "Use this for the next immediate sync. Batch size and full-sync mode apply only to this manual run.",
   "data_sync.dashboard.start.runNowFootnote": "Manual runs show progress immediately and land on the run detail page after launch.",
   "data_sync.dashboard.start.runNowTitle": "Run once now",
@@ -83,6 +84,8 @@
   "data_sync.integrationTab.integrationDisabledNotice": "The integration is disabled. You can save schedules now, but runs will stay blocked until the integration is enabled.",
   "data_sync.integrationTab.loadError": "Failed to load sync schedules.",
   "data_sync.integrationTab.notAvailable": "This integration is not registered as a data sync provider.",
+  "data_sync.integrationTab.providerManaged": "Start this integration from its provider-specific setup flow.",
+  "data_sync.integrationTab.providerManagedNotice": "This provider needs its own setup flow before a run can start. Use the provider tab on this page instead of generic schedules.",
   "data_sync.integrationTab.refresh": "Refresh",
   "data_sync.integrationTab.runError": "Failed to start sync.",
   "data_sync.integrationTab.runNowHelp": "Run now uses the full-sync checkbox from the same row and starts progress tracking immediately in Data Sync.",

package/src/modules/data_sync/i18n/es.json

@@ -54,6 +54,7 @@
   "data_sync.dashboard.start.fullSync": "Run as full sync",
   "data_sync.dashboard.start.fullSyncHelp": "Ignore the saved cursor and process the entire source again for this run.",
   "data_sync.dashboard.start.invalidBatchSize": "Batch size must be between 1 and 1000.",
+  "data_sync.dashboard.start.providerManaged": "Esta integración inicia las sincronizaciones desde su propio flujo de configuración. Abre la página de ajustes de la integración para continuar.",
   "data_sync.dashboard.start.runNowDescription": "Use this for the next immediate sync. Batch size and full-sync mode apply only to this manual run.",
   "data_sync.dashboard.start.runNowFootnote": "Manual runs show progress immediately and land on the run detail page after launch.",
   "data_sync.dashboard.start.runNowTitle": "Run once now",
@@ -83,6 +84,8 @@
   "data_sync.integrationTab.integrationDisabledNotice": "The integration is disabled. You can save schedules now, but runs will stay blocked until the integration is enabled.",
   "data_sync.integrationTab.loadError": "Failed to load sync schedules.",
   "data_sync.integrationTab.notAvailable": "This integration is not registered as a data sync provider.",
+  "data_sync.integrationTab.providerManaged": "Inicia esta integración desde su flujo de configuración específico del proveedor.",
+  "data_sync.integrationTab.providerManagedNotice": "Este proveedor necesita su propio flujo de configuración antes de poder iniciar una ejecución. Usa la pestaña del proveedor en esta página en lugar de los calendarios genéricos.",
   "data_sync.integrationTab.refresh": "Refresh",
   "data_sync.integrationTab.runError": "Failed to start sync.",
   "data_sync.integrationTab.runNowHelp": "Run now uses the full-sync checkbox from the same row and starts progress tracking immediately in Data Sync.",

package/src/modules/data_sync/i18n/pl.json

@@ -54,6 +54,7 @@
   "data_sync.dashboard.start.fullSync": "Run as full sync",
   "data_sync.dashboard.start.fullSyncHelp": "Ignore the saved cursor and process the entire source again for this run.",
   "data_sync.dashboard.start.invalidBatchSize": "Batch size must be between 1 and 1000.",
+  "data_sync.dashboard.start.providerManaged": "Ta integracja uruchamia synchronizacje z własnego przepływu konfiguracji. Otwórz ustawienia integracji, aby kontynuować.",
   "data_sync.dashboard.start.runNowDescription": "Use this for the next immediate sync. Batch size and full-sync mode apply only to this manual run.",
   "data_sync.dashboard.start.runNowFootnote": "Manual runs show progress immediately and land on the run detail page after launch.",
   "data_sync.dashboard.start.runNowTitle": "Run once now",
@@ -83,6 +84,8 @@
   "data_sync.integrationTab.integrationDisabledNotice": "The integration is disabled. You can save schedules now, but runs will stay blocked until the integration is enabled.",
   "data_sync.integrationTab.loadError": "Failed to load sync schedules.",
   "data_sync.integrationTab.notAvailable": "This integration is not registered as a data sync provider.",
+  "data_sync.integrationTab.providerManaged": "Uruchom tę integrację z jej przepływu konfiguracji dostawcy.",
+  "data_sync.integrationTab.providerManagedNotice": "Ten dostawca wymaga własnego przepływu konfiguracji, zanim będzie można uruchomić synchronizację. Użyj karty dostawcy na tej stronie zamiast ogólnych harmonogramów.",
   "data_sync.integrationTab.refresh": "Refresh",
   "data_sync.integrationTab.runError": "Failed to start sync.",
   "data_sync.integrationTab.runNowHelp": "Run now uses the full-sync checkbox from the same row and starts progress tracking immediately in Data Sync.",

package/src/modules/data_sync/lib/adapter.ts

@@ -93,6 +93,15 @@ export interface DataSyncAdapter {
   readonly providerKey: string
   readonly direction: 'import' | 'export' | 'bidirectional'
   readonly supportedEntities: string[]
+  /**
+   * How a run may be started.
+   *
+   * - `generic` (default): `/api/data_sync/run` has enough information to
+   *   create and enqueue the run.
+   * - `provider`: the provider owns a prerequisite flow before a run can be
+   *   enqueued, such as uploading a CSV and linking that upload to the run.
+   */
+  readonly runMode?: 'generic' | 'provider'
   readonly operationalTelemetry?: boolean
 
   streamImport?(input: StreamImportInput): AsyncIterable<ImportBatch>

package/src/modules/integrations/backend/integrations/[id]/page.tsx

@@ -442,15 +442,16 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
     )
   }, [integrationId])
 
-  const loadDetail = React.useCallback(async () => {
+  const loadDetail = React.useCallback(async (options?: { showLoading?: boolean }) => {
+    const showLoading = options?.showLoading ?? true
     const currentIntegrationId = resolveCurrentIntegrationId()
     if (!currentIntegrationId) {
-      setIsLoading(false)
-      setError(t('integrations.detail.loadError', 'Failed to load integration'))
+      if (showLoading) setIsLoading(false)
+      if (showLoading) setError(t('integrations.detail.loadError', 'Failed to load integration'))
       return
     }
-    setError(null)
-    setIsLoading(true)
+    if (showLoading) setError(null)
+    if (showLoading) setIsLoading(true)
     try {
       const call = await apiCall<IntegrationDetail>(
         `/api/integrations/${encodeURIComponent(currentIntegrationId)}`,
@@ -458,15 +459,16 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
         { fallback: null },
       )
       if (!call.ok || !call.result) {
-        setError(t('integrations.detail.loadError', 'Failed to load integration'))
-        setIsLoading(false)
+        if (showLoading) setError(t('integrations.detail.loadError', 'Failed to load integration'))
+        if (showLoading) setIsLoading(false)
         return
       }
       setDetail(call.result)
-      setIsLoading(false)
+      setError(null)
+      if (showLoading) setIsLoading(false)
     } catch {
-      setError(t('integrations.detail.loadError', 'Failed to load integration'))
-      setIsLoading(false)
+      if (showLoading) setError(t('integrations.detail.loadError', 'Failed to load integration'))
+      if (showLoading) setIsLoading(false)
     }
   }, [resolveCurrentIntegrationId, t])
 
@@ -522,14 +524,14 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
     spotId: detailWidgetSpotId,
   })
   const refreshDetail = React.useCallback(async () => {
-    await loadDetail()
+    await loadDetail({ showLoading: false })
     await loadCredentials()
   }, [loadCredentials, loadDetail])
   const refreshLogs = React.useCallback(async () => {
     await loadLogs()
   }, [loadLogs])
   const refreshHealthSnapshot = React.useCallback(async () => {
-    await loadDetail()
+    await loadDetail({ showLoading: false })
   }, [loadDetail])
   const runIdFromUrl = searchParams?.get('runId') ?? null
   const refreshRunActivity = React.useCallback(async (options?: { showLoading?: boolean }) => {
@@ -546,7 +548,7 @@ export default function IntegrationDetailPage({ params }: IntegrationDetailPageP
         { fallback: null },
       )
       await loadLogs()
-      await loadDetail()
+      await loadDetail({ showLoading: false })
       if (call.ok && call.result) {
         setActiveRunDetail(call.result)
         setActiveRunRefreshedAt(new Date().toISOString())

package/src/modules/integrations/data/validators.ts

@@ -40,14 +40,15 @@ export const listIntegrationLogsQuerySchema = z.object({
 
 export type ListIntegrationLogsQuery = z.infer<typeof listIntegrationLogsQuerySchema>
 
-const optionalBooleanQuery = z.union([z.boolean(), z.string(), z.null(), z.undefined()])
-  .transform((value) => {
+const optionalBooleanQuery = z.preprocess(
+  (value) => {
     if (value === undefined || value === '' || value === null) return undefined
     if (value === true || value === 'true' || value === '1') return true
     if (value === false || value === 'false' || value === '0') return false
     return value
-  })
-  .pipe(z.boolean().optional())
+  },
+  z.boolean().optional(),
+)
 
 export const integrationMarketplaceHealthStatusSchema = z.enum(['healthy', 'degraded', 'unhealthy', 'unconfigured'])
 

package/src/modules/messages/api/route.ts

@@ -168,13 +168,13 @@ export async function GET(req: Request) {
         eb.selectFrom('attachments')
           .select(sql<number>`1`.as('one'))
           .where('attachments.entity_id', '=', MESSAGE_ATTACHMENT_ENTITY_ID)
-          .whereRef('attachments.record_id', '=', 'm.id')
+          .where(sql<boolean>`attachments.record_id = m.id::text`)
       )
       const notExistsFn = (eb: any) => eb.not(eb.exists(
         eb.selectFrom('attachments')
           .select(sql<number>`1`.as('one'))
           .where('attachments.entity_id', '=', MESSAGE_ATTACHMENT_ENTITY_ID)
-          .whereRef('attachments.record_id', '=', 'm.id')
+          .where(sql<boolean>`attachments.record_id = m.id::text`)
       ))
       q = input.hasAttachments ? q.where(existsFn) : q.where(notExistsFn)
     }

package/src/modules/messages/commands/messages.ts

@@ -2,7 +2,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { z } from 'zod'
 import { registerCommand, type CommandHandler } from '@open-mercato/shared/lib/commands'
 import { extractUndoPayload, type UndoPayload } from '@open-mercato/shared/lib/commands/undo'
-import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { Message, MessageObject, MessageRecipient, type MessageActionData } from '../data/entities'
 import { emitMessagesEvent } from '../events'
 import {
@@ -368,6 +368,20 @@ const updateDraftCommand: CommandHandler<unknown, { ok: true; id: string }> = {
     if (message.senderUserId !== input.userId) throw new Error('Access denied')
     if (!message.isDraft) throw new Error('Only draft messages can be edited')
 
+    const isSending = input.isDraft === false
+    const preloadedRecipients = isSending && !input.recipients
+      ? await findWithDecryption(
+        em,
+        MessageRecipient,
+        { messageId: message.id, deletedAt: null },
+        undefined,
+        {
+          tenantId: input.tenantId,
+          organizationId: input.organizationId,
+        },
+      )
+      : null
+
     const nextMessageType = input.type ?? message.type
     if (input.objects) {
       const objectValidationError = validateMessageObjectsForType(nextMessageType, input.objects)
@@ -454,12 +468,50 @@ const updateDraftCommand: CommandHandler<unknown, { ok: true; id: string }> = {
       )
     }
 
+    if (isSending) {
+      const finalVisibility = input.visibility ?? message.visibility
+      const finalSubject = input.subject ?? message.subject
+      const finalBody = input.body ?? message.body
+      const finalRecipientCount = input.recipients
+        ? input.recipients.length
+        : (preloadedRecipients?.length ?? 0)
+
+      if (finalVisibility !== 'public' && finalRecipientCount === 0) {
+        throw new Error('at least one recipient is required')
+      }
+      if (!finalSubject?.trim()) throw new Error('subject is required')
+      if (!finalBody?.trim()) throw new Error('body is required')
+
+      message.isDraft = false
+      message.status = 'sent'
+      message.sentAt = new Date()
+      if (!message.threadId) message.threadId = message.id
+    }
+
     await em.flush()
     await emitMessageIndexUpsert(ctx.container, {
       messageId: message.id,
       tenantId: input.tenantId,
       organizationId: input.organizationId,
     })
+
+    if (isSending) {
+      const recipientUserIds = input.recipients
+        ? input.recipients.map((r) => r.userId)
+        : (preloadedRecipients ?? []).map((r) => r.recipientUserId)
+      const resolvedVisibility = input.visibility ?? message.visibility
+      const resolvedSendViaEmail = input.sendViaEmail ?? message.sendViaEmail
+      await emitMessageSentEvent(ctx.container, {
+        messageId: message.id,
+        senderUserId: input.userId,
+        recipientUserIds,
+        sendViaEmail: resolvedVisibility === 'public' ? true : resolvedSendViaEmail,
+        externalEmail: message.externalEmail ?? null,
+        tenantId: input.tenantId,
+        organizationId: input.organizationId,
+      })
+    }
+
     return { ok: true, id: message.id }
   },
   async captureAfter(rawInput, _result, ctx) {
@@ -473,7 +525,7 @@ const updateDraftCommand: CommandHandler<unknown, { ok: true; id: string }> = {
   buildLog: async ({ input, snapshots }) => {
     const parsed = updateDraftCommandSchema.parse(input)
     return {
-      actionLabel: 'Update draft message',
+      actionLabel: parsed.isDraft === false ? 'Send draft message' : 'Update draft message',
       resourceKind: 'messages.message',
       resourceId: parsed.messageId,
       tenantId: parsed.tenantId,

package/src/modules/messages/components/MessagesInboxPageClient.tsx

@@ -19,6 +19,11 @@ import { DefaultMessageListItem } from './defaults/DefaultMessageListItem'
 import { getMessageListParticipantLabel } from './messageListLabels'
 import { toErrorMessage } from './message-detail/utils'
 import { useMessagesInboxBulkActions, type MessageFolder } from './useMessagesInboxBulkActions'
+import {
+  buildMessagesInboxFilters,
+  buildMessagesListParams,
+  type SenderOption,
+} from './inboxFilters'
 
 type MessageListItem = {
   id: string
@@ -106,30 +111,13 @@ export function MessagesInboxPageClient() {
       scopeVersion,
     ],
     queryFn: async () => {
-      const params = new URLSearchParams()
-      params.set('folder', folder)
-      params.set('page', String(page))
-      params.set('pageSize', String(pageSize))
-
-      if (search.trim()) {
-        params.set('search', search.trim())
-      }
-
-      const status = typeof filterValues.status === 'string' ? filterValues.status.trim() : ''
-      const type = typeof filterValues.type === 'string' ? filterValues.type.trim() : ''
-      const hasObjects = typeof filterValues.hasObjects === 'string' ? filterValues.hasObjects.trim() : ''
-      const hasAttachments = typeof filterValues.hasAttachments === 'string' ? filterValues.hasAttachments.trim() : ''
-      const hasActions = typeof filterValues.hasActions === 'string' ? filterValues.hasActions.trim() : ''
-      const senderId = typeof filterValues.senderId === 'string' ? filterValues.senderId.trim() : ''
-      const since = typeof filterValues.since === 'string' ? filterValues.since.trim() : ''
-
-      if (status) params.set('status', status)
-      if (type) params.set('type', type)
-      if (hasObjects) params.set('hasObjects', hasObjects)
-      if (hasAttachments) params.set('hasAttachments', hasAttachments)
-      if (hasActions) params.set('hasActions', hasActions)
-      if (senderId) params.set('senderId', senderId)
-      if (since) params.set('since', since)
+      const params = buildMessagesListParams({
+        folder,
+        page,
+        pageSize,
+        search,
+        filterValues,
+      })
 
       const call = await apiCall<MessageListResponse>(`/api/messages?${params.toString()}`)
       if (!call.ok) {
@@ -191,6 +179,19 @@ export function MessagesInboxPageClient() {
     return map
   }, [messageTypesQuery.data, t])
 
+  const [senderOptions, setSenderOptions] = React.useState<SenderOption[]>([])
+  const senderOptionsScopeRef = React.useRef(scopeVersion)
+
+  const mergeSenderOptions = React.useCallback((incoming: SenderOption[]) => {
+    if (incoming.length === 0) return
+    setSenderOptions((prev) => {
+      const map = new Map<string, SenderOption>()
+      for (const opt of prev) map.set(opt.value, opt)
+      for (const opt of incoming) map.set(opt.value, opt)
+      return Array.from(map.values())
+    })
+  }, [])
+
   const loadSenderOptions = React.useCallback(async (query?: string) => {
     const params = new URLSearchParams()
     params.set('page', '1')
@@ -199,11 +200,19 @@ export function MessagesInboxPageClient() {
       params.set('search', query.trim())
     }
 
-    const call = await apiCall<{ items?: UserListItem[] }>(`/api/auth/users?${params.toString()}`)
+    const call = await apiCall<{ items?: UserListItem[] }>(
+      `/api/auth/users?${params.toString()}`,
+      {
+        headers: {
+          'x-om-forbidden-redirect': '0',
+        },
+      },
+    ).catch(() => null)
+    if (!call) return []
     if (!call.ok) return []
 
     const items = Array.isArray(call.result?.items) ? call.result?.items ?? [] : []
-    return items.flatMap((item) => {
+    const next: SenderOption[] = items.flatMap((item) => {
       if (!item || typeof item.id !== 'string' || item.id.trim().length === 0) return []
       const name = typeof item.name === 'string' && item.name.trim().length > 0 ? item.name.trim() : null
       const email = typeof item.email === 'string' && item.email.trim().length > 0 ? item.email.trim() : null
@@ -214,7 +223,39 @@ export function MessagesInboxPageClient() {
         description: email && email !== label ? email : null,
       }]
     })
-  }, [])
+    if (senderOptionsScopeRef.current === scopeVersion) {
+      mergeSenderOptions(next)
+    }
+    return next
+  }, [mergeSenderOptions, scopeVersion])
+
+  React.useEffect(() => {
+    const items = listQuery.data?.items ?? []
+    const next = items.flatMap((item): SenderOption[] => {
+      if (typeof item.senderUserId !== 'string' || item.senderUserId.trim().length === 0) return []
+      const name = typeof item.senderName === 'string' && item.senderName.trim().length > 0
+        ? item.senderName.trim()
+        : null
+      const email = typeof item.senderEmail === 'string' && item.senderEmail.trim().length > 0
+        ? item.senderEmail.trim()
+        : null
+      const label = name ?? email ?? item.senderUserId
+      return [{
+        value: item.senderUserId,
+        label,
+        description: email && email !== label ? email : null,
+      }]
+    })
+    mergeSenderOptions(next)
+  }, [listQuery.data?.items, mergeSenderOptions])
+
+  React.useEffect(() => {
+    senderOptionsScopeRef.current = scopeVersion
+    setSenderOptions([])
+    loadSenderOptions().catch((error: unknown) => {
+      console.warn('[messages] Failed to load sender filter options', error)
+    })
+  }, [loadSenderOptions, scopeVersion])
 
   const listItemComponentKeyByType = React.useMemo(() => {
     const map: Record<string, string | null> = {}
@@ -230,69 +271,13 @@ export function MessagesInboxPageClient() {
       label: t(item.labelKey, item.type),
     }))
 
-    return [
-      {
-        id: 'status',
-        label: t('messages.filters.status', 'Status'),
-        type: 'select',
-        options: [
-          { value: '', label: t('messages.filters.all', 'All') },
-          { value: 'unread', label: t('messages.status.unread', 'Unread') },
-          { value: 'read', label: t('messages.status.read', 'Read') },
-          { value: 'archived', label: t('messages.status.archived', 'Archived') },
-        ],
-      },
-      {
-        id: 'type',
-        label: t('messages.filters.type', 'Type'),
-        type: 'select',
-        options: [{ value: '', label: t('messages.filters.all', 'All') }, ...typeOptions],
-      },
-      {
-        id: 'hasObjects',
-        label: t('messages.filters.hasObjects', 'Objects'),
-        type: 'select',
-        options: [
-          { value: '', label: t('messages.filters.all', 'All') },
-          { value: 'true', label: t('common.yes', 'Yes') },
-          { value: 'false', label: t('common.no', 'No') },
-        ],
-      },
-      {
-        id: 'hasAttachments',
-        label: t('messages.filters.hasAttachments', 'Attachments'),
-        type: 'select',
-        options: [
-          { value: '', label: t('messages.filters.all', 'All') },
-          { value: 'true', label: t('common.yes', 'Yes') },
-          { value: 'false', label: t('common.no', 'No') },
-        ],
-      },
-      {
-        id: 'hasActions',
-        label: t('messages.filters.hasActions', 'Actions'),
-        type: 'select',
-        options: [
-          { value: '', label: t('messages.filters.all', 'All') },
-          { value: 'true', label: t('common.yes', 'Yes') },
-          { value: 'false', label: t('common.no', 'No') },
-        ],
-      },
-      {
-        id: 'senderId',
-        label: t('messages.filters.sender', 'Sender'),
-        type: 'select',
-        options: [{ value: '', label: t('messages.filters.all', 'All') }],
-        loadOptions: loadSenderOptions,
-      },
-      {
-        id: 'since',
-        label: t('messages.filters.since', 'Sent after'),
-        type: 'text',
-        placeholder: t('messages.filters.sincePlaceholder', 'YYYY-MM-DDTHH:mm:ssZ'),
-      },
-    ]
-  }, [loadSenderOptions, messageTypesQuery.data, t])
+    return buildMessagesInboxFilters({
+      t,
+      typeOptions,
+      senderOptions,
+      loadSenderOptions,
+    })
+  }, [loadSenderOptions, messageTypesQuery.data, senderOptions, t])
 
   const columns = React.useMemo<ColumnDef<MessageListItem>[]>(() => [
     {