@open-mercato/core 0.8.1-develop.7274.1.21a0083828 → 0.8.1-develop.7294.1.0ef99fc518

package/src/modules/customers/lib/assignableStaff.ts

@@ -1,8 +1,13 @@
-import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import type { FilterOption } from '@open-mercato/shared/lib/query/advanced-filter'
 
 export type AssignableStaffMember = {
-  teamMemberId: string
+  /**
+   * Real team-member id when the staff module is present; `null` when resolved
+   * via the auth-users fallback (auth user ids are not staff ids — passing this
+   * value to a staff API would produce a wrong lookup).
+   */
+  teamMemberId: string | null
   userId: string
   displayName: string
   email: string | null
@@ -16,6 +21,20 @@ type AssignableStaffResponse = {
   pageSize?: number
 }
 
+/** Shape returned by GET /api/auth/users — distinct from AssignableStaffResponse. */
+type AuthUsersListResponse = {
+  items?: AuthUserListItem[]
+  total?: number
+  /** /api/auth/users does not return page/pageSize; callers fall back to passed-in values. */
+  isSuperAdmin?: boolean
+}
+
+type AuthUserListItem = {
+  id?: unknown
+  name?: unknown
+  email?: unknown
+}
+
 export type AssignableStaffMembersPage = {
   items: AssignableStaffMember[]
   /**
@@ -34,8 +53,9 @@ export type AssignableStaffMembersPage = {
 // When that module is disabled, its `/api/staff/team-members/assignable` endpoint is
 // absent and the request resolves to 404. Customers UI (deals / people / companies
 // owner filters, role-assignment dialogs) is core and always enabled, so it must not
-// break in that case — a missing staff module simply means there is no roster to
-// offer. Treat the 404 as an empty page and let any other failure propagate.
+// break in that case — fall back to tenant auth users, because `ownerUserId` is an
+// auth user id, not a staff team-member id (issue #6183). Treat other failures as
+// before: propagate them to the caller.
 function isAssignableEndpointMissing(error: unknown): boolean {
   return (
     typeof error === 'object' &&
@@ -44,34 +64,12 @@ function isAssignableEndpointMissing(error: unknown): boolean {
   )
 }
 
-export async function fetchAssignableStaffMembersPage(
-  query: string,
-  options?: { page?: number; pageSize?: number; signal?: AbortSignal },
-): Promise<AssignableStaffMembersPage> {
-  const page = options?.page ?? 1
-  const pageSize = options?.pageSize ?? 24
-  const params = new URLSearchParams()
-  params.set('page', String(page))
-  params.set('pageSize', String(pageSize))
-  const normalizedQuery = query.trim()
-  if (normalizedQuery.length > 0) {
-    params.set('search', normalizedQuery)
-  }
-
-  let data: AssignableStaffResponse
-  try {
-    data = await readApiResultOrThrow<AssignableStaffResponse>(
-      `/api/staff/team-members/assignable?${params.toString()}`,
-      options?.signal ? { signal: options.signal } : undefined,
-    )
-  } catch (error) {
-    if (isAssignableEndpointMissing(error)) {
-      return { items: [], servedCount: 0, total: 0, page, pageSize }
-    }
-    throw error
-  }
+function isAuthUsersFallbackDegradableHttpError(error: unknown): boolean {
+  const status = (error as { status?: unknown })?.status
+  return typeof status === 'number' && status >= 400 && status < 500
+}
 
-  const rawItems = Array.isArray(data?.items) ? data.items : []
+function mapStaffItems(rawItems: Array<Record<string, unknown>>): AssignableStaffMember[] {
   const deduped = new Map<string, AssignableStaffMember>()
 
   for (const item of rawItems) {
@@ -130,13 +128,153 @@ export async function fetchAssignableStaffMembersPage(
     })
   }
 
+  return Array.from(deduped.values())
+}
+
+function mapAuthUsersToAssignable(rawItems: AuthUserListItem[]): AssignableStaffMember[] {
+  const deduped = new Map<string, AssignableStaffMember>()
+
+  for (const item of rawItems) {
+    if (!item || typeof item.id !== 'string' || !item.id.trim()) continue
+    const userId = item.id.trim()
+    if (deduped.has(userId)) continue
+
+    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
+    const displayName = name ?? email ?? userId
+
+    deduped.set(userId, {
+      // Auth user ids are not staff team-member ids. Callers must not pass this
+      // value to a staff API endpoint.
+      teamMemberId: null,
+      userId,
+      displayName,
+      email,
+      teamName: null,
+    })
+  }
+
+  return Array.from(deduped.values())
+}
+
+/**
+ * When the optional `staff` module is absent, resolve assignable owners from
+ * `GET /api/auth/users` so CRM apps without staff still show owner names and
+ * pickers (ownerUserId is always an auth user id).
+ *
+ * A 401/403/404 from the fallback endpoint degrades to an empty roster.
+ * A 5xx or network error propagates so the operator gets a signal.
+ * An AbortError is always rethrown so callers can distinguish cancellation.
+ */
+async function fetchAssignableUsersFallback(
+  query: string,
+  options: { page: number; pageSize: number; activeOrgId?: string | null; signal?: AbortSignal },
+): Promise<AssignableStaffMembersPage> {
+  const { page, pageSize, activeOrgId, signal } = options
+  const params = new URLSearchParams()
+  params.set('page', String(page))
+  params.set('pageSize', String(pageSize))
+  // Only scope to the active organization when one is known. A null/missing
+  // orgId on the session resolves to `organizationId IS NULL` server-side,
+  // which returns only org-less users and drops all deal owners that belong
+  // to any organization.
+  if (activeOrgId) {
+    params.set('scopeToActiveOrganization', '1')
+  }
+  const normalizedQuery = query.trim()
+  if (normalizedQuery.length > 0) {
+    params.set('search', normalizedQuery)
+  }
+
+  let call: Awaited<ReturnType<typeof apiCall<AuthUsersListResponse>>> | null
+  try {
+    call = await apiCall<AuthUsersListResponse>(
+      `/api/auth/users?${params.toString()}`,
+      { headers: { 'x-om-forbidden-redirect': '0' }, signal },
+      { fallback: null },
+    )
+  } catch (err) {
+    // apiCall rethrows AbortError — preserve it so callers can distinguish
+    // cancellation from an empty roster.
+    if (err && typeof err === 'object' && (err as { name?: unknown }).name === 'AbortError') throw err
+    // HTTP 4xx from apiFetch (rare) degrades to an empty roster; network/5xx propagate.
+    if (isAuthUsersFallbackDegradableHttpError(err)) {
+      call = null
+    } else {
+      throw err
+    }
+  }
+
+  if (!call) {
+    return { items: [], servedCount: 0, total: 0, page, pageSize }
+  }
+  // 5xx: backend is down — propagate so operators get a signal rather than silent empty pickers.
+  if (!call.ok && call.status >= 500) {
+    throw Object.assign(new Error(`[internal] Auth users lookup failed (${call.status})`), { status: call.status })
+  }
+  // 401/403/404: permission not granted or endpoint gone — degrade to empty roster.
+  if (!call.ok) {
+    return { items: [], servedCount: 0, total: 0, page, pageSize }
+  }
+
+  const rawItems = Array.isArray(call.result?.items) ? (call.result.items as AuthUserListItem[]) : []
+  const items = mapAuthUsersToAssignable(rawItems)
+
+  return {
+    items,
+    servedCount: rawItems.length,
+    total:
+      typeof call.result?.total === 'number' && Number.isFinite(call.result.total)
+        ? call.result.total
+        : items.length,
+    // /api/auth/users does not return page/pageSize; fall back to the values passed in.
+    page,
+    pageSize,
+  }
+}
+
+export async function fetchAssignableStaffMembersPage(
+  query: string,
+  options?: { page?: number; pageSize?: number; activeOrgId?: string | null; signal?: AbortSignal },
+): Promise<AssignableStaffMembersPage> {
+  const page = options?.page ?? 1
+  const pageSize = options?.pageSize ?? 24
+  const params = new URLSearchParams()
+  params.set('page', String(page))
+  params.set('pageSize', String(pageSize))
+  const normalizedQuery = query.trim()
+  if (normalizedQuery.length > 0) {
+    params.set('search', normalizedQuery)
+  }
+
+  let data: AssignableStaffResponse
+  try {
+    data = await readApiResultOrThrow<AssignableStaffResponse>(
+      `/api/staff/team-members/assignable?${params.toString()}`,
+      options?.signal ? { signal: options.signal } : undefined,
+    )
+  } catch (error) {
+    if (isAssignableEndpointMissing(error)) {
+      return fetchAssignableUsersFallback(query, {
+        page,
+        pageSize,
+        activeOrgId: options?.activeOrgId,
+        signal: options?.signal,
+      })
+    }
+    throw error
+  }
+
+  const rawItems = Array.isArray(data?.items) ? data.items : []
+  const items = mapStaffItems(rawItems)
+
   return {
-    items: Array.from(deduped.values()),
+    items,
     servedCount: rawItems.length,
     total:
       typeof data?.total === 'number' && Number.isFinite(data.total)
         ? data.total
-        : deduped.size,
+        : items.length,
     page:
       typeof data?.page === 'number' && Number.isFinite(data.page)
         ? data.page
@@ -150,7 +288,7 @@ export async function fetchAssignableStaffMembersPage(
 
 export async function fetchAssignableStaffMembers(
   query: string,
-  options?: { pageSize?: number; signal?: AbortSignal },
+  options?: { pageSize?: number; activeOrgId?: string | null; signal?: AbortSignal },
 ): Promise<AssignableStaffMember[]> {
   const result = await fetchAssignableStaffMembersPage(query, options)
   return result.items

package/src/modules/customers/setup.ts

@@ -84,6 +84,11 @@ export const setup: ModuleSetupConfig = {
   defaultRoleFeatures: {
     admin: [
       'customers.*',
+      // `auth.users.list` is granted alongside `customers.*` so the owner picker resolves
+      // user names in CRM-preset apps where the optional `staff` module is absent.
+      // Without it the fallback to /api/auth/users returns 403 and owners show as "Unknown".
+      // Existing tenants pick this up via `yarn mercato auth sync-role-acls`.
+      'auth.users.list',
     ],
     employee: [
       'customers.people.view',
@@ -103,6 +108,9 @@ export const setup: ModuleSetupConfig = {
       'customers.roles.view',
       'customers.roles.manage',
       'customers.email.compose',
+      // Required so the staff-absent fallback to /api/auth/users succeeds for employees too.
+      // See `admin` entry above for full rationale.
+      'auth.users.list',
     ],
   },
 }

package/src/modules/data_sync/api/schedules/[id]/route.ts

@@ -6,6 +6,8 @@ import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { readOptimisticLockExpected } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { isInvalidScheduleValueError } from '@open-mercato/shared/lib/schedule/invalidScheduleValue'
+import { buildScheduleValueErrorBody } from '../../../lib/schedule-value'
 import { updateSyncScheduleSchema } from '../../../data/validators'
 import type { SyncScheduleService } from '../../../lib/sync-schedule-service'
 import { serializeSchedule } from '../serialize'
@@ -143,6 +145,9 @@ export async function PUT(req: Request, ctx: { params?: Promise<{ id?: string }>
     if (isCrudHttpError(error)) {
       return NextResponse.json(error.body, { status: error.status })
     }
+    if (isInvalidScheduleValueError(error)) {
+      return NextResponse.json(buildScheduleValueErrorBody(error.scheduleType), { status: 422 })
+    }
     const message = error instanceof Error ? error.message : 'Failed to update sync schedule'
     return NextResponse.json({ error: message }, { status: 422 })
   }

package/src/modules/data_sync/api/schedules/route.ts

@@ -8,6 +8,8 @@ import type { SyncScheduleService } from '../../lib/sync-schedule-service'
 import { serializeSchedule } from './serialize'
 import { readOptimisticLockExpected } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { isInvalidScheduleValueError } from '@open-mercato/shared/lib/schedule/invalidScheduleValue'
+import { buildScheduleValueErrorBody } from '../../lib/schedule-value'
 import {
   runCrudMutationGuardAfterSuccess,
   validateCrudMutationGuard,
@@ -120,6 +122,9 @@ export async function POST(req: Request) {
     if (isCrudHttpError(error)) {
       return NextResponse.json(error.body, { status: error.status })
     }
+    if (isInvalidScheduleValueError(error)) {
+      return NextResponse.json(buildScheduleValueErrorBody(error.scheduleType), { status: 422 })
+    }
     const message = error instanceof Error ? error.message : 'Failed to save sync schedule'
     return NextResponse.json({ error: message }, { status: 422 })
   }

package/src/modules/data_sync/backend/data-sync/page.tsx

@@ -30,6 +30,8 @@ import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimi
 import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
+import { isValidScheduleInterval } from '@open-mercato/shared/lib/schedule/interval'
+import { hasScheduleValueFieldError } from '@open-mercato/core/modules/data_sync/lib/schedule-value'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { cn } from '@open-mercato/shared/lib/utils'
 import {
@@ -134,6 +136,19 @@ type SyncScheduleEditorState = {
 
 const DEFAULT_TIMEZONE = Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC'
 
+const SCHEDULE_VALUE_ERROR_ID = 'data-sync-dashboard-schedule-value-error'
+
+type ScheduleValueError = 'empty' | 'format' | null
+
+function detectScheduleValueError(
+  scheduleType: 'cron' | 'interval',
+  scheduleValue: string,
+): ScheduleValueError {
+  if (scheduleValue.length === 0) return 'empty'
+  if (scheduleType === 'interval' && !isValidScheduleInterval(scheduleValue)) return 'format'
+  return null
+}
+
 /** Matches `runSyncSchema`'s own default, so omitting the field submits this value. */
 const DEFAULT_BATCH_SIZE = '100'
 
@@ -190,6 +205,7 @@ export default function SyncRunsDashboardPage() {
   const [isLoadingSchedule, setIsLoadingSchedule] = React.useState(false)
   const [isSavingSchedule, setIsSavingSchedule] = React.useState(false)
   const [isDeletingSchedule, setIsDeletingSchedule] = React.useState(false)
+  const [scheduleValueError, setScheduleValueError] = React.useState<ScheduleValueError>(null)
   const [reloadToken, setReloadToken] = React.useState(0)
   const scopeVersion = useOrganizationScopeVersion()
   const t = useT()
@@ -350,6 +366,7 @@ export default function SyncRunsDashboardPage() {
       }
 
       const record = Array.isArray(call.result?.items) ? call.result?.items[0] : undefined
+      setScheduleValueError(null)
       if (!record) {
         setScheduleEditor(buildDefaultScheduleState(selectedEntityType))
         setIsLoadingSchedule(false)
@@ -375,8 +392,17 @@ export default function SyncRunsDashboardPage() {
 
   const updateScheduleEditor = React.useCallback((changes: Partial<SyncScheduleEditorState>) => {
     setScheduleEditor((current) => ({ ...current, ...changes }))
+    if (changes.scheduleValue !== undefined || changes.scheduleType !== undefined) {
+      setScheduleValueError(null)
+    }
   }, [])
 
+  const scheduleValueErrorMessage = scheduleValueError === 'empty'
+    ? t('data_sync.dashboard.schedule.invalidValue', 'Provide a schedule value before saving.')
+    : scheduleEditor.scheduleType === 'cron'
+      ? t('data_sync.dashboard.schedule.invalidCron', 'Enter a cron expression the scheduler can parse, for example `0 * * * *`.')
+      : t('data_sync.dashboard.schedule.invalidInterval', 'Enter a whole number followed by s, m, h or d (for example `15m`, `1h` or `24h`), at least one minute long.')
+
   const handleCancel = React.useCallback(async (row: SyncRunRow) => {
     // optimistic-lock-exempt: run lifecycle action endpoint (cancel), not a concurrent record edit
     const call = await apiCall(`/api/data_sync/runs/${encodeURIComponent(row.id)}/cancel`, {
@@ -477,11 +503,18 @@ export default function SyncRunsDashboardPage() {
 
   const handleSaveSchedule = React.useCallback(async () => {
     if (!selectedIntegration || !selectedEntityType) return
-    if (scheduleEditor.scheduleValue.trim().length === 0) {
-      flash(t('data_sync.dashboard.schedule.invalidValue', 'Provide a schedule value before saving.'), 'error')
+    const scheduleValue = scheduleEditor.scheduleValue.trim()
+
+    // The documented interval format is checked here so a value the scheduler
+    // can never run never reaches the API; cron stays server-validated and
+    // comes back through the same inline field error.
+    const valueError = detectScheduleValueError(scheduleEditor.scheduleType, scheduleValue)
+    if (valueError) {
+      setScheduleValueError(valueError)
       return
     }
 
+    setScheduleValueError(null)
     setIsSavingSchedule(true)
     try {
       const call = await runMutation({
@@ -499,7 +532,7 @@ export default function SyncRunsDashboardPage() {
               entityType: selectedEntityType,
               direction: selectedDirection,
               scheduleType: scheduleEditor.scheduleType,
-              scheduleValue: scheduleEditor.scheduleValue.trim(),
+              scheduleValue,
               timezone: scheduleEditor.timezone.trim() || DEFAULT_TIMEZONE,
               fullSync: scheduleEditor.fullSync,
               isEnabled: scheduleEditor.isEnabled,
@@ -511,7 +544,7 @@ export default function SyncRunsDashboardPage() {
           entityType: selectedEntityType,
           direction: selectedDirection,
           scheduleType: scheduleEditor.scheduleType,
-          scheduleValue: scheduleEditor.scheduleValue.trim(),
+          scheduleValue,
           timezone: scheduleEditor.timezone.trim() || DEFAULT_TIMEZONE,
           fullSync: scheduleEditor.fullSync,
           isEnabled: scheduleEditor.isEnabled,
@@ -524,6 +557,10 @@ export default function SyncRunsDashboardPage() {
       })
 
       if (!call.ok || !call.result) {
+        if (hasScheduleValueFieldError(call.result)) {
+          setScheduleValueError('format')
+          return
+        }
         const conflictError = Object.assign(
           new Error((call.result as { error?: string } | null)?.error ?? t('data_sync.dashboard.schedule.error', 'Failed to save recurring schedule')),
           {
@@ -965,7 +1002,14 @@ export default function SyncRunsDashboardPage() {
                       onChange={(event) => updateScheduleEditor({ scheduleValue: event.target.value })}
                       disabled={isLoadingSchedule || isSavingSchedule || isDeletingSchedule || !selectedIntegration || !selectedEntityType}
                       placeholder={scheduleEditor.scheduleType === 'cron' ? '0 * * * *' : '1h'}
+                      aria-invalid={scheduleValueError ? true : undefined}
+                      aria-describedby={scheduleValueError ? SCHEDULE_VALUE_ERROR_ID : undefined}
                     />
+                    {scheduleValueError ? (
+                      <p id={SCHEDULE_VALUE_ERROR_ID} className="text-xs text-status-error-text">
+                        {scheduleValueErrorMessage}
+                      </p>
+                    ) : null}
                     <p className="text-xs text-muted-foreground">
                       {scheduleEditor.scheduleType === 'cron'
                         ? t('data_sync.dashboard.schedule.cronHelp', 'Example: `0 * * * *` runs at the start of every hour.')

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

@@ -21,7 +21,9 @@ import {
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { Switch } from '@open-mercato/ui/primitives/switch'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
+import { isValidScheduleInterval } from '@open-mercato/shared/lib/schedule/interval'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { hasScheduleValueFieldError } from '../lib/schedule-value'
 import { getSyncSummaryVariant } from '../lib/syncRunStatus'
 import type { RunParameter } from '../lib/adapter'
 import { getApplicableRunParameters } from '../lib/run-parameters'
@@ -122,6 +124,21 @@ function buildScheduleKey(entityType: string, direction: 'import' | 'export'): s
   return `${entityType}:${direction}`
 }
 
+type ScheduleValueError = 'empty' | 'format' | undefined
+
+function buildScheduleValueErrorId(scheduleKey: string): string {
+  return `data-sync-schedule-value-error-${scheduleKey.replace(/[^a-zA-Z0-9]+/g, '-')}`
+}
+
+function detectScheduleValueError(
+  scheduleType: 'cron' | 'interval',
+  scheduleValue: string,
+): ScheduleValueError {
+  if (scheduleValue.length === 0) return 'empty'
+  if (scheduleType === 'interval' && !isValidScheduleInterval(scheduleValue)) return 'format'
+  return undefined
+}
+
 function buildScheduleEditors(
   entityTypes: string[],
   directions: Array<'import' | 'export'>,
@@ -163,6 +180,17 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
   const [runningKey, setRunningKey] = React.useState<string | null>(null)
   const [savingKey, setSavingKey] = React.useState<string | null>(null)
   const [deletingKey, setDeletingKey] = React.useState<string | null>(null)
+  const [valueErrors, setValueErrors] = React.useState<Record<string, ScheduleValueError>>({})
+
+  const describeScheduleValueError = React.useCallback((
+    valueError: ScheduleValueError,
+    scheduleType: 'cron' | 'interval',
+  ) => {
+    if (valueError === 'empty') return t('data_sync.dashboard.schedule.invalidValue', 'Provide a schedule value before saving.')
+    return scheduleType === 'cron'
+      ? t('data_sync.dashboard.schedule.invalidCron', 'Enter a cron expression the scheduler can parse, for example `0 * * * *`.')
+      : t('data_sync.dashboard.schedule.invalidInterval', 'Enter a whole number followed by s, m, h or d (for example `15m`, `1h` or `24h`), at least one minute long.')
+  }, [t])
 
   const load = React.useCallback(async () => {
     setIsLoading(true)
@@ -178,6 +206,7 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
       const supportedEntities = resolvedOption?.supportedEntities ?? []
       const supportedDirections = getSupportedDirections(resolvedOption?.direction)
       setSchedules(buildScheduleEditors(supportedEntities, supportedDirections, schedulesCall.result?.items ?? []))
+      setValueErrors({})
     } catch (error) {
       const message = error instanceof Error ? error.message : t('data_sync.integrationTab.loadError', 'Failed to load sync schedules.')
       flash(message, 'error')
@@ -214,6 +243,9 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
         ...patch,
       },
     }))
+    if (patch.scheduleValue !== undefined || patch.scheduleType !== undefined) {
+      setValueErrors((current) => (current[key] ? { ...current, [key]: undefined } : current))
+    }
   }, [])
 
   const handleStartSync = React.useCallback(async (entityType: string, direction: 'import' | 'export', scheduleKey: string) => {
@@ -281,6 +313,18 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
 
   const handleSaveSchedule = React.useCallback(async (entityType: string, direction: 'import' | 'export', scheduleKey: string) => {
     const scheduleState = schedules[scheduleKey] ?? buildDefaultScheduleState(entityType)
+    const scheduleValue = scheduleState.scheduleValue.trim()
+
+    // The documented interval format is checked here so a value the scheduler
+    // can never run never reaches the API; cron stays server-validated and
+    // comes back through the same inline field error.
+    const valueError = detectScheduleValueError(scheduleState.scheduleType, scheduleValue)
+    if (valueError) {
+      setValueErrors((current) => ({ ...current, [scheduleKey]: valueError }))
+      return
+    }
+
+    setValueErrors((current) => (current[scheduleKey] ? { ...current, [scheduleKey]: undefined } : current))
     setSavingKey(scheduleKey)
     try {
       // Keyed upsert (POST). When the server resolves an existing row the save
@@ -297,7 +341,7 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
               entityType,
               direction,
               scheduleType: scheduleState.scheduleType,
-              scheduleValue: scheduleState.scheduleValue,
+              scheduleValue,
               timezone: scheduleState.timezone,
               fullSync: scheduleState.fullSync,
               isEnabled: scheduleState.isEnabled,
@@ -309,7 +353,7 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
           entityType,
           direction,
           scheduleType: scheduleState.scheduleType,
-          scheduleValue: scheduleState.scheduleValue,
+          scheduleValue,
           timezone: scheduleState.timezone,
           fullSync: scheduleState.fullSync,
           isEnabled: scheduleState.isEnabled,
@@ -322,6 +366,10 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
       })
 
       if (!call.ok || !call.result) {
+        if (hasScheduleValueFieldError(call.result)) {
+          setValueErrors((current) => ({ ...current, [scheduleKey]: 'format' }))
+          return
+        }
         const conflictError = Object.assign(
           new Error((call.result as { error?: string } | null)?.error ?? 'Failed to save schedule'),
           {
@@ -498,6 +546,7 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
                 const isSaving = savingKey === row.key
                 const isDeleting = deletingKey === row.key
                 const controlsDisabled = isRunning || isSaving || isDeleting
+                const valueError = valueErrors[row.key]
                 return (
                   <tr key={row.key} className="border-t align-top">
                     <td className="px-3 py-3 font-medium">{formatEntityTypeLabel(row.entityType)}</td>
@@ -525,7 +574,17 @@ export function IntegrationScheduleTab(props: IntegrationScheduleTabProps) {
                         onChange={(event) => updateScheduleEditor(row.key, { scheduleValue: event.target.value }, row.entityType)}
                         disabled={controlsDisabled}
                         placeholder={scheduleState.scheduleType === 'cron' ? '0 * * * *' : '1h'}
+                        aria-invalid={valueError ? true : undefined}
+                        aria-describedby={valueError ? buildScheduleValueErrorId(row.key) : undefined}
+                        aria-label={scheduleState.scheduleType === 'cron'
+                          ? t('data_sync.dashboard.schedule.cronValue', 'Cron expression')
+                          : t('data_sync.dashboard.schedule.intervalValue', 'Interval')}
                       />
+                      {valueError ? (
+                        <p id={buildScheduleValueErrorId(row.key)} className="mt-1 text-xs text-status-error-text">
+                          {describeScheduleValueError(valueError, scheduleState.scheduleType)}
+                        </p>
+                      ) : null}
                     </td>
                     <td className="px-3 py-3">
                       <Input

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

@@ -1,4 +1,6 @@
 import { z } from 'zod'
+import { isValidScheduleInterval } from '@open-mercato/shared/lib/schedule/interval'
+import { SCHEDULE_VALUE_FIELD, SCHEDULE_VALUE_FORMAT_MESSAGES } from '../lib/schedule-value'
 
 export const runSyncSchema = z.object({
   integrationId: z.string().min(1),
@@ -46,6 +48,28 @@ export const listSyncSchedulesQuerySchema = z.object({
   pageSize: z.coerce.number().int().min(1).max(100).default(20),
 })
 
+/**
+ * The documented interval format is part of the API contract, so a value the
+ * scheduler can never run (`"3600"`) is rejected here instead of surfacing an
+ * internal scheduler message from deep inside the write path. The value is
+ * checked exactly as the scheduler will receive it — surrounding whitespace is
+ * not tolerated here, because the scheduler's anchored parser would reject it
+ * later. Cron is left to that parser, which reports back through the same
+ * `scheduleValue` field error.
+ */
+function refineScheduleValueFormat(
+  value: { scheduleType?: 'cron' | 'interval'; scheduleValue?: string },
+  ctx: z.RefinementCtx,
+): void {
+  if (value.scheduleType !== 'interval' || typeof value.scheduleValue !== 'string') return
+  if (isValidScheduleInterval(value.scheduleValue)) return
+  ctx.addIssue({
+    code: 'custom',
+    path: [SCHEDULE_VALUE_FIELD],
+    message: SCHEDULE_VALUE_FORMAT_MESSAGES.interval,
+  })
+}
+
 export const createSyncScheduleSchema = z.object({
   integrationId: z.string().min(1),
   entityType: z.string().min(1),
@@ -55,7 +79,7 @@ export const createSyncScheduleSchema = z.object({
   timezone: z.string().min(1).default('UTC'),
   fullSync: z.boolean().default(false),
   isEnabled: z.boolean().default(true),
-})
+}).superRefine(refineScheduleValueFormat)
 
 export const updateSyncScheduleSchema = z.object({
   integrationId: z.string().min(1).optional(),
@@ -68,7 +92,7 @@ export const updateSyncScheduleSchema = z.object({
   isEnabled: z.boolean().optional(),
 }).refine((value) => Object.keys(value).length > 0, {
   message: 'At least one field must be updated',
-})
+}).superRefine(refineScheduleValueFormat)
 
 export type CreateSyncScheduleInput = z.infer<typeof createSyncScheduleSchema>
 export type UpdateSyncScheduleInput = z.infer<typeof updateSyncScheduleSchema>

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

@@ -31,6 +31,8 @@
   "data_sync.dashboard.schedule.interval": "Interval",
   "data_sync.dashboard.schedule.intervalHelp": "Example: `1h`, `6h`, or `24h` for repeating intervals.",
   "data_sync.dashboard.schedule.intervalValue": "Interval",
+  "data_sync.dashboard.schedule.invalidCron": "Geben Sie einen Cron-Ausdruck an, den der Scheduler verarbeiten kann, zum Beispiel `0 * * * *`.",
+  "data_sync.dashboard.schedule.invalidInterval": "Geben Sie eine ganze Zahl mit der Einheit s, m, h oder d an (zum Beispiel `15m`, `1h` oder `24h`), mindestens eine Minute lang.",
   "data_sync.dashboard.schedule.invalidValue": "Provide a schedule value before saving.",
   "data_sync.dashboard.schedule.lastRun": "Last scheduled run: {value}",
   "data_sync.dashboard.schedule.neverRun": "Saved, but no scheduled execution has completed yet.",

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

@@ -31,6 +31,8 @@
   "data_sync.dashboard.schedule.interval": "Interval",
   "data_sync.dashboard.schedule.intervalHelp": "Example: `1h`, `6h`, or `24h` for repeating intervals.",
   "data_sync.dashboard.schedule.intervalValue": "Interval",
+  "data_sync.dashboard.schedule.invalidCron": "Enter a cron expression the scheduler can parse, for example `0 * * * *`.",
+  "data_sync.dashboard.schedule.invalidInterval": "Enter a whole number followed by s, m, h or d (for example `15m`, `1h` or `24h`), at least one minute long.",
   "data_sync.dashboard.schedule.invalidValue": "Provide a schedule value before saving.",
   "data_sync.dashboard.schedule.lastRun": "Last scheduled run: {value}",
   "data_sync.dashboard.schedule.neverRun": "Saved, but no scheduled execution has completed yet.",

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

@@ -31,6 +31,8 @@
   "data_sync.dashboard.schedule.interval": "Interval",
   "data_sync.dashboard.schedule.intervalHelp": "Example: `1h`, `6h`, or `24h` for repeating intervals.",
   "data_sync.dashboard.schedule.intervalValue": "Interval",
+  "data_sync.dashboard.schedule.invalidCron": "Introduce una expresión cron que el planificador pueda interpretar, por ejemplo `0 * * * *`.",
+  "data_sync.dashboard.schedule.invalidInterval": "Introduce un número entero seguido de s, m, h o d (por ejemplo `15m`, `1h` o `24h`), de al menos un minuto.",
   "data_sync.dashboard.schedule.invalidValue": "Provide a schedule value before saving.",
   "data_sync.dashboard.schedule.lastRun": "Last scheduled run: {value}",
   "data_sync.dashboard.schedule.neverRun": "Saved, but no scheduled execution has completed yet.",