@open-mercato/core 0.6.4-develop.4382.1.6b4f656b77 → 0.6.4

package/src/modules/staff/backend/staff/team-roles/page.tsx

@@ -7,22 +7,22 @@ import type { ColumnDef } from '@tanstack/react-table'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { DataTable, withDataTableNamespaces } from '@open-mercato/ui/backend/DataTable'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
-import { MarkdownPreview } from '@open-mercato/ui/backend/markdown/MarkdownContent'
+import { markdownToPlainText } from '@open-mercato/ui/backend/markdown/markdownToPlainText'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { readApiResultOrThrow, apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { readApiResultOrThrow, apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { Pencil, Users } from 'lucide-react'
 import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterBar'
+import { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { truncate } from 'fs'
 import { formatDateTime } from '@open-mercato/shared/lib/time'
 
 const PAGE_SIZE = 50
-const MARKDOWN_CLASSNAME =
-  'text-sm text-foreground break-words [&>*]:mb-2 [&>*:last-child]:mb-0 [&_ul]:ml-4 [&_ul]:list-disc [&_ol]:ml-4 [&_ol]:list-decimal [&_code]:rounded [&_code]:bg-muted [&_code]:px-1 [&_code]:py-0.5 [&_pre]:rounded-md [&_pre]:bg-muted [&_pre]:p-3 [&_pre]:text-xs'
 
 type TeamRoleRow = {
   kind: 'team' | 'role'
@@ -104,7 +104,7 @@ export default function StaffTeamRolesPage() {
           return (
             <div className="flex items-center justify-between gap-3">
               <div className="flex items-center gap-2">
-                {row.original.teamId ? <TeamsIcon className="h-4 w-4 text-muted-foreground" /> : null}
+                {row.original.teamId ? <Users className="h-4 w-4 text-muted-foreground" /> : null}
                 <span className="font-semibold">{row.original.name}</span>
               </div>
               {row.original.teamId ? (
@@ -128,11 +128,9 @@ export default function StaffTeamRolesPage() {
           <div className="flex flex-col">
             <span className="font-medium pl-6">{row.original.name}</span>
             {row.original.description ? (
-              <MarkdownPreview
-                className={`${MARKDOWN_CLASSNAME} pl-6 text-xs text-muted-foreground line-clamp-2`}
-              >
-                {row.original.description}
-              </MarkdownPreview>
+              <span className="pl-6 text-xs text-muted-foreground line-clamp-2">
+                {markdownToPlainText(row.original.description)}
+              </span>
             ) : null}
           </div>
         )
@@ -146,9 +144,9 @@ export default function StaffTeamRolesPage() {
         ? <span className="text-xs text-muted-foreground">-</span>
         : row.original.description
           ? (
-            <MarkdownPreview className={MARKDOWN_CLASSNAME}>
-              {row.original.description}
-            </MarkdownPreview>
+            <span className="text-xs text-muted-foreground line-clamp-2">
+              {markdownToPlainText(row.original.description)}
+            </span>
           )
           : <span className="text-xs text-muted-foreground">-</span>,
     },
@@ -277,7 +275,10 @@ export default function StaffTeamRolesPage() {
     })
     if (!confirmed) return
     try {
-      await deleteCrud('staff/team-roles', entry.id, { errorMessage: labels.errors.delete })
+      const headers = buildOptimisticLockHeader(entry.updatedAt)
+      await withScopedApiRequestHeaders(headers, () => (
+        deleteCrud('staff/team-roles', entry.id, { errorMessage: labels.errors.delete })
+      ))
       flash(labels.messages.deleted, 'success')
       handleRefresh()
     } catch (error) {
@@ -301,7 +302,13 @@ export default function StaffTeamRolesPage() {
           filterValues={filterValues}
           onFiltersApply={handleFiltersApply}
           onFiltersClear={handleFiltersClear}
-          emptyState={<p className="py-8 text-center text-sm text-muted-foreground">{labels.table.empty}</p>}
+          emptyState={(
+            <ListEmptyState
+              entityName={labels.title}
+              createHref="/backend/staff/team-roles/create"
+              createLabel={labels.actions.add}
+            />
+          )}
           actions={(
             <Button asChild size="sm">
               <Link href="/backend/staff/team-roles/create">
@@ -407,22 +414,3 @@ function buildTeamRoleRows(items: TeamRoleApiRow[], unassignedLabel: string): Te
 
 
 
-function TeamsIcon({ className }: { className?: string }) {
-  return (
-    <svg
-      width="16"
-      height="16"
-      viewBox="0 0 24 24"
-      fill="none"
-      stroke="currentColor"
-      strokeWidth="2"
-      className={className}
-      aria-hidden="true"
-    >
-      <circle cx="8" cy="8" r="3" />
-      <circle cx="16" cy="8" r="3" />
-      <path d="M3 20c0-3 3-5 5-5" />
-      <path d="M21 20c0-3-3-5-5-5" />
-    </svg>
-  )
-}

package/src/modules/staff/backend/staff/teams/[id]/edit/page.tsx

@@ -6,8 +6,9 @@ import { useRouter, useSearchParams } from 'next/navigation'
 import type { ColumnDef, SortingState } from '@tanstack/react-table'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
-import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { DataTable, withDataTableNamespaces } from '@open-mercato/ui/backend/DataTable'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
@@ -29,6 +30,8 @@ type TeamRecord = {
   description?: string | null
   isActive?: boolean
   is_active?: boolean
+  updatedAt?: string | null
+  updated_at?: string | null
 } & Record<string, unknown>
 
 type TeamResponse = {
@@ -199,6 +202,11 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
             name: record.name ?? '',
             description: record.description ?? '',
             isActive,
+            updatedAt: typeof record.updatedAt === 'string'
+              ? record.updatedAt
+              : typeof record.updated_at === 'string'
+                ? record.updated_at
+                : null,
             ...customFields,
           })
         }
@@ -278,7 +286,10 @@ export default function StaffTeamEditPage({ params }: { params?: { id?: string }
   const handleUnassignMember = React.useCallback(async (entry: TeamMemberRow) => {
     if (!teamId || entry.teamId !== teamId) return
     try {
-      await updateCrud('staff/team-members', { id: entry.id, teamId: null }, { errorMessage: memberLabels.errors.unassign })
+      const headers = buildOptimisticLockHeader(entry.updatedAt)
+      await withScopedApiRequestHeaders(headers, () => (
+        updateCrud('staff/team-members', { id: entry.id, teamId: null }, { errorMessage: memberLabels.errors.unassign })
+      ))
       flash(memberLabels.messages.unassigned, 'success')
       handleMemberRefresh()
     } catch (error) {
@@ -468,4 +479,3 @@ function mapApiTeamMember(item: Record<string, unknown>): TeamMemberRow {
     teamId,
   }, item)
 }
-

package/src/modules/staff/backend/staff/teams/page.tsx

@@ -7,21 +7,22 @@ import type { ColumnDef, SortingState } from '@tanstack/react-table'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { DataTable, withDataTableNamespaces } from '@open-mercato/ui/backend/DataTable'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
-import { MarkdownPreview } from '@open-mercato/ui/backend/markdown/MarkdownContent'
+import { markdownToPlainText } from '@open-mercato/ui/backend/markdown/markdownToPlainText'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { BooleanIcon } from '@open-mercato/ui/backend/ValueIcons'
-import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { 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 { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
+import { ListEmptyState } from '@open-mercato/ui/backend/filters/ListEmptyState'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { Users } from 'lucide-react'
 import { formatDateTime } from '@open-mercato/shared/lib/time'
 
 const PAGE_SIZE = 50
-const MARKDOWN_CLASSNAME =
-  'text-sm text-foreground break-words [&>*]:mb-2 [&>*:last-child]:mb-0 [&_ul]:ml-4 [&_ul]:list-disc [&_ol]:ml-4 [&_ol]:list-decimal [&_code]:rounded [&_code]:bg-muted [&_code]:px-1 [&_code]:py-0.5 [&_pre]:rounded-md [&_pre]:bg-muted [&_pre]:p-3 [&_pre]:text-xs'
 
 type TeamRow = {
   id: string
@@ -91,11 +92,9 @@ export default function StaffTeamsPage() {
         <div className="flex flex-col">
           <span className="font-medium">{row.original.name}</span>
           {row.original.description ? (
-            <MarkdownPreview
-              className={`${MARKDOWN_CLASSNAME} text-xs text-muted-foreground line-clamp-2`}
-            >
-              {row.original.description}
-            </MarkdownPreview>
+            <span className="text-xs text-muted-foreground line-clamp-2">
+              {markdownToPlainText(row.original.description)}
+            </span>
           ) : null}
         </div>
       ),
@@ -106,9 +105,9 @@ export default function StaffTeamsPage() {
       meta: { priority: 4 },
       cell: ({ row }) => row.original.description
         ? (
-          <MarkdownPreview className={MARKDOWN_CLASSNAME}>
-            {row.original.description}
-          </MarkdownPreview>
+          <span className="text-xs text-muted-foreground line-clamp-2">
+            {markdownToPlainText(row.original.description)}
+          </span>
         )
         : <span className="text-xs text-muted-foreground">-</span>,
     },
@@ -207,14 +206,18 @@ export default function StaffTeamsPage() {
     })
     if (!confirmed) return
     try {
-      await deleteCrud('staff/teams', entry.id, { errorMessage: labels.errors.delete })
+      await withScopedApiRequestHeaders(
+        buildOptimisticLockHeader(entry.updatedAt),
+        () => deleteCrud('staff/teams', entry.id, { errorMessage: labels.errors.delete }),
+      )
       flash(labels.messages.deleted, 'success')
       handleRefresh()
     } catch (error) {
+      if (surfaceRecordConflict(error, t)) { handleRefresh(); return }
       console.error('staff.teams.delete', error)
       flash(labels.errors.delete, 'error')
     }
-  }, [confirm, handleRefresh, labels.actions.deleteConfirm, labels.actions.delete, labels.errors.delete, labels.errors.deleteAssigned, labels.messages.deleted])
+  }, [confirm, handleRefresh, labels.actions.deleteConfirm, labels.actions.delete, labels.errors.delete, labels.errors.deleteAssigned, labels.messages.deleted, t])
 
   return (
     <Page>
@@ -227,7 +230,13 @@ export default function StaffTeamsPage() {
           searchValue={search}
           onSearchChange={handleSearchChange}
           searchPlaceholder={labels.table.search}
-          emptyState={<p className="py-8 text-center text-sm text-muted-foreground">{labels.table.empty}</p>}
+          emptyState={(
+            <ListEmptyState
+              entityName={labels.title}
+              createHref="/backend/staff/teams/create"
+              createLabel={labels.actions.add}
+            />
+          )}
           actions={(
             <Button asChild size="sm">
               <Link href="/backend/staff/teams/create">

package/src/modules/staff/backend/staff/timesheets/page.tsx

@@ -290,6 +290,10 @@ export default function MyTimesheetsPage() {
           .filter((id) => id.length > 0),
       )
 
+      const entriesParams = new URLSearchParams({ pageSize: '100', staffMemberId: memberId })
+      if (dateRange.from) entriesParams.set('from', dateRange.from)
+      if (dateRange.to) entriesParams.set('to', dateRange.to)
+
       const [projectsRes, entriesRes] = await Promise.all([
         assignedProjectIds.length > 0
           ? readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(
@@ -299,7 +303,7 @@ export default function MyTimesheetsPage() {
             )
           : Promise.resolve({ items: [] as Array<Record<string, unknown>> }),
         readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(
-          `/api/staff/timesheets/time-entries?pageSize=100&staffMemberId=${memberId}&from=${dateRange.from}&to=${dateRange.to}`,
+          `/api/staff/timesheets/time-entries?${entriesParams.toString()}`,
           undefined,
           { errorMessage: t('staff.timesheets.my.errors.load', 'Failed to load timesheets.'), fallback: { items: [] } },
         ),
@@ -530,6 +534,11 @@ export default function MyTimesheetsPage() {
   // --- Add row handler ---
   const visibleProjectIds = React.useMemo(() => new Set(projects.map((p) => p.id)), [projects])
 
+  // optimistic-lock-exempt: the my-projects PATCH calls below only toggle the
+  // caller's own `showInGrid` preference on the staff.timesheets.time_project_member
+  // junction (a per-user membership flag). There is no shared, multi-user-editable
+  // state to lose, so version-locking the toggle would surface false 409s without
+  // protecting any data.
   const handleAddProject = React.useCallback(async (project: ProjectRow) => {
     try {
       const payload = { showInGrid: true }

package/src/modules/staff/backend/staff/timesheets/projects/[id]/edit/page.tsx

@@ -9,7 +9,7 @@ import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { createCrudFormError } from '@open-mercato/ui/backend/utils/serverErrors'
 import { E } from '#generated/entities.ids.generated'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { LoadingMessage, ErrorMessage } from '@open-mercato/ui/backend/detail'
+import { LoadingMessage, ErrorMessage, RecordNotFoundState } 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 {
@@ -31,6 +31,7 @@ export default function TimesheetProjectEditPage({ params }: { params?: { id?: s
   const [initialValues, setInitialValues] = React.useState<ProjectFormValues | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
 
   const formSchema = React.useMemo(() => createProjectFormSchema(), [])
   const fields = React.useMemo(() => createProjectFormFields(t), [t])
@@ -42,6 +43,7 @@ export default function TimesheetProjectEditPage({ params }: { params?: { id?: s
     async function load() {
       setLoading(true)
       setError(null)
+      setIsNotFound(false)
       try {
         const payload = await readApiResultOrThrow<{ items?: Array<Record<string, unknown>> }>(
           `/api/staff/timesheets/time-projects?ids=${projectId}&pageSize=1`,
@@ -49,7 +51,10 @@ export default function TimesheetProjectEditPage({ params }: { params?: { id?: s
           { errorMessage: t('staff.timesheets.projects.errors.load', 'Failed to load project.') },
         )
         const record = Array.isArray(payload.items) ? payload.items[0] : null
-        if (!record) throw new Error(t('staff.timesheets.projects.errors.notFound', 'Project not found.'))
+        if (!record) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         if (!cancelled) {
           setInitialValues({
             id: String(record.id ?? ''),
@@ -82,8 +87,22 @@ export default function TimesheetProjectEditPage({ params }: { params?: { id?: s
     return <Page><PageBody><LoadingMessage label={t('staff.timesheets.projects.loading', 'Loading project...')} /></PageBody></Page>
   }
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('staff.timesheets.projects.errors.notFound', 'Project not found.')}
+            backHref={LIST_HREF}
+            backLabel={t('staff.timesheets.projects.actions.backToList', 'Back to projects')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
   if (error || !initialValues) {
-    return <Page><PageBody><ErrorMessage label={error ?? t('staff.timesheets.projects.errors.notFound', 'Project not found.')} /></PageBody></Page>
+    return <Page><PageBody><ErrorMessage label={error ?? t('staff.timesheets.projects.errors.load', 'Failed to load project.')} /></PageBody></Page>
   }
 
   const detailHref = `/backend/staff/timesheets/projects/${projectId}`

package/src/modules/staff/backend/staff/timesheets/projects/[id]/page.tsx

@@ -3,6 +3,7 @@
 import * as React from 'react'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { Button } from '@open-mercato/ui/primitives/button'
+import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@open-mercato/ui/primitives/dialog'
 import { LookupSelect } from '@open-mercato/ui/backend/inputs/LookupSelect'
@@ -13,7 +14,7 @@ import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { LoadingMessage } from '@open-mercato/ui/backend/detail'
-import { ErrorMessage } from '@open-mercato/ui/backend/detail'
+import { ErrorMessage, RecordNotFoundState } from '@open-mercato/ui/backend/detail'
 import { ArrowLeft, Plus, Pencil, ChevronDown, Trash2, User } from 'lucide-react'
 import Link from 'next/link'
 
@@ -75,6 +76,7 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
   const [project, setProject] = React.useState<ProjectRecord | null>(null)
   const [loading, setLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
+  const [isNotFound, setIsNotFound] = React.useState(false)
 
   const [employees, setEmployees] = React.useState<EmployeeAssignment[]>([])
   const [employeesLoading, setEmployeesLoading] = React.useState(false)
@@ -118,6 +120,7 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
     async function loadProject() {
       setLoading(true)
       setError(null)
+      setIsNotFound(false)
       try {
         const queryParams = new URLSearchParams({ page: '1', pageSize: '1', ids: projectId! })
         const payload = await readApiResultOrThrow<ProjectResponse>(
@@ -126,7 +129,10 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
           { errorMessage: t('staff.timesheets.projects.errors.load', 'Failed to load project.') },
         )
         const record = Array.isArray(payload.items) ? payload.items[0] : null
-        if (!record) throw new Error(t('staff.timesheets.projects.errors.notFound', 'Project not found.'))
+        if (!record) {
+          if (!cancelled) setIsNotFound(true)
+          return
+        }
         if (!cancelled) setProject(record)
       } catch (loadError) {
         if (!cancelled) {
@@ -210,6 +216,10 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
     })
   }, [])
 
+  // optimistic-lock-exempt: the employee add/remove calls below mutate the
+  // time-project ↔ staff-member assignment junction (createCrud/deleteCrud of a
+  // membership row), not a shared editable aggregate. Junction add/remove is exempt
+  // from OSS optimistic locking per the data-integrity contract.
   // --- Remove employee ---
   const handleRemoveEmployee = React.useCallback(async (emp: EmployeeAssignment) => {
     const confirmed = await confirm({
@@ -298,11 +308,25 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
     )
   }
 
+  if (isNotFound) {
+    return (
+      <Page>
+        <PageBody>
+          <RecordNotFoundState
+            label={t('staff.timesheets.projects.errors.notFound', 'Project not found.')}
+            backHref={BACK_HREF}
+            backLabel={t('staff.timesheets.projects.actions.backToList', 'Back to projects')}
+          />
+        </PageBody>
+      </Page>
+    )
+  }
+
   if (error || !project) {
     return (
       <Page>
         <PageBody>
-          <ErrorMessage label={error ?? t('staff.timesheets.projects.errors.notFound', 'Project not found.')} />
+          <ErrorMessage label={error ?? t('staff.timesheets.projects.errors.load', 'Failed to load project.')} />
         </PageBody>
       </Page>
     )
@@ -351,9 +375,12 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
                 <div>
                   <dt className="font-medium text-muted-foreground">{t('staff.timesheets.projects.form.status', 'Status')}</dt>
                   <dd>
-                    <span className={`inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium capitalize ${projectStatus === 'active' ? 'bg-green-100 text-green-800' : projectStatus === 'on_hold' ? 'bg-yellow-100 text-yellow-800' : 'bg-gray-100 text-gray-800'}`}>
+                    <Badge
+                      variant={projectStatus === 'active' ? 'success' : projectStatus === 'on_hold' ? 'warning' : 'neutral'}
+                      className="capitalize"
+                    >
                       {projectStatus}
-                    </span>
+                    </Badge>
                   </dd>
                 </div>
                 {projectType ? (
@@ -443,9 +470,12 @@ export default function TimesheetProjectDetailPage({ params }: { params?: { id?:
                           </div>
                         </div>
                         <div className="flex items-center gap-3 shrink-0">
-                          <span className={`inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium capitalize ${emp.status === 'active' ? 'bg-green-100 text-green-800' : 'bg-gray-100 text-gray-800'}`}>
+                          <Badge
+                            variant={(emp.status ?? 'active') === 'active' ? 'success' : 'neutral'}
+                            className="capitalize"
+                          >
                             {emp.status ?? 'active'}
-                          </span>
+                          </Badge>
                           {emp.assignedStartDate ? (
                             <span className="text-xs text-muted-foreground hidden sm:inline">
                               {emp.assignedStartDate}

package/src/modules/staff/backend/staff/timesheets/projects/page.tsx

@@ -9,7 +9,9 @@ import { DataTable, withDataTableNamespaces } from '@open-mercato/ui/backend/Dat
 import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterOverlay'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { 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 { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
@@ -467,15 +469,19 @@ export default function TimesheetProjectsPage() {
       })
       if (!confirmed) return
       try {
-        await deleteCrud('staff/timesheets/time-projects', entry.id, { errorMessage: labels.errors.delete })
+        await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(entry.updatedAt),
+          () => deleteCrud('staff/timesheets/time-projects', entry.id, { errorMessage: labels.errors.delete }),
+        )
         flash(labels.messages.deleted, 'success')
         handleRefresh()
       } catch (error) {
+        if (surfaceRecordConflict(error, t)) { handleRefresh(); return }
         console.error('staff.timesheets.projects.delete', error)
         flash(labels.errors.delete, 'error')
       }
     },
-    [confirm, handleRefresh, labels.actions.deleteConfirm, labels.actions.delete, labels.errors.delete, labels.messages.deleted],
+    [confirm, handleRefresh, t, labels.actions.deleteConfirm, labels.actions.delete, labels.errors.delete, labels.messages.deleted],
   )
 
   const columns = React.useMemo<ColumnDef<ProjectRow>[]>(

package/src/modules/staff/commands/activities.ts

@@ -23,6 +23,7 @@ import {
 } from '../data/validators'
 import { staffTeamMemberActivityCrudEvents } from '../lib/crud'
 import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload, requireTeamMember } from './shared'
+import { resolveRedoSnapshot } from '@open-mercato/shared/lib/commands/redo'
 import { E } from '#generated/entities.ids.generated'
 import {
   loadCustomFieldSnapshot,
@@ -192,6 +193,61 @@ const createActivityCommand: CommandHandler<
       await em.flush()
     }
   },
+  redo: async ({ logEntry, ctx }) => {
+    const after = resolveRedoSnapshot<ActivitySnapshot>(logEntry)
+    if (!after) {
+      throw new CrudHttpError(400, { error: '[internal] redo snapshot unavailable for activity create' })
+    }
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const member = await requireTeamMember(em, after.activity.memberId, 'Team member not found')
+    let activity = await em.findOne(StaffTeamMemberActivity, { id: after.activity.id })
+    if (!activity) {
+      activity = em.create(StaffTeamMemberActivity, {
+        id: after.activity.id,
+        organizationId: after.activity.organizationId,
+        tenantId: after.activity.tenantId,
+        member,
+        activityType: after.activity.activityType,
+        subject: after.activity.subject,
+        body: after.activity.body,
+        occurredAt: after.activity.occurredAt ?? null,
+        authorUserId: after.activity.authorUserId,
+        appearanceIcon: after.activity.appearanceIcon,
+        appearanceColor: after.activity.appearanceColor,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      })
+      em.persist(activity)
+    } else {
+      activity.member = member
+      activity.activityType = after.activity.activityType
+      activity.subject = after.activity.subject
+      activity.body = after.activity.body
+      activity.occurredAt = after.activity.occurredAt ?? null
+      activity.authorUserId = after.activity.authorUserId
+      activity.appearanceIcon = after.activity.appearanceIcon
+      activity.appearanceColor = after.activity.appearanceColor
+    }
+    await em.flush()
+
+    await setActivityCustomFields(ctx, activity.id, activity.organizationId, activity.tenantId, after.custom ?? {})
+
+    const de = (ctx.container.resolve('dataEngine') as DataEngine)
+    await emitCrudSideEffects({
+      dataEngine: de,
+      action: 'created',
+      entity: activity,
+      identifiers: {
+        id: activity.id,
+        organizationId: activity.organizationId,
+        tenantId: activity.tenantId,
+      },
+      events: staffTeamMemberActivityCrudEvents,
+      indexer: activityCrudIndexer,
+    })
+
+    return { activityId: activity.id, authorUserId: activity.authorUserId ?? null }
+  },
 }
 
 const updateActivityCommand: CommandHandler<StaffTeamMemberActivityUpdateInput, { activityId: string }> = {

package/src/modules/staff/commands/addresses.ts

@@ -18,6 +18,7 @@ import {
   requireTeamMember,
 } from './shared'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
+import { resolveRedoSnapshot } from '@open-mercato/shared/lib/commands/redo'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
 import { E } from '#generated/entities.ids.generated'
@@ -175,6 +176,77 @@ const createAddressCommand: CommandHandler<StaffTeamMemberAddressCreateInput, {
       await em.flush()
     }
   },
+  redo: async ({ logEntry, ctx }) => {
+    const after = resolveRedoSnapshot<AddressSnapshot>(logEntry)
+    if (!after) {
+      throw new CrudHttpError(400, { error: '[internal] redo snapshot unavailable for address create' })
+    }
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const member = await requireTeamMember(em, after.memberId, 'Team member not found')
+    let address = await em.findOne(StaffTeamMemberAddress, { id: after.id })
+    if (!address) {
+      address = em.create(StaffTeamMemberAddress, {
+        id: after.id,
+        organizationId: after.organizationId,
+        tenantId: after.tenantId,
+        member,
+        name: after.name,
+        purpose: after.purpose,
+        companyName: after.companyName,
+        addressLine1: after.addressLine1,
+        addressLine2: after.addressLine2,
+        buildingNumber: after.buildingNumber,
+        flatNumber: after.flatNumber,
+        city: after.city,
+        region: after.region,
+        postalCode: after.postalCode,
+        country: after.country,
+        latitude: after.latitude,
+        longitude: after.longitude,
+        isPrimary: after.isPrimary,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      })
+      em.persist(address)
+    } else {
+      address.member = member
+      address.name = after.name
+      address.purpose = after.purpose
+      address.companyName = after.companyName
+      address.addressLine1 = after.addressLine1
+      address.addressLine2 = after.addressLine2
+      address.buildingNumber = after.buildingNumber
+      address.flatNumber = after.flatNumber
+      address.city = after.city
+      address.region = after.region
+      address.postalCode = after.postalCode
+      address.country = after.country
+      address.latitude = after.latitude
+      address.longitude = after.longitude
+      address.isPrimary = after.isPrimary
+    }
+    await em.flush()
+    if (after.isPrimary) {
+      await enforcePrimaryAddress(em, after.memberId, after.id)
+      await em.flush()
+    }
+
+    const de = (ctx.container.resolve('dataEngine') as DataEngine)
+    await emitCrudSideEffects({
+      dataEngine: de,
+      action: 'created',
+      entity: address,
+      identifiers: {
+        id: address.id,
+        organizationId: address.organizationId,
+        tenantId: address.tenantId,
+      },
+      events: staffTeamMemberAddressCrudEvents,
+      indexer: addressCrudIndexer,
+    })
+
+    return { addressId: address.id }
+  },
 }
 
 const updateAddressCommand: CommandHandler<StaffTeamMemberAddressUpdateInput, { addressId: string }> = {