@open-mercato/core 0.6.6-develop.6317.1.b3be10ab84 → 0.6.6-develop.6331.1.a33b8e99b7

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

@@ -1,7 +1,9 @@
 "use client"
 
 import * as React from 'react'
-import { apiCall, apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { AddressesSection as SharedAddressesSection } from '@open-mercato/ui/backend/detail'
 import type { AddressDataAdapter, AddressTypesAdapter, AddressFormatStrategy, SectionAction } from '@open-mercato/ui/backend/detail'
 import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'
@@ -99,6 +101,12 @@ export function AddressesSection({
                 : typeof record.isPrimary === 'boolean'
                   ? record.isPrimary
                   : false,
+            updatedAt:
+              typeof record.updated_at === 'string'
+                ? record.updated_at
+                : typeof record.updatedAt === 'string'
+                  ? record.updatedAt
+                  : null,
           }
         })
         .filter((value): value is NonNullable<typeof value> => value !== null)
@@ -107,7 +115,7 @@ export function AddressesSection({
       const response = await apiCallOrThrow<Record<string, unknown>>(
         '/api/customers/addresses',
         {
-          // optimistic-lock-exempt: address link add/remove sub-resource
+          // optimistic-lock-exempt: address create-only (no prior version to compare)
           method: 'POST',
           headers: { 'content-type': 'application/json' },
           body: JSON.stringify({
@@ -120,33 +128,47 @@ export function AddressesSection({
       )
       return response.result ?? {}
     },
-    update: async ({ id, payload }) => {
-      await apiCallOrThrow(
-        '/api/customers/addresses',
-        {
-          // optimistic-lock-exempt: address link add/remove sub-resource
-          method: 'PUT',
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify({
-            id,
-            ...payload,
-            country: payload.country ? payload.country.toUpperCase() : undefined,
-          }),
-        },
-        { errorMessage: t('customers.people.detail.addresses.error') },
-      )
+    update: async ({ id, payload, updatedAt }) => {
+      try {
+        await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(updatedAt ?? null),
+          () => apiCallOrThrow(
+            '/api/customers/addresses',
+            {
+              method: 'PUT',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify({
+                id,
+                ...payload,
+                country: payload.country ? payload.country.toUpperCase() : undefined,
+              }),
+            },
+            { errorMessage: t('customers.people.detail.addresses.error') },
+          ),
+        )
+      } catch (err) {
+        surfaceRecordConflict(err, t)
+        throw err
+      }
     },
-    delete: async ({ id }) => {
-      await apiCallOrThrow(
-        '/api/customers/addresses',
-        {
-          // optimistic-lock-exempt: address link add/remove sub-resource
-          method: 'DELETE',
-          headers: { 'content-type': 'application/json' },
-          body: JSON.stringify({ id }),
-        },
-        { errorMessage: t('customers.people.detail.addresses.error') },
-      )
+    delete: async ({ id, updatedAt }) => {
+      try {
+        await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(updatedAt ?? null),
+          () => apiCallOrThrow(
+            '/api/customers/addresses',
+            {
+              method: 'DELETE',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify({ id }),
+            },
+            { errorMessage: t('customers.people.detail.addresses.error') },
+          ),
+        )
+      } catch (err) {
+        surfaceRecordConflict(err, t)
+        throw err
+      }
     },
   }), [t])
 

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

@@ -69,6 +69,14 @@ export type DealFormProps = {
   showCancelAction?: boolean
   initialPipelineOptions?: PipelineOption[]
   initialPipelineStageOptions?: PipelineStageOption[]
+  /**
+   * Injection spot id for the form-scoped record_locks widget (e.g.
+   * `customers.deal`). Mirrors how people-v2/companies-v2 mount their save-time
+   * `crud-form:*` widget so a deal save conflict surfaces the merge dialog.
+   */
+  injectionSpotId?: string
+  /** Optimistic-lock version (`deal.updatedAt`) for the embedded CrudForm. */
+  optimisticLockUpdatedAt?: string | null
 }
 
 type EntityOption = {
@@ -732,6 +740,8 @@ export function DealForm({
   showCancelAction = true,
   initialPipelineOptions,
   initialPipelineStageOptions,
+  injectionSpotId,
+  optimisticLockUpdatedAt,
 }: DealFormProps) {
   const t = useT()
   const [pending, setPending] = React.useState(false)
@@ -1168,6 +1178,8 @@ export function DealForm({
       backHref={backHref}
       hideFooterActions={hideFooterActions}
       onDirtyChange={onDirtyChange}
+      injectionSpotId={injectionSpotId}
+      optimisticLockUpdatedAt={optimisticLockUpdatedAt}
       collapsibleGroups={collapsibleGroups}
       sortableGroups={sortableGroups}
       versionHistory={showVersionHistory && mode === 'edit' && initialValues?.id

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

@@ -438,53 +438,49 @@ export function EntityTagsDialog({
   const loadData = React.useCallback(async () => {
     setLoading(true)
     try {
-      let kindSettings: KindSetting[] = []
       const scopedQuery = new URLSearchParams()
       if (entityOrganizationId) {
         scopedQuery.set('organizationId', entityOrganizationId)
       }
-      try {
-        const settingsCall = await apiCall<{ items?: KindSetting[] }>(
-          `/api/customers/dictionaries/kind-settings${scopedQuery.size ? `?${scopedQuery.toString()}` : ''}`,
-          { cache: 'no-store', headers: { 'x-om-unauthorized-redirect': '0' } },
-        )
-        if (settingsCall.ok && settingsCall.result?.items) {
-          kindSettings = settingsCall.result.items
+
+      const loadKindSettings = async (): Promise<KindSetting[]> => {
+        try {
+          const settingsCall = await apiCall<{ items?: KindSetting[] }>(
+            `/api/customers/dictionaries/kind-settings${scopedQuery.size ? `?${scopedQuery.toString()}` : ''}`,
+            { cache: 'no-store', headers: { 'x-om-unauthorized-redirect': '0' } },
+          )
+          if (settingsCall.ok && settingsCall.result?.items) {
+            return settingsCall.result.items
+          }
+        } catch {
+          // Default category order works without explicit settings rows.
         }
-      } catch {
-        // Default category order works without explicit settings rows.
+        return []
       }
 
-      const settingsMap = new Map(kindSettings.map((setting) => [setting.kind, setting]))
-
-      const selectedTagEntries = Array.isArray(entityData.tags)
-        ? entityData.tags.map((tag) => ({
-            id: tag.id,
-            value: tag.id,
-            label: tag.label,
-            color: tag.color ?? null,
-          }))
-        : []
-
-      let assignedLabelIds: string[] = []
-      let selectedLabelEntries: CategoryOption[] = []
-      try {
-        const labelsQuery = new URLSearchParams()
-        labelsQuery.set('entityId', entityId)
-        labelsQuery.set('pageSize', '1')
-        if (entityOrganizationId) {
-          labelsQuery.set('organizationId', entityOrganizationId)
-        }
-        const labelsCall = await apiCall<{
-          items?: LabelItem[]
-          assignedIds?: string[]
-        }>(`/api/customers/labels?${labelsQuery.toString()}`, {
-          cache: 'no-store',
-          headers: { 'x-om-unauthorized-redirect': '0' },
-        })
-        const labelsData = labelsCall.ok ? labelsCall.result : null
-        assignedLabelIds = labelsData?.assignedIds ?? []
-        if (assignedLabelIds.length > 0) {
+      const loadLabelData = async (): Promise<{
+        assignedLabelIds: string[]
+        selectedLabelEntries: CategoryOption[]
+      }> => {
+        try {
+          const labelsQuery = new URLSearchParams()
+          labelsQuery.set('entityId', entityId)
+          labelsQuery.set('pageSize', '1')
+          if (entityOrganizationId) {
+            labelsQuery.set('organizationId', entityOrganizationId)
+          }
+          const labelsCall = await apiCall<{
+            items?: LabelItem[]
+            assignedIds?: string[]
+          }>(`/api/customers/labels?${labelsQuery.toString()}`, {
+            cache: 'no-store',
+            headers: { 'x-om-unauthorized-redirect': '0' },
+          })
+          const labelsData = labelsCall.ok ? labelsCall.result : null
+          const assignedLabelIds = labelsData?.assignedIds ?? []
+          if (assignedLabelIds.length === 0) {
+            return { assignedLabelIds, selectedLabelEntries: [] }
+          }
           const detailQuery = new URLSearchParams({
             ids: assignedLabelIds.join(','),
             pageSize: String(Math.min(assignedLabelIds.length, 100)),
@@ -500,44 +496,36 @@ export function EntityTagsDialog({
             },
           )
           const selectedLabels = selectedLabelsCall.ok ? selectedLabelsCall.result?.items ?? [] : []
-          selectedLabelEntries = selectedLabels.map((label) => ({
+          const selectedLabelEntries = selectedLabels.map((label) => ({
             id: label.id,
             value: label.id,
             label: label.label,
             color: null,
           }))
+          return { assignedLabelIds, selectedLabelEntries }
+        } catch {
+          return { assignedLabelIds: [], selectedLabelEntries: [] }
         }
-      } catch {
-        assignedLabelIds = []
-        selectedLabelEntries = []
       }
 
-      const categoryDefs = buildApplicableCategories(entityType, kindSettings)
-      const loadedCategories: CategorySection[] = []
+      const selectedTagEntries = Array.isArray(entityData.tags)
+        ? entityData.tags.map((tag) => ({
+            id: tag.id,
+            value: tag.id,
+            label: tag.label,
+            color: tag.color ?? null,
+          }))
+        : []
 
-      for (const categoryDef of categoryDefs) {
-        if (categoryDef.source === 'tags') {
-          loadedCategories.push({
-            ...categoryDef,
-            label: t(categoryDef.labelKey, categoryDef.labelFallback),
-            description: t(categoryDef.descriptionKey, categoryDef.descriptionFallback),
-            entries: sortOptions(selectedTagEntries),
-            selectionMode: categoryDef.selectionMode ?? 'multi',
-          })
-          continue
-        }
+      // The label chain is independent of kind settings and the dictionary
+      // fan-out, so kick it off immediately and let it resolve in parallel.
+      const labelDataPromise = loadLabelData()
 
-        if (categoryDef.source === 'labels') {
-          loadedCategories.push({
-            ...categoryDef,
-            label: t(categoryDef.labelKey, categoryDef.labelFallback),
-            description: t(categoryDef.descriptionKey, categoryDef.descriptionFallback),
-            entries: sortOptions(selectedLabelEntries),
-            selectionMode: categoryDef.selectionMode ?? 'multi',
-          })
-          continue
-        }
+      const kindSettings = await loadKindSettings()
+      const settingsMap = new Map(kindSettings.map((setting) => [setting.kind, setting]))
+      const categoryDefs = buildApplicableCategories(entityType, kindSettings)
 
+      const loadDictionaryCategory = async (categoryDef: CategoryDef): Promise<CategorySection> => {
         try {
           const dictionaryUrl = new URL(`/api/customers/dictionaries/${categoryDef.routeKind}`, 'http://localhost')
           if (entityOrganizationId) {
@@ -568,7 +556,7 @@ export function EntityTagsDialog({
               color: null,
             })
           })
-          loadedCategories.push({
+          return {
             ...categoryDef,
             label: categoryDef.labelKey
               ? t(categoryDef.labelKey, categoryDef.labelFallback)
@@ -582,7 +570,7 @@ export function EntityTagsDialog({
               : categoryDef.descriptionFallback,
             entries: sortOptions(entries),
             selectionMode,
-          })
+          }
         } catch {
           const setting = categoryDef.settingKind
             ? settingsMap.get(categoryDef.settingKind)
@@ -594,7 +582,7 @@ export function EntityTagsDialog({
             label: value,
             color: null,
           }))
-          loadedCategories.push({
+          return {
             ...categoryDef,
             label: categoryDef.labelKey
               ? t(categoryDef.labelKey, categoryDef.labelFallback)
@@ -608,10 +596,40 @@ export function EntityTagsDialog({
               : categoryDef.descriptionFallback,
             entries: fallbackEntries,
             selectionMode,
-          })
+          }
         }
       }
 
+      // Independent dictionary requests fan out together instead of awaiting
+      // each one sequentially; Promise.all preserves categoryDefs order so the
+      // subsequent sort and selection initialization stay stable.
+      const loadedCategories = await Promise.all(
+        categoryDefs.map(async (categoryDef): Promise<CategorySection> => {
+          if (categoryDef.source === 'tags') {
+            return {
+              ...categoryDef,
+              label: t(categoryDef.labelKey, categoryDef.labelFallback),
+              description: t(categoryDef.descriptionKey, categoryDef.descriptionFallback),
+              entries: sortOptions(selectedTagEntries),
+              selectionMode: categoryDef.selectionMode ?? 'multi',
+            }
+          }
+          if (categoryDef.source === 'labels') {
+            const { selectedLabelEntries } = await labelDataPromise
+            return {
+              ...categoryDef,
+              label: t(categoryDef.labelKey, categoryDef.labelFallback),
+              description: t(categoryDef.descriptionKey, categoryDef.descriptionFallback),
+              entries: sortOptions(selectedLabelEntries),
+              selectionMode: categoryDef.selectionMode ?? 'multi',
+            }
+          }
+          return loadDictionaryCategory(categoryDef)
+        }),
+      )
+
+      const { assignedLabelIds, selectedLabelEntries } = await labelDataPromise
+
       loadedCategories.sort((left, right) => {
         const leftSortOrder =
           left.settingKind && settingsMap.has(left.settingKind)

package/src/modules/customers/components/detail/notesAdapter.ts

@@ -1,6 +1,7 @@
 "use client"
 
-import { apiCallOrThrow, readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCallOrThrow, readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { mapCommentSummary, type NotesDataAdapter } from '@open-mercato/ui/backend/detail/NotesSection'
 
 type Translator = (key: string, fallback?: string, params?: Record<string, string | number>) => string
@@ -92,33 +93,43 @@ export function createCustomerNotesAdapter(
       )
       return response.result ?? {}
     },
-    update: async ({ id, patch }) => {
+    update: async ({ id, patch, updatedAt }) => {
       const payload: Record<string, unknown> = { id }
       if (patch.body !== undefined) payload.body = patch.body
       if (patch.appearanceIcon !== undefined) payload.appearanceIcon = patch.appearanceIcon
       if (patch.appearanceColor !== undefined) payload.appearanceColor = patch.appearanceColor
+      // Send the optimistic-lock header (note's loaded updatedAt) so a stale edit —
+      // or an edit after the note was deleted in another tab — surfaces the unified
+      // conflict bar (409) instead of silently overwriting. The guarded runner
+      // (useGuardedMutation) routes the 409 through surfaceRecordConflict.
       await runWrite(
-        () => apiCallOrThrow(
-          '/api/customers/comments',
-          {
-            method: 'PUT',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify(payload),
-          },
-          { errorMessage: translator('customers.people.detail.notes.updateError') },
+        () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(updatedAt ?? null),
+          () => apiCallOrThrow(
+            '/api/customers/comments',
+            {
+              method: 'PUT',
+              headers: { 'content-type': 'application/json' },
+              body: JSON.stringify(payload),
+            },
+            { errorMessage: translator('customers.people.detail.notes.updateError') },
+          ),
         ),
         { operation: 'updateNote', id },
       )
     },
-    delete: async ({ id }) => {
+    delete: async ({ id, updatedAt }) => {
       await runWrite(
-        () => apiCallOrThrow(
-          `/api/customers/comments?id=${encodeURIComponent(id)}`,
-          {
-            method: 'DELETE',
-            headers: { 'content-type': 'application/json' },
-          },
-          { errorMessage: translator('customers.people.detail.notes.deleteError', 'Failed to delete note') },
+        () => withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(updatedAt ?? null),
+          () => apiCallOrThrow(
+            `/api/customers/comments?id=${encodeURIComponent(id)}`,
+            {
+              method: 'DELETE',
+              headers: { 'content-type': 'application/json' },
+            },
+            { errorMessage: translator('customers.people.detail.notes.deleteError', 'Failed to delete note') },
+          ),
         ),
         { operation: 'deleteNote', id },
       )

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

@@ -923,6 +923,8 @@
   "customers.deals.detail.badge.deal": "Deal",
   "customers.deals.detail.badge.lost": "Lost",
   "customers.deals.detail.badge.won": "Won",
+  "customers.deals.detail.closeLostError": "Deal konnte nicht als verloren markiert werden.",
+  "customers.deals.detail.closeWonError": "Deal konnte nicht als gewonnen markiert werden.",
   "customers.deals.detail.closure.lost": "Lost",
   "customers.deals.detail.closure.prompt": "Close deal — choose outcome",
   "customers.deals.detail.closure.won": "Won",

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

@@ -923,6 +923,8 @@
   "customers.deals.detail.badge.deal": "Deal",
   "customers.deals.detail.badge.lost": "Lost",
   "customers.deals.detail.badge.won": "Won",
+  "customers.deals.detail.closeLostError": "Failed to mark deal as lost.",
+  "customers.deals.detail.closeWonError": "Failed to mark deal as won.",
   "customers.deals.detail.closure.lost": "Lost",
   "customers.deals.detail.closure.prompt": "Close deal — choose outcome",
   "customers.deals.detail.closure.won": "Won",

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

@@ -923,6 +923,8 @@
   "customers.deals.detail.badge.deal": "Deal",
   "customers.deals.detail.badge.lost": "Lost",
   "customers.deals.detail.badge.won": "Won",
+  "customers.deals.detail.closeLostError": "No se pudo marcar el deal como perdido.",
+  "customers.deals.detail.closeWonError": "No se pudo marcar el deal como ganado.",
   "customers.deals.detail.closure.lost": "Lost",
   "customers.deals.detail.closure.prompt": "Close deal — choose outcome",
   "customers.deals.detail.closure.won": "Won",

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

@@ -923,6 +923,8 @@
   "customers.deals.detail.badge.deal": "Deal",
   "customers.deals.detail.badge.lost": "Lost",
   "customers.deals.detail.badge.won": "Won",
+  "customers.deals.detail.closeLostError": "Nie udało się oznaczyć deala jako przegranego.",
+  "customers.deals.detail.closeWonError": "Nie udało się oznaczyć deala jako wygranego.",
   "customers.deals.detail.closure.lost": "Lost",
   "customers.deals.detail.closure.prompt": "Close deal — choose outcome",
   "customers.deals.detail.closure.won": "Won",

package/src/modules/dashboards/components/WidgetVisibilityEditor.tsx

@@ -193,9 +193,12 @@ export const WidgetVisibilityEditor = React.forwardRef<WidgetVisibilityEditorHan
       setLoading(true)
       setError(null)
       try {
-        await loadCatalog()
-        if (kind === 'role') await loadRoleData(tenantIdRef.current, organizationIdRef.current)
-        else await loadUserData(tenantIdRef.current, organizationIdRef.current)
+        await Promise.all([
+          loadCatalog(),
+          kind === 'role'
+            ? loadRoleData(tenantIdRef.current, organizationIdRef.current)
+            : loadUserData(tenantIdRef.current, organizationIdRef.current),
+        ])
       } catch (err) {
         console.error('Failed to load widget visibility data', err)
         if (!cancelled) {

package/src/modules/data_sync/api/runs.ts

@@ -25,6 +25,7 @@ export async function GET(req: Request) {
     entityType: url.searchParams.get('entityType') ?? undefined,
     direction: url.searchParams.get('direction') ?? undefined,
     status: url.searchParams.get('status') ?? undefined,
+    search: url.searchParams.get('search') ?? undefined,
     page: url.searchParams.get('page') ?? undefined,
     pageSize: url.searchParams.get('pageSize') ?? undefined,
   })

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

@@ -3,6 +3,8 @@ import { z } from 'zod'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 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 { updateSyncScheduleSchema } from '../../../data/validators'
 import type { SyncScheduleService } from '../../../lib/sync-schedule-service'
 import { serializeSchedule } from '../serialize'
@@ -111,7 +113,8 @@ export async function PUT(req: Request, ctx: { params?: Promise<{ id?: string }>
       timezone: parsed.data.timezone ?? current.timezone,
       fullSync: parsed.data.fullSync ?? current.fullSync,
       isEnabled: parsed.data.isEnabled ?? current.isEnabled,
-    }, scope)
+      expectedUpdatedAt: readOptimisticLockExpected(req),
+    }, scope, container)
 
     if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {
       await runCrudMutationGuardAfterSuccess(container, {
@@ -126,9 +129,11 @@ export async function PUT(req: Request, ctx: { params?: Promise<{ id?: string }>
         metadata: guardResult.metadata ?? null,
       })
     }
-
     return NextResponse.json(serializeSchedule(schedule))
   } catch (error) {
+    if (isCrudHttpError(error)) {
+      return NextResponse.json(error.body, { status: error.status })
+    }
     const message = error instanceof Error ? error.message : 'Failed to update sync schedule'
     return NextResponse.json({ error: message }, { status: 422 })
   }
@@ -168,25 +173,38 @@ export async function DELETE(req: Request, ctx: { params?: Promise<{ id?: string
     return NextResponse.json(guardResult.body, { status: guardResult.status })
   }
 
-  const deleted = await scheduleService.deleteSchedule(parsedParams.data.id, scope)
+  try {
+    const deleted = await scheduleService.deleteSchedule(
+      parsedParams.data.id,
+      scope,
+      container,
+      readOptimisticLockExpected(req),
+    )
+
+    if (!deleted) {
+      return NextResponse.json({ error: 'Schedule not found' }, { status: 404 })
+    }
 
-  if (!deleted) {
-    return NextResponse.json({ error: 'Schedule not found' }, { status: 404 })
-  }
+    if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {
+      await runCrudMutationGuardAfterSuccess(container, {
+        tenantId: auth.tenantId,
+        organizationId: scope.organizationId,
+        userId: auth.sub,
+        resourceKind: 'data_sync.schedule',
+        resourceId: parsedParams.data.id,
+        operation: 'delete',
+        requestMethod: req.method,
+        requestHeaders: req.headers,
+        metadata: guardResult.metadata ?? null,
+      })
+    }
 
-  if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {
-    await runCrudMutationGuardAfterSuccess(container, {
-      tenantId: auth.tenantId,
-      organizationId: scope.organizationId,
-      userId: auth.sub,
-      resourceKind: 'data_sync.schedule',
-      resourceId: parsedParams.data.id,
-      operation: 'delete',
-      requestMethod: req.method,
-      requestHeaders: req.headers,
-      metadata: guardResult.metadata ?? null,
-    })
+    return NextResponse.json({ deleted: true })
+  } catch (error) {
+    if (isCrudHttpError(error)) {
+      return NextResponse.json(error.body, { status: error.status })
+    }
+    const message = error instanceof Error ? error.message : 'Failed to delete sync schedule'
+    return NextResponse.json({ error: message }, { status: 422 })
   }
-
-  return NextResponse.json({ deleted: true })
 }

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

@@ -90,7 +90,7 @@ export async function POST(req: Request) {
     const schedule = await scheduleService.saveSchedule({
       ...parsed.data,
       expectedUpdatedAt: readOptimisticLockExpected(req),
-    }, scope)
+    }, scope, container)
 
     if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {
       await runCrudMutationGuardAfterSuccess(container, {