@open-mercato/core 0.8.1-develop.7275.1.f772b944d4 → 0.8.1-develop.7295.1.d0e0e33014

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

@@ -1242,6 +1242,9 @@
   "staff.time_tracking.myWork.recentTasks.empty": "Noch keine Zeit auf Aufgaben erfasst.",
   "staff.time_tracking.myWork.recentTasks.title": "Letzte Aufgaben",
   "staff.time_tracking.myWork.today.allEntries": "Alle Einträge",
+  "staff.time_tracking.myWork.today.columns.duration": "Dauer",
+  "staff.time_tracking.myWork.today.columns.task": "Aufgabe",
+  "staff.time_tracking.myWork.today.columns.time": "Zeit",
   "staff.time_tracking.myWork.today.copyYesterday": "Gestern kopieren",
   "staff.time_tracking.myWork.today.empty": "Heute wurde noch nichts erfasst.",
   "staff.time_tracking.myWork.today.title": "Heutige Einträge",

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

@@ -1242,6 +1242,9 @@
   "staff.time_tracking.myWork.recentTasks.empty": "No tasks logged against yet.",
   "staff.time_tracking.myWork.recentTasks.title": "Recent tasks",
   "staff.time_tracking.myWork.today.allEntries": "All entries",
+  "staff.time_tracking.myWork.today.columns.duration": "Duration",
+  "staff.time_tracking.myWork.today.columns.task": "Task",
+  "staff.time_tracking.myWork.today.columns.time": "Time",
   "staff.time_tracking.myWork.today.copyYesterday": "Copy yesterday",
   "staff.time_tracking.myWork.today.empty": "Nothing logged today yet.",
   "staff.time_tracking.myWork.today.title": "Today’s entries",

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

@@ -1242,6 +1242,9 @@
   "staff.time_tracking.myWork.recentTasks.empty": "Aún no has registrado tiempo en ninguna tarea.",
   "staff.time_tracking.myWork.recentTasks.title": "Tareas recientes",
   "staff.time_tracking.myWork.today.allEntries": "Todas las entradas",
+  "staff.time_tracking.myWork.today.columns.duration": "Duración",
+  "staff.time_tracking.myWork.today.columns.task": "Tarea",
+  "staff.time_tracking.myWork.today.columns.time": "Tiempo",
   "staff.time_tracking.myWork.today.copyYesterday": "Copiar ayer",
   "staff.time_tracking.myWork.today.empty": "Aún no hay nada registrado hoy.",
   "staff.time_tracking.myWork.today.title": "Entradas de hoy",

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

@@ -1242,6 +1242,9 @@
   "staff.time_tracking.myWork.recentTasks.empty": "아직 작업에 기록된 시간이 없습니다.",
   "staff.time_tracking.myWork.recentTasks.title": "최근 작업",
   "staff.time_tracking.myWork.today.allEntries": "전체 기록",
+  "staff.time_tracking.myWork.today.columns.duration": "소요 시간",
+  "staff.time_tracking.myWork.today.columns.task": "작업",
+  "staff.time_tracking.myWork.today.columns.time": "시간",
   "staff.time_tracking.myWork.today.copyYesterday": "어제 복사",
   "staff.time_tracking.myWork.today.empty": "오늘 기록된 시간이 없습니다.",
   "staff.time_tracking.myWork.today.title": "오늘의 기록",

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

@@ -1242,6 +1242,9 @@
   "staff.time_tracking.myWork.recentTasks.empty": "Nie zalogowano jeszcze czasu do żadnego zadania.",
   "staff.time_tracking.myWork.recentTasks.title": "Ostatnie zadania",
   "staff.time_tracking.myWork.today.allEntries": "Wszystkie wpisy",
+  "staff.time_tracking.myWork.today.columns.duration": "Czas trwania",
+  "staff.time_tracking.myWork.today.columns.task": "Zadanie",
+  "staff.time_tracking.myWork.today.columns.time": "Czas",
   "staff.time_tracking.myWork.today.copyYesterday": "Kopiuj wczorajszy dzień",
   "staff.time_tracking.myWork.today.empty": "Nic jeszcze nie zalogowano dzisiaj.",
   "staff.time_tracking.myWork.today.title": "Dzisiejsze wpisy",

package/src/modules/staff/lib/time-tracking-ui/ReportSheet.tsx

@@ -29,6 +29,7 @@ import * as React from 'react'
 import { z } from 'zod'
 import { ChevronDown, ChevronRight } from 'lucide-react'
 import { Badge } from '@open-mercato/ui/primitives/badge'
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@open-mercato/ui/primitives/table'
 import { formatCurrency } from '@open-mercato/ui/utils/format'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { InjectionSpot } from '@open-mercato/ui/backend/injection/InjectionSpot'
@@ -202,26 +203,26 @@ function ReportSheetGroup({ group, showRates, money }: GroupProps) {
       </div>
 
       <div className="overflow-x-auto">
-        <table className="w-full text-sm">
-          <thead>
-            <tr className="border-b border-border text-xs uppercase tracking-wide text-muted-foreground">
-              <th className="px-6 py-2 text-left font-medium">
+        <Table>
+          <TableHeader>
+            <TableRow className="text-xs uppercase tracking-wide text-muted-foreground">
+              <TableHead className="px-6 py-2 text-left">
                 {t('staff.time_tracking.reports.sheet.lineLabel', 'Line')}
-              </th>
-              <th className="px-3 py-2 text-right font-medium">
+              </TableHead>
+              <TableHead className="px-3 py-2 text-right">
                 {t('staff.time_tracking.reports.sheet.time', 'Time')}
-              </th>
+              </TableHead>
               {showRates ? (
-                <th className="px-3 py-2 text-right font-medium">
+                <TableHead className="px-3 py-2 text-right">
                   {t('staff.time_tracking.reports.sheet.rate', 'Rate')}
-                </th>
+                </TableHead>
               ) : null}
-              <th className="px-6 py-2 text-right font-medium">
+              <TableHead className="px-6 py-2 text-right">
                 {t('staff.time_tracking.reports.sheet.amount', 'Amount')}
-              </th>
-            </tr>
-          </thead>
-          <tbody>
+              </TableHead>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
             {group.lines.map((line) => (
               <ReportSheetLine
                 key={line.key}
@@ -232,8 +233,8 @@ function ReportSheetGroup({ group, showRates, money }: GroupProps) {
                 money={money}
               />
             ))}
-          </tbody>
-        </table>
+          </TableBody>
+        </Table>
       </div>
     </div>
   )
@@ -255,8 +256,8 @@ function ReportSheetLine({ line, depth, isNonBillable, showRates, money }: LineP
 
   return (
     <>
-      <tr className="border-b border-border/60 last:border-b-0">
-        <td className="px-6 py-2" style={{ paddingLeft: `${1.5 + depth * 1.25}rem` }}>
+      <TableRow>
+        <TableCell className="px-6 py-2" style={{ paddingLeft: `${1.5 + depth * 1.25}rem` }}>
           <div className="flex items-center gap-2">
             {hasChildren ? (
               <button
@@ -284,17 +285,19 @@ function ReportSheetLine({ line, depth, isNonBillable, showRates, money }: LineP
               </Badge>
             ) : null}
           </div>
-        </td>
-        <td className="px-3 py-2 text-right font-mono tabular-nums">{formatReportMinutes(line.minutes)}</td>
+        </TableCell>
+        <TableCell className="px-3 py-2 text-right font-mono tabular-nums">
+          {formatReportMinutes(line.minutes)}
+        </TableCell>
         {showRates ? (
-          <td className="px-3 py-2 text-right font-mono tabular-nums">
+          <TableCell className="px-3 py-2 text-right font-mono tabular-nums">
             {isNonBillable ? EM_DASH : money(line.rate)}
-          </td>
+          </TableCell>
         ) : null}
-        <td className="px-6 py-2 text-right font-mono tabular-nums">
+        <TableCell className="px-6 py-2 text-right font-mono tabular-nums">
           {isNonBillable ? EM_DASH : money(line.amount)}
-        </td>
-      </tr>
+        </TableCell>
+      </TableRow>
       {expanded
         ? line.children.map((child) => (
             <ReportSheetLine
@@ -308,11 +311,11 @@ function ReportSheetLine({ line, depth, isNonBillable, showRates, money }: LineP
           ))
         : null}
       {expanded && line.children.length === 0 ? (
-        <tr>
-          <td colSpan={columns} className="px-6 py-2 text-xs text-muted-foreground">
+        <TableRow>
+          <TableCell colSpan={columns} className="px-6 py-2 text-xs text-muted-foreground">
             {t('staff.time_tracking.reports.sheet.noSubtasks', 'No subtasks')}
-          </td>
-        </tr>
+          </TableCell>
+        </TableRow>
       ) : null}
     </>
   )

package/src/modules/staff/lib/time-tracking-ui/TaskListView.tsx

@@ -2,13 +2,16 @@
 
 import * as React from 'react'
 import { useQuery } from '@tanstack/react-query'
+import type { LegacyColumnDef as ColumnDef } from '@tanstack/react-table/legacy'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { EmptyState } from '@open-mercato/ui/primitives/empty-state'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
+import { DataTable } from '@open-mercato/ui/backend/DataTable'
 import { ErrorMessage, LoadingMessage } from '@open-mercato/ui/backend/detail'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
+import { extensionPoints } from '@open-mercato/core/modules/staff/extension-points'
 import { sumTaskLoggedMinutes } from '../timesheets-tasks/taskHoursTotals'
 import {
   BOARD_PAGE_SIZE,
@@ -121,6 +124,85 @@ export function TaskListView({
     onSummaryChange?.(summary)
   }, [onSummaryChange, summary])
 
+  const columns = React.useMemo<ColumnDef<BoardTask>[]>(
+    () => [
+      {
+        accessorKey: 'reference',
+        header: t('staff.time_tracking.board.list.columns.reference', 'Ref.'),
+        cell: ({ row }) => (
+          <span className="text-xs tabular-nums text-muted-foreground">
+            {row.original.reference ?? '—'}
+          </span>
+        ),
+      },
+      {
+        accessorKey: 'title',
+        header: t('staff.time_tracking.board.list.columns.title', 'Task'),
+        cell: ({ row }) => (
+          <span data-task-row={row.original.id}>
+            <Button
+              type="button"
+              variant="link"
+              size="2xs"
+              onClick={() => onOpenTask(row.original.id)}
+              className="h-auto px-0 text-left text-sm font-semibold text-foreground"
+            >
+              {row.original.title}
+            </Button>
+          </span>
+        ),
+      },
+      {
+        id: 'status',
+        header: t('staff.time_tracking.board.list.columns.status', 'Status'),
+        cell: ({ row }) =>
+          row.original.taskStatusId ? statusNames.get(row.original.taskStatusId) ?? '—' : '—',
+      },
+      {
+        id: 'assignee',
+        header: t('staff.time_tracking.board.list.columns.assignee', 'Assignee'),
+        cell: ({ row }) =>
+          row.original.assigneeStaffMemberId
+            ? assigneeNames.data?.get(row.original.assigneeStaffMemberId) ??
+              t('staff.time_tracking.board.card.unassigned', 'Unassigned')
+            : t('staff.time_tracking.board.card.unassigned', 'Unassigned'),
+      },
+      {
+        id: 'tags',
+        header: t('staff.time_tracking.board.list.columns.tags', 'Tags'),
+        cell: ({ row }) => (
+          <span className="flex flex-wrap gap-1">
+            {row.original.tagIds.map((tagId) => {
+              // Same rule as the board card: a tag whose label has not
+              // arrived yet is skipped, never drawn as its raw id.
+              const label = tagLabels.data?.get(tagId)
+              if (!label) return null
+              return (
+                <Badge key={tagId} variant="neutral" size="sm">
+                  {label}
+                </Badge>
+              )
+            })}
+          </span>
+        ),
+      },
+      {
+        id: 'hours',
+        header: () => (
+          <span className="block text-right">
+            {t('staff.time_tracking.board.list.columns.hours', 'Logged')}
+          </span>
+        ),
+        cell: ({ row }) => (
+          <span className="block text-right font-semibold tabular-nums text-foreground">
+            {formatBoardMinutes(row.original.loggedMinutes)}
+          </span>
+        ),
+      },
+    ],
+    [assigneeNames.data, onOpenTask, statusNames, t, tagLabels.data],
+  )
+
   if (tasksQuery.isLoading) {
     return <LoadingMessage label={t('staff.time_tracking.board.loading', 'Loading the board…')} />
   }
@@ -155,85 +237,13 @@ export function TaskListView({
 
   return (
     <div className="flex flex-col gap-3">
-      <div className="overflow-x-auto rounded-lg border border-border">
-        <table className="w-full border-collapse text-sm" data-testid="board-task-list">
-          <caption className="sr-only">
-            {t('staff.time_tracking.board.list.caption', 'Tasks')}
-          </caption>
-          <thead>
-            <tr className="border-b border-border bg-muted/40 text-left">
-              <th scope="col" className="px-3 py-2.5 font-semibold text-muted-foreground">
-                {t('staff.time_tracking.board.list.columns.reference', 'Ref.')}
-              </th>
-              <th scope="col" className="px-3 py-2.5 font-semibold text-muted-foreground">
-                {t('staff.time_tracking.board.list.columns.title', 'Task')}
-              </th>
-              <th scope="col" className="px-3 py-2.5 font-semibold text-muted-foreground">
-                {t('staff.time_tracking.board.list.columns.status', 'Status')}
-              </th>
-              <th scope="col" className="px-3 py-2.5 font-semibold text-muted-foreground">
-                {t('staff.time_tracking.board.list.columns.assignee', 'Assignee')}
-              </th>
-              <th scope="col" className="px-3 py-2.5 font-semibold text-muted-foreground">
-                {t('staff.time_tracking.board.list.columns.tags', 'Tags')}
-              </th>
-              <th scope="col" className="px-3 py-2.5 text-right font-semibold text-muted-foreground">
-                {t('staff.time_tracking.board.list.columns.hours', 'Logged')}
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            {tasks.map((task) => (
-              <tr
-                key={task.id}
-                data-task-row={task.id}
-                className="border-b border-border last:border-b-0 hover:bg-muted/40"
-              >
-                <td className="px-3 py-2.5 text-xs tabular-nums text-muted-foreground">
-                  {task.reference ?? '—'}
-                </td>
-                <td className="px-3 py-2.5">
-                  <Button
-                    type="button"
-                    variant="link"
-                    size="2xs"
-                    onClick={() => onOpenTask(task.id)}
-                    className="h-auto px-0 text-left text-sm font-semibold text-foreground"
-                  >
-                    {task.title}
-                  </Button>
-                </td>
-                <td className="px-3 py-2.5 text-muted-foreground">
-                  {task.taskStatusId ? statusNames.get(task.taskStatusId) ?? '—' : '—'}
-                </td>
-                <td className="px-3 py-2.5 text-muted-foreground">
-                  {task.assigneeStaffMemberId
-                    ? assigneeNames.data?.get(task.assigneeStaffMemberId) ??
-                      t('staff.time_tracking.board.card.unassigned', 'Unassigned')
-                    : t('staff.time_tracking.board.card.unassigned', 'Unassigned')}
-                </td>
-                <td className="px-3 py-2.5">
-                  <span className="flex flex-wrap gap-1">
-                    {task.tagIds.map((tagId) => {
-                      // Same rule as the board card: a tag whose label has not
-                      // arrived yet is skipped, never drawn as its raw id.
-                      const label = tagLabels.data?.get(tagId)
-                      if (!label) return null
-                      return (
-                        <Badge key={tagId} variant="neutral" size="sm">
-                          {label}
-                        </Badge>
-                      )
-                    })}
-                  </span>
-                </td>
-                <td className="px-3 py-2.5 text-right font-semibold tabular-nums text-foreground">
-                  {formatBoardMinutes(task.loggedMinutes)}
-                </td>
-              </tr>
-            ))}
-          </tbody>
-        </table>
+      <div data-testid="board-task-list">
+        <DataTable<BoardTask>
+          extensionTableId={extensionPoints.hosts.taskBoardListViewTable.tableId}
+          disableRowClick
+          columns={columns}
+          data={tasks}
+        />
       </div>
 
       {remaining > 0 ? (

package/src/modules/warranty_claims/api/ai/assess/route.ts

@@ -6,7 +6,7 @@ import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest, type AuthContext } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
@@ -344,7 +344,7 @@ export async function POST(req: Request) {
     }
     return NextResponse.json({ status: 'ok', extraction })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })

package/src/modules/warranty_claims/api/ai/draft-reply/route.ts

@@ -7,7 +7,7 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { withScopedPayload } from '@open-mercato/shared/lib/api/scoped'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
@@ -101,10 +101,9 @@ export async function POST(req: Request) {
     })
     return NextResponse.json({ ok: true, draft })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
     const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     if (isWarrantyAiUnavailableError(err)) {
-      const { translate } = await resolveTranslations()
       return NextResponse.json(
         { ok: false, aiUnavailable: true, error: translate('warranty_claims.errors.aiUnavailable', 'AI drafting is temporarily unavailable') },
         { status: 502 },

package/src/modules/warranty_claims/api/ai/suggest/route.ts

@@ -5,7 +5,7 @@ import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { buildWarrantyClaimTriageSuggestion } from '../../../lib/triage'
@@ -134,8 +134,8 @@ export async function GET(req: Request) {
     const input = suggestSchema.parse({ claimId: url.searchParams.get('claimId') ?? undefined })
     return buildResponse(context, input)
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
     const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }
@@ -150,8 +150,8 @@ export async function POST(req: Request) {
     const input = suggestSchema.parse(toRecord(await readJsonSafe(req, {})))
     return buildResponse(context, input)
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
     const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/api/assign/route.ts

@@ -5,7 +5,7 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { runRouteMutationGuards, type RouteMutationGuardResult } from '@open-mercato/shared/lib/crud/route-mutation-guard'
@@ -114,12 +114,12 @@ export async function POST(req: Request) {
 
     return NextResponse.json({ ok: true, claimId: result?.claimId ?? commandInput.id })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
     }
-    const { translate } = await resolveTranslations()
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/api/credit-memo/route.ts

@@ -4,7 +4,7 @@ import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
@@ -160,7 +160,7 @@ export async function POST(req: Request) {
       currencyCode: result.currencyCode,
     })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })

package/src/modules/warranty_claims/api/entitlement/route.ts

@@ -4,7 +4,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { sql } from 'kysely'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
@@ -195,8 +195,8 @@ export async function GET(req: Request) {
     )
     return NextResponse.json({ ...result, ...history })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
     const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/api/events/route.ts

@@ -6,7 +6,7 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { runRouteMutationGuards, type RouteMutationGuardResult } from '@open-mercato/shared/lib/crud/route-mutation-guard'
@@ -141,8 +141,8 @@ export async function GET(req: Request) {
     )
     return NextResponse.json({ items: events.map(serializeEvent) })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
     const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }
@@ -175,12 +175,12 @@ export async function POST(req: Request) {
 
     return NextResponse.json({ ok: true, claimId: result?.claimId ?? commandInput.claimId })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
     }
-    const { translate } = await resolveTranslations()
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/api/external/claims/route.ts

@@ -5,7 +5,7 @@ import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { runRouteMutationGuards, type RouteMutationGuardResult } from '@open-mercato/shared/lib/crud/route-mutation-guard'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
@@ -394,8 +394,8 @@ export async function POST(req: Request) {
     }
     return submitResponseForClaim(context, claim, 201)
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
     const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }
@@ -422,8 +422,8 @@ export async function GET(req: Request) {
     ])
     return NextResponse.json(serializeLookupResponse(claim, lines, events))
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
     const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/api/portal/claims/[id]/submit/route.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import type { CommandBus } from '@open-mercato/shared/lib/commands'
-import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
@@ -54,7 +54,7 @@ export async function POST(req: Request, ctx: PortalClaimActionRouteContext) {
     )
   } catch (err) {
     if (isCrudHttpError(err)) {
-      return NextResponse.json(err.body, { status: err.status })
+      return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     }
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {

package/src/modules/warranty_claims/api/portal/claims/[id]/withdraw/route.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import type { CommandBus } from '@open-mercato/shared/lib/commands'
-import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
@@ -60,7 +60,7 @@ export async function POST(req: Request, ctx: PortalClaimActionRouteContext) {
     )
   } catch (err) {
     if (isCrudHttpError(err)) {
-      return NextResponse.json(err.body, { status: err.status })
+      return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     }
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {

package/src/modules/warranty_claims/api/portal/claims/route.ts

@@ -4,7 +4,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
-import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { runRouteMutationGuards, type RouteMutationGuardResult } from '@open-mercato/shared/lib/crud/route-mutation-guard'
@@ -517,7 +517,7 @@ export async function POST(req: Request) {
     return NextResponse.json({ ok: true, claimId }, { status: 201 })
   } catch (err) {
     if (isCrudHttpError(err)) {
-      return NextResponse.json(err.body, { status: err.status })
+      return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     }
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {