@open-mercato/core 0.9.1-develop.7477.1.64ba865101 → 0.9.1-develop.7497.1.543ea44c40

package/src/modules/customers/api/companies/route.ts

@@ -25,6 +25,7 @@ import {
 } from '@open-mercato/shared/lib/crud/custom-fields'
 import { buildIlikeTerm } from '@open-mercato/shared/lib/db/buildIlikeTerm'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
+import { isUuidListParam, splitIdListParam } from '@open-mercato/shared/lib/crud/ids'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { consumeAdvancedFilterState, mergeAdvancedFilterTree } from '@open-mercato/shared/lib/crud/advanced-filter-integration'
 import {
@@ -64,7 +65,10 @@ const listSchema = z
     createdFrom: z.string().optional(),
     createdTo: z.string().optional(),
     id: z.string().uuid().optional(),
-    tagIds: z.string().optional(),
+    tagIds: z
+      .string()
+      .optional()
+      .refine(isUuidListParam, { message: 'tagIds must be a comma-separated list of UUIDs' }),
     tagIdsEmpty: z.string().optional(),
     excludeIds: z.string().optional(),
     excludeLinkedPersonId: z.string().uuid().optional(),
@@ -201,11 +205,7 @@ const crud = makeCrudRoute({
       if (query.source) {
         filters.source = { $eq: query.source }
       }
-      const tagIdsRaw = typeof query.tagIds === 'string' ? query.tagIds : ''
-      const tagIds = tagIdsRaw
-        .split(',')
-        .map((value: string) => value.trim())
-        .filter((value: string) => value.length > 0)
+      const tagIds = splitIdListParam(query.tagIds)
       const tagIdsEmpty = parseBooleanToken(query.tagIdsEmpty) === true
       if (tagIdsEmpty) {
         filters.id = { $eq: '00000000-0000-0000-0000-000000000000' }

package/src/modules/customers/api/deals/[id]/companies/route.ts

@@ -171,6 +171,9 @@ export async function GET(req: Request, ctx: { params?: { id?: string } }) {
     if (isCrudHttpError(error)) {
       return NextResponse.json(error.body, { status: error.status })
     }
+    if (error instanceof z.ZodError) {
+      return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed'), details: error.issues }, { status: 400 })
+    }
     logger.error('customers.deals.companies.GET', { err: error })
     return NextResponse.json({ error: translate('customers.errors.deal_companies_load_failed', 'Failed to load linked companies') }, { status: 500 })
   }

package/src/modules/customers/api/deals/[id]/people/route.ts

@@ -220,6 +220,9 @@ export async function GET(req: Request, ctx: { params?: { id?: string } }) {
     if (isCrudHttpError(error)) {
       return NextResponse.json(error.body, { status: error.status })
     }
+    if (error instanceof z.ZodError) {
+      return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed'), details: error.issues }, { status: 400 })
+    }
     logger.error('customers.deals.people.GET', { err: error })
     return NextResponse.json({ error: translate('customers.errors.deal_people_load_failed', 'Failed to load linked people') }, { status: 500 })
   }

package/src/modules/customers/api/dictionaries/kind-settings/route.ts

@@ -86,6 +86,9 @@ export async function GET(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed'), details: err.issues }, { status: 400 })
+    }
     logger.error('customers/dictionaries/kind-settings.GET', { err })
     return NextResponse.json({ error: translate('customers.errors.kind_settings_load_failed', 'Failed to load kind settings') }, { status: 500 })
   }
@@ -187,6 +190,9 @@ export async function PATCH(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed'), details: err.issues }, { status: 400 })
+    }
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })

package/src/modules/customers/api/labels/route.ts

@@ -172,6 +172,9 @@ export async function GET(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed'), details: err.issues }, { status: 400 })
+    }
     logger.error('customers/labels.GET', { err })
     return NextResponse.json({ error: translate('customers.errors.labels_load_failed', 'Failed to load labels') }, { status: 500 })
   }
@@ -186,8 +189,8 @@ function slugifyLabel(value: string): string {
 }
 
 export async function POST(req: Request) {
+  const { translate } = await resolveTranslations()
   try {
-    const { translate } = await resolveTranslations()
     const container = await createRequestContainer()
     const auth = await getAuthFromRequest(req)
     const actorUserId = resolveLabelActorUserId(auth)
@@ -207,6 +210,9 @@ export async function POST(req: Request) {
       throw new CrudHttpError(400, { error: translate('customers.errors.organization_required', 'Organization context is required') })
     }
     const slug = body.slug || slugifyLabel(body.label)
+    if (!slug) {
+      throw new CrudHttpError(400, { error: translate('customers.errors.label_slug_invalid', 'Label must contain at least one letter or number') })
+    }
 
     const guardResult = await validateCrudMutationGuard(container, {
       tenantId: auth.tenantId,
@@ -289,6 +295,9 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed'), details: err.issues }, { status: 400 })
+    }
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })

package/src/modules/customers/api/people/[id]/companies/[linkId]/route.ts

@@ -227,6 +227,9 @@ export async function PATCH(req: Request, ctx: { params?: { id?: string; linkId?
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed'), details: err.issues }, { status: 400 })
+    }
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
@@ -335,6 +338,9 @@ export async function DELETE(req: Request, ctx: { params?: { id?: string; linkId
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed'), details: err.issues }, { status: 400 })
+    }
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })

package/src/modules/customers/api/people/[id]/companies/enriched/route.ts

@@ -387,6 +387,9 @@ export async function GET(req: Request, ctx: { params?: { id?: string } }) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed'), details: err.issues }, { status: 400 })
+    }
     logger.error('/companies/enriched] GET failed', { component: 'people/[id', err })
     return NextResponse.json({ error: translate('customers.errors.internal', 'Internal server error') }, { status: 500 })
   }

package/src/modules/customers/api/people/[id]/companies/route.ts

@@ -95,6 +95,9 @@ export async function GET(req: Request, ctx: { params?: { id?: string } }) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed'), details: err.issues }, { status: 400 })
+    }
     return NextResponse.json({ error: translate('customers.errors.internal', 'Internal server error') }, { status: 500 })
   }
 }
@@ -211,6 +214,9 @@ export async function POST(req: Request, ctx: { params?: { id?: string } }) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    if (err instanceof z.ZodError) {
+      return NextResponse.json({ error: translate('customers.errors.validationFailed', 'Validation failed'), details: err.issues }, { status: 400 })
+    }
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })

package/src/modules/customers/api/people/route.ts

@@ -21,6 +21,7 @@ import {
 import { buildCustomFieldFiltersFromQuery, extractAllCustomFieldEntries, splitCustomFieldPayload } from '@open-mercato/shared/lib/crud/custom-fields'
 import { buildIlikeTerm } from '@open-mercato/shared/lib/db/buildIlikeTerm'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
+import { isUuidListParam, splitIdListParam } from '@open-mercato/shared/lib/crud/ids'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { consumeAdvancedFilterState, mergeAdvancedFilterTree } from '@open-mercato/shared/lib/crud/advanced-filter-integration'
 import {
@@ -60,7 +61,10 @@ const listSchema = z
     sortField: z.string().optional(),
     sortDir: z.enum(['asc', 'desc']).optional(),
     id: z.string().uuid().optional(),
-    tagIds: z.string().optional(),
+    tagIds: z
+      .string()
+      .optional()
+      .refine(isUuidListParam, { message: 'tagIds must be a comma-separated list of UUIDs' }),
     tagIdsEmpty: z.string().optional(),
     excludeIds: z.string().optional(),
     excludeLinkedCompanyId: z.string().uuid().optional(),
@@ -205,11 +209,7 @@ const crud = makeCrudRoute({
       if (query.source) {
         filters.source = { $eq: query.source }
       }
-      const tagIdsRaw = typeof query.tagIds === 'string' ? query.tagIds : ''
-      const tagIds = tagIdsRaw
-        .split(',')
-        .map((value: string) => value.trim())
-        .filter((value: string) => value.length > 0)
+      const tagIds = splitIdListParam(query.tagIds)
       const tagIdsEmpty = parseBooleanToken(query.tagIdsEmpty) === true
       if (tagIdsEmpty) {
         filters.id = { $eq: '00000000-0000-0000-0000-000000000000' }

package/src/modules/customers/commands/deals.ts

@@ -21,6 +21,7 @@ import {
   CustomerDealStageTransition,
   CustomerPipelineStage,
 } from '../data/entities'
+import { CustomFieldValue } from '@open-mercato/core/modules/entities/data/entities'
 import {
   dealCreateSchema,
   dealUpdateSchema,
@@ -1119,6 +1120,7 @@ const deleteDealCommand: CommandHandler<{ body?: Record<string, unknown>; query?
       await deleteDealStageTransitions(em, record)
       await em.nativeDelete(CustomerDealPersonLink, { deal: record })
       await em.nativeDelete(CustomerDealCompanyLink, { deal: record })
+      await em.nativeDelete(CustomFieldValue, { entityId: DEAL_ENTITY_ID, recordId: record.id })
       em.remove(record)
       await em.flush()
 

package/src/modules/customers/components/ActivityTypeEditor.tsx

@@ -35,12 +35,12 @@ type FormValues = Record<string, unknown>
 
 const defaults = calendarEventTypes[0]!.behavior
 
-function initialValues(item: ScopedCalendarEventType | null): FormValues {
+function initialValues(item: ScopedCalendarEventType | null, version: string | null | undefined): FormValues {
   const behavior = item?.behavior ?? defaults
   return {
     value: item?.key ?? '', label: item?.label ?? '', icon: item?.icon ?? '', color: item?.color ?? '',
     order: behavior.order, baseKind: behavior.baseKind, selectable: behavior.selectable,
-    ...behavior.fields, customFieldsetIds: [...behavior.customFieldsetIds], updatedAt: item?.updatedAt ?? undefined,
+    ...behavior.fields, customFieldsetIds: [...behavior.customFieldsetIds], updatedAt: version ?? undefined,
   }
 }
 
@@ -51,6 +51,7 @@ export function ActivityTypeEditor({ title, description }: { title: string; desc
   const [items, setItems] = React.useState<ScopedCalendarEventType[]>([])
   const [rows, setRows] = React.useState<DictionaryRow[]>([])
   const [selected, setSelected] = React.useState<ScopedCalendarEventType | null | undefined>(undefined)
+  const [selectedVersion, setSelectedVersion] = React.useState<string | null | undefined>(undefined)
   const [fieldsets, setFieldsets] = React.useState<Fieldset[]>([])
   const [fieldsetsStatus, setFieldsetsStatus] = React.useState<'loading' | 'ready' | 'error'>('loading')
   const [fieldsetAttempt, setFieldsetAttempt] = React.useState(0)
@@ -103,6 +104,10 @@ export function ActivityTypeEditor({ title, description }: { title: string; desc
   }, [selected, fieldsetAttempt])
 
   const localRow = (key: string) => rows.find((row) => row.value.toLowerCase() === key && !row.isInherited)
+  const openEditor = (item: ScopedCalendarEventType | null) => {
+    setSelectedVersion(item ? localRow(item.key)?.updatedAt ?? item.updatedAt : undefined)
+    setSelected(item)
+  }
   const remove = async (item: ScopedCalendarEventType) => {
     const row = localRow(item.key)
     if (!row) return
@@ -157,6 +162,7 @@ export function ActivityTypeEditor({ title, description }: { title: string; desc
     { id: 'behavior', title: t('customers.config.activityTypes.behavior', 'Form behavior'), fields: ['baseKind', 'selectable', 'endTime', 'allDay', 'recurrence', 'location', 'people', 'priority', 'resources'] },
     ...(fieldsets.length || selected?.behavior.customFieldsetIds.length ? [{ id: 'fieldsets', fields: ['customFieldsetIds'] }] : []),
   ]
+  const formInitialValues = React.useMemo(() => initialValues(selected ?? null, selectedVersion), [selected, selectedVersion])
   const save = async (values: FormValues) => {
     const key = String(values.value ?? '').trim()
     if (!calendarEventTypeKeySchema.safeParse(key).success) throw createCrudFormError(t('customers.config.activityTypes.invalidKey', 'Use a lowercase key with letters, numbers, hyphens, or underscores.'), { value: t('customers.config.activityTypes.invalidKey', 'Use a lowercase key with letters, numbers, hyphens, or underscores.') })
@@ -206,11 +212,11 @@ export function ActivityTypeEditor({ title, description }: { title: string; desc
       {status === 'error' ? <div className="space-y-3"><ErrorMessage label={t('customers.config.activityTypes.loadFailed', 'Failed to load activity types.')} /><Button type="button" onClick={() => { void load() }}>{t('customers.config.activityTypes.retry', 'Retry')}</Button></div> :
         <DataTable<ScopedCalendarEventType> embedded columns={columns} data={items} isLoading={status === 'loading'}
           title={title} titleHeadingLevel={2} emptyState={t('customers.config.activityTypes.empty', 'No activity types available.')}
-          actions={<Button type="button" size="sm" onClick={() => setSelected(null)}>{t('customers.config.activityTypes.new', 'New activity type')}</Button>}
+          actions={<Button type="button" size="sm" onClick={() => openEditor(null)}>{t('customers.config.activityTypes.new', 'New activity type')}</Button>}
           refreshButton={{ label: t('customers.config.activityTypes.refresh', 'Refresh'), onRefresh: load, isRefreshing: status === 'loading' }}
           rowActions={(item) => {
             const actions: RowActionItem[] = [{ id: 'edit', label: item.adminConfigurable
-              ? t('customers.config.activityTypes.configure', 'Configure') : t('customers.config.activityTypes.view', 'View'), onSelect: () => setSelected(item) }]
+              ? t('customers.config.activityTypes.configure', 'Configure') : t('customers.config.activityTypes.view', 'View'), onSelect: () => openEditor(item) }]
             if (localRow(item.key)) actions.push({ id: 'delete', label: item.source === 'dictionary'
               ? t('customers.config.activityTypes.delete', 'Delete') : t('customers.config.activityTypes.reset', 'Reset override'),
               destructive: true, onSelect: () => { void remove(item) } })
@@ -230,7 +236,7 @@ export function ActivityTypeEditor({ title, description }: { title: string; desc
         {fieldsetsStatus === 'ready' && fieldsets.length === 0 ? <p className="text-sm text-muted-foreground">{t('customers.config.activityTypes.noFieldsets', 'No custom-field fieldsets are defined yet.')}</p> : null}
         {selected !== undefined && fieldsetsStatus === 'ready' ? <CrudForm<FormValues> key={selected?.key ?? 'new'} embedded
           readOnly={selected?.adminConfigurable === false} fields={fields} groups={groups}
-          initialValues={initialValues(selected)} onSubmit={save} submitLabel={t('customers.config.activityTypes.save', 'Save')}
+          initialValues={formInitialValues} onSubmit={save} submitLabel={t('customers.config.activityTypes.save', 'Save')}
           extraActions={<Button type="button" variant="outline" onClick={() => setSelected(undefined)}>{t('customers.config.dictionaries.dialog.cancel', 'Cancel')}</Button>} /> : null}
       </DialogContent>
     </Dialog>

package/src/modules/customers/components/detail/InlineEditors.tsx

@@ -19,6 +19,7 @@ import {
   type InlineMultilineEditorProps,
   type InlineTextEditorProps,
   InlineSelectEditor as UiInlineSelectEditor,
+  INLINE_TRIGGER_HIDDEN_CLASSES,
   type InlineSelectOption,
 } from '@open-mercato/ui/backend/detail/InlineEditors'
 import {
@@ -372,6 +373,9 @@ export function InlineNextInteractionEditor({
   const dateErrorId = React.useId()
   const nameErrorId = React.useId()
   const containerClasses = cn('group relative rounded-lg border p-4', activateOnClick && !editing ? 'cursor-pointer' : null)
+  const triggerLabel = editing
+    ? t('ui.detail.inline.cancel', 'Cancel')
+    : t('ui.detail.inline.edit', 'Edit')
   const requiredMessage = React.useMemo(
     () => t('customers.people.detail.inline.required', 'This field is required'),
     [t],
@@ -535,16 +539,16 @@ export function InlineNextInteractionEditor({
         size="sm"
         className={cn(
           'absolute right-3 top-3 transition-opacity duration-150',
-          editing
-            ? 'opacity-100'
-            : 'opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 focus-visible:opacity-100',
+          editing ? 'opacity-100' : INLINE_TRIGGER_HIDDEN_CLASSES,
         )}
         onClick={(event) => {
           event.stopPropagation()
           setEditing((state) => !state)
         }}
+        aria-label={triggerLabel}
+        title={triggerLabel}
       >
-        {editing ? <X className="h-4 w-4" /> : <Pencil className="h-4 w-4" />}
+        {editing ? <X className="h-4 w-4" aria-hidden /> : <Pencil className="h-4 w-4" aria-hidden />}
       </Button>
       <div className="flex items-start gap-2" {...interactiveProps}>
         <div className="flex-1">

package/src/modules/customers/components/detail/PersonHighlights.tsx

@@ -322,7 +322,10 @@ export function PersonHighlights({
           className={
             editingCompany
               ? 'opacity-100'
-              : 'opacity-0 transition-opacity duration-150 group-hover:opacity-100 hover:opacity-100 focus-visible:opacity-100'
+              // The enclosing panel only activates once a company is assigned, and then it
+              // navigates to that company instead of opening this editor — so without the
+              // coarse-pointer reveal the Company field cannot be set or changed on touch.
+              : 'opacity-0 transition-opacity duration-150 group-hover:opacity-100 hover:opacity-100 focus-visible:opacity-100 [@media(hover:none)]:opacity-100'
           }
         >
           {editingCompany ? <X className="h-4 w-4" /> : <Pencil className="h-4 w-4" />}

package/src/modules/customers/components/detail/PlannedActivitiesSection.tsx

@@ -171,7 +171,7 @@ export function PlannedActivitiesSection({ activities, onComplete, onSchedule, o
                   {activity.title ?? activity.body ?? activity.interactionType}
                 </span>
                 <div className="flex items-center gap-2 text-xs text-muted-foreground">
-                  <span>{activity.scheduledAt ? formatScheduledDate(activity.scheduledAt) : ''}</span>
+                  <span>{activity.scheduledAt ? formatScheduledDate(activity.scheduledAt, t) : ''}</span>
                   {activity.authorName && (
                     <>
                       <span>·</span>
@@ -235,11 +235,10 @@ function formatRelativeOverdue(isoString: string, t: TranslateFn): string {
   }
 }
 
-function formatScheduledDate(isoString: string): string {
+function formatScheduledDate(isoString: string, t: TranslateFn): string {
   try {
     const date = new Date(isoString)
-    const now = new Date()
-    const tomorrow = new Date(now)
+    const tomorrow = new Date()
     tomorrow.setDate(tomorrow.getDate() + 1)
 
     const dayName = date.toLocaleDateString(undefined, { weekday: 'short' })
@@ -247,7 +246,7 @@ function formatScheduledDate(isoString: string): string {
     const timeStr = date.toLocaleTimeString(undefined, { hour: '2-digit', minute: '2-digit' })
 
     if (isSameDay(date, tomorrow)) {
-      return `Tomorrow ${timeStr}`
+      return t('customers.timeline.planned.tomorrow', 'Tomorrow {{time}}', { time: timeStr })
     }
     return `${dayName}, ${dateStr} · ${timeStr}`
   } catch {

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

@@ -1728,6 +1728,7 @@
   "customers.errors.kind_settings_load_failed": "Einstellungen der Kategorie konnten nicht geladen werden",
   "customers.errors.label_duplicate": "Ein Label mit diesem Slug existiert bereits",
   "customers.errors.label_not_found": "Label nicht gefunden",
+  "customers.errors.label_slug_invalid": "Das Label muss mindestens einen Buchstaben oder eine Ziffer enthalten",
   "customers.errors.labels_load_failed": "Labels konnten nicht geladen werden",
   "customers.errors.lookup_failed": "Lexikon konnte nicht geladen werden",
   "customers.errors.organization_forbidden": "Organisation nicht verfügbar",
@@ -2935,6 +2936,7 @@
   "customers.timeline.planned.reschedule": "Reschedule",
   "customers.timeline.planned.schedule": "Schedule",
   "customers.timeline.planned.title": "Planned activities",
+  "customers.timeline.planned.tomorrow": "Morgen {{time}}",
   "customers.timeline.planned.upcoming": "Upcoming",
   "customers.timeline.unpin": "Unpin",
   "customers.widgets.common.unknown": "Unbekannt",

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

@@ -1728,6 +1728,7 @@
   "customers.errors.kind_settings_load_failed": "Failed to load kind settings",
   "customers.errors.label_duplicate": "A label with this slug already exists",
   "customers.errors.label_not_found": "Label not found",
+  "customers.errors.label_slug_invalid": "Label must contain at least one letter or number",
   "customers.errors.labels_load_failed": "Failed to load labels",
   "customers.errors.lookup_failed": "Failed to load dictionary entries",
   "customers.errors.organization_forbidden": "Organization not accessible",
@@ -2935,6 +2936,7 @@
   "customers.timeline.planned.reschedule": "Reschedule",
   "customers.timeline.planned.schedule": "Schedule",
   "customers.timeline.planned.title": "Planned activities",
+  "customers.timeline.planned.tomorrow": "Tomorrow {{time}}",
   "customers.timeline.planned.upcoming": "Upcoming",
   "customers.timeline.unpin": "Unpin",
   "customers.widgets.common.unknown": "Unknown",

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

@@ -1728,6 +1728,7 @@
   "customers.errors.kind_settings_load_failed": "No se pudo cargar la configuración de la categoría",
   "customers.errors.label_duplicate": "Ya existe una etiqueta con este slug",
   "customers.errors.label_not_found": "Etiqueta no encontrada",
+  "customers.errors.label_slug_invalid": "La etiqueta debe contener al menos una letra o un número",
   "customers.errors.labels_load_failed": "No se pudieron cargar las etiquetas",
   "customers.errors.lookup_failed": "No se pudo cargar el diccionario",
   "customers.errors.organization_forbidden": "Organización no accesible",
@@ -2935,6 +2936,7 @@
   "customers.timeline.planned.reschedule": "Reschedule",
   "customers.timeline.planned.schedule": "Schedule",
   "customers.timeline.planned.title": "Planned activities",
+  "customers.timeline.planned.tomorrow": "Mañana {{time}}",
   "customers.timeline.planned.upcoming": "Upcoming",
   "customers.timeline.unpin": "Unpin",
   "customers.widgets.common.unknown": "Desconocido",

package/src/modules/customers/i18n/ko.json

@@ -1728,6 +1728,7 @@
   "customers.errors.kind_settings_load_failed": "유형 설정을 불러오지 못했습니다",
   "customers.errors.label_duplicate": "이 슬러그를 가진 라벨이 이미 존재합니다",
   "customers.errors.label_not_found": "라벨을 찾을 수 없습니다",
+  "customers.errors.label_slug_invalid": "라벨에는 문자나 숫자가 하나 이상 포함되어야 합니다",
   "customers.errors.labels_load_failed": "라벨을 불러오지 못했습니다",
   "customers.errors.lookup_failed": "사전 항목을 불러오지 못했습니다",
   "customers.errors.organization_forbidden": "조직에 접근할 수 없습니다",
@@ -2935,6 +2936,7 @@
   "customers.timeline.planned.reschedule": "일정 변경",
   "customers.timeline.planned.schedule": "예약",
   "customers.timeline.planned.title": "예정된 활동",
+  "customers.timeline.planned.tomorrow": "내일 {{time}}",
   "customers.timeline.planned.upcoming": "다가오는 일정",
   "customers.timeline.unpin": "고정 해제",
   "customers.widgets.common.unknown": "알 수 없음",

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

@@ -1728,6 +1728,7 @@
   "customers.errors.kind_settings_load_failed": "Nie udało się załadować ustawień kategorii",
   "customers.errors.label_duplicate": "Etykieta o tym identyfikatorze już istnieje",
   "customers.errors.label_not_found": "Nie znaleziono etykiety",
+  "customers.errors.label_slug_invalid": "Etykieta musi zawierać co najmniej jedną literę lub cyfrę",
   "customers.errors.labels_load_failed": "Nie udało się załadować etykiet",
   "customers.errors.lookup_failed": "Nie udało się załadować słownika",
   "customers.errors.organization_forbidden": "Organizacja jest niedostępna",
@@ -2935,6 +2936,7 @@
   "customers.timeline.planned.reschedule": "Przełóż",
   "customers.timeline.planned.schedule": "Zaplanuj",
   "customers.timeline.planned.title": "Zaplanowane aktywności",
+  "customers.timeline.planned.tomorrow": "Jutro {{time}}",
   "customers.timeline.planned.upcoming": "Nadchodzące",
   "customers.timeline.unpin": "Odepnij",
   "customers.widgets.common.unknown": "Nieznane",

package/src/modules/data_sync/di.ts

@@ -20,6 +20,7 @@ type Cradle = {
   schedulerService?: {
     register: (registration: Record<string, unknown>) => Promise<void>
     unregister: (scheduleId: string) => Promise<void>
+    exists?: (scheduleId: string) => Promise<boolean>
   }
 }
 

package/src/modules/data_sync/lib/sync-schedule-service.ts

@@ -34,6 +34,15 @@ type SchedulerServiceLike = {
     isEnabled?: boolean
   }) => Promise<void>
   unregister: (scheduleId: string) => Promise<void>
+  exists?: (scheduleId: string) => Promise<boolean>
+}
+
+async function scheduledJobExists(scheduler: SchedulerServiceLike, scheduledJobId: string): Promise<boolean> {
+  // A scheduler substitute that cannot answer keeps the pre-existing behaviour:
+  // treat the registration as minted, which compensates rather than stranding an
+  // orphan on the create path where this is by far the likelier outcome.
+  if (!scheduler.exists) return false
+  return scheduler.exists(scheduledJobId)
 }
 
 export function createSyncScheduleService(em: EntityManager, schedulerService?: SchedulerServiceLike) {
@@ -162,11 +171,21 @@ export function createSyncScheduleService(em: EntityManager, schedulerService?:
 
       const id = existing?.id ?? randomUUID()
       const scheduledJobId = existing?.scheduledJobId ?? id
+      const scheduler = requireScheduler()
+      // Only a registration this call mints may be compensated below. A create
+      // mints a fresh id, so no job can already live at it. An update of a row
+      // whose scheduledJobId is null is the ambiguous case — deleteSchedule reads
+      // that null as "the job lives at row.id", and register() upserts on id — so
+      // ask the scheduler instead of assuming, otherwise compensation would
+      // delete a job this call merely overwrote.
+      const mintsRegistration = existing
+        ? !existing.scheduledJobId && !(await scheduledJobExists(scheduler, scheduledJobId))
+        : true
 
       // Validate the schedule (and register it with the scheduler) before writing
       // the SyncSchedule row — an unparseable scheduleValue must not leave a
       // persisted row with no working schedule behind it.
-      await requireScheduler().register({
+      await scheduler.register({
         id: scheduledJobId,
         name: buildScheduleName(input),
         description: buildScheduleDescription(input),
@@ -188,37 +207,70 @@ export function createSyncScheduleService(em: EntityManager, schedulerService?:
         isEnabled: input.isEnabled,
       })
 
-      const row = existing ?? em.create(SyncSchedule, {
-        id,
-        integrationId: input.integrationId,
-        entityType: input.entityType,
-        direction: input.direction,
-        scheduleType: input.scheduleType,
-        scheduleValue: input.scheduleValue,
-        timezone: input.timezone,
-        fullSync: input.fullSync,
-        isEnabled: input.isEnabled,
-        organizationId: scope.organizationId,
-        tenantId: scope.tenantId,
-      })
+      try {
+        const row = existing ?? em.create(SyncSchedule, {
+          id,
+          integrationId: input.integrationId,
+          entityType: input.entityType,
+          direction: input.direction,
+          scheduleType: input.scheduleType,
+          scheduleValue: input.scheduleValue,
+          timezone: input.timezone,
+          fullSync: input.fullSync,
+          isEnabled: input.isEnabled,
+          organizationId: scope.organizationId,
+          tenantId: scope.tenantId,
+        })
 
-      row.integrationId = input.integrationId
-      row.entityType = input.entityType
-      row.direction = input.direction
-      row.scheduleType = input.scheduleType
-      row.scheduleValue = input.scheduleValue
-      row.timezone = input.timezone
-      row.fullSync = input.fullSync
-      row.isEnabled = input.isEnabled
-      row.scheduledJobId = scheduledJobId
+        row.integrationId = input.integrationId
+        row.entityType = input.entityType
+        row.direction = input.direction
+        row.scheduleType = input.scheduleType
+        row.scheduleValue = input.scheduleValue
+        row.timezone = input.timezone
+        row.fullSync = input.fullSync
+        row.isEnabled = input.isEnabled
+        row.scheduledJobId = scheduledJobId
 
-      if (!existing) {
-        em.persist(row)
-      }
+        if (!existing) {
+          em.persist(row)
+        }
 
-      await em.flush()
+        await em.flush()
 
-      return row
+        return row
+      } catch (error: unknown) {
+        // The registration above is already durable, so a failed write would
+        // otherwise strand a live ScheduledJob the data-sync page cannot explain
+        // or delete. Only a registration this call minted is compensated: when a
+        // job was already there, register() overwrote one we inherited, and
+        // SchedulerServiceLike offers no way to restore the previous definition,
+        // so unregistering would destroy that job rather than roll anything back.
+        if (mintsRegistration) {
+          try {
+            await scheduler.unregister(scheduledJobId)
+          } catch (compensationError: unknown) {
+            logger.error('Failed to unregister the scheduled job after a schedule write failure', {
+              scheduledJobId,
+              scheduleId: id,
+              organizationId: scope.organizationId,
+              tenantId: scope.tenantId,
+              err: compensationError,
+            })
+            getTelemetryRuntime()?.reportError(compensationError, {
+              module: 'data_sync',
+              code: 'data_sync.schedule_save_compensation_failed',
+              attributes: {
+                scheduledJobId,
+                scheduleId: id,
+                organizationId: scope.organizationId,
+                tenantId: scope.tenantId,
+              },
+            })
+          }
+        }
+        throw error
+      }
     },
 
     async deleteSchedule(