@open-mercato/core 0.6.4-develop.4371.1.8f3030407e → 0.6.4

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

@@ -15,6 +15,7 @@ import {
 } from '../data/validators'
 import { staffTeamMemberCommentCrudEvents } from '../lib/crud'
 import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload, requireTeamMember } from './shared'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import { E } from '#generated/entities.ids.generated'
 
 const commentCrudIndexer: CrudIndexerConfig<StaffTeamMemberComment> = {
@@ -131,6 +132,30 @@ const createCommentCommand: CommandHandler<
       await em.flush()
     }
   },
+  redo: makeCreateRedo<
+    StaffTeamMemberComment,
+    CommentSnapshot,
+    StaffTeamMemberCommentCreateInput,
+    { commentId: string; authorUserId: string | null }
+  >({
+    entityClass: StaffTeamMemberComment,
+    events: staffTeamMemberCommentCrudEvents,
+    indexer: commentCrudIndexer,
+    seedFromSnapshot: (snapshot) => ({
+      id: snapshot.id,
+      organizationId: snapshot.organizationId,
+      tenantId: snapshot.tenantId,
+      body: snapshot.body,
+      authorUserId: snapshot.authorUserId,
+      appearanceIcon: snapshot.appearanceIcon,
+      appearanceColor: snapshot.appearanceColor,
+    }),
+    beforeRestore: async ({ em, snapshot }) => {
+      const member = await requireTeamMember(em, snapshot.memberId, 'Team member not found')
+      return { member }
+    },
+    buildResult: (entity) => ({ commentId: entity.id, authorUserId: entity.authorUserId ?? null }),
+  }),
 }
 
 const updateCommentCommand: CommandHandler<StaffTeamMemberCommentUpdateInput, { commentId: string }> = {

package/src/modules/staff/commands/job-histories.ts

@@ -18,10 +18,17 @@ 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 {
+  enforceCommandOptimisticLock,
+  enforceRecordGoneIsConflict,
+} from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
 import { E } from '#generated/entities.ids.generated'
 
+const JOB_HISTORY_LOCK_RESOURCE_KIND = 'staff.jobHistory'
+
 const jobHistoryCrudIndexer: CrudIndexerConfig<StaffTeamMemberJobHistory> = {
   entityType: E.staff.staff_team_member_job_history,
 }
@@ -36,6 +43,7 @@ type JobHistorySnapshot = {
   description: string | null
   startDate: string
   endDate: string | null
+  updatedAt: string
 }
 
 type JobHistoryUndoPayload = {
@@ -56,6 +64,7 @@ async function loadJobHistorySnapshot(em: EntityManager, id: string): Promise<Jo
     description: record.description ?? null,
     startDate: record.startDate.toISOString(),
     endDate: record.endDate ? record.endDate.toISOString() : null,
+    updatedAt: record.updatedAt.toISOString(),
   }
 }
 
@@ -135,6 +144,55 @@ const createJobHistoryCommand: CommandHandler<StaffTeamMemberJobHistoryCreateInp
       await em.flush()
     }
   },
+  redo: async ({ logEntry, ctx }) => {
+    const after = resolveRedoSnapshot<JobHistorySnapshot>(logEntry)
+    if (!after) {
+      throw new CrudHttpError(400, { error: '[internal] redo snapshot unavailable for job history create' })
+    }
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const member = await requireTeamMember(em, after.memberId, 'Team member not found')
+    let record = await em.findOne(StaffTeamMemberJobHistory, { id: after.id })
+    if (!record) {
+      record = em.create(StaffTeamMemberJobHistory, {
+        id: after.id,
+        organizationId: after.organizationId,
+        tenantId: after.tenantId,
+        member,
+        name: after.name,
+        companyName: after.companyName,
+        description: after.description,
+        startDate: new Date(after.startDate),
+        endDate: after.endDate ? new Date(after.endDate) : null,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+      })
+      em.persist(record)
+    } else {
+      record.member = member
+      record.name = after.name
+      record.companyName = after.companyName
+      record.description = after.description
+      record.startDate = new Date(after.startDate)
+      record.endDate = after.endDate ? new Date(after.endDate) : null
+    }
+    await em.flush()
+
+    const de = (ctx.container.resolve('dataEngine') as DataEngine)
+    await emitCrudSideEffects({
+      dataEngine: de,
+      action: 'created',
+      entity: record,
+      identifiers: {
+        id: record.id,
+        organizationId: record.organizationId,
+        tenantId: record.tenantId,
+      },
+      events: staffTeamMemberJobHistoryCrudEvents,
+      indexer: jobHistoryCrudIndexer,
+    })
+
+    return { jobHistoryId: record.id }
+  },
 }
 
 const updateJobHistoryCommand: CommandHandler<StaffTeamMemberJobHistoryUpdateInput, { jobHistoryId: string }> = {
@@ -149,9 +207,24 @@ const updateJobHistoryCommand: CommandHandler<StaffTeamMemberJobHistoryUpdateInp
     const parsed = staffTeamMemberJobHistoryUpdateSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const record = await em.findOne(StaffTeamMemberJobHistory, { id: parsed.id })
-    if (!record) throw new CrudHttpError(404, { error: 'Job history entry not found' })
+    if (!record) {
+      enforceRecordGoneIsConflict({
+        resourceKind: JOB_HISTORY_LOCK_RESOURCE_KIND,
+        resourceId: parsed.id,
+        expected: parsed.updatedAt ?? null,
+        request: ctx.request ?? null,
+      })
+      throw new CrudHttpError(404, { error: 'Job history entry not found' })
+    }
     ensureTenantScope(ctx, record.tenantId)
     ensureOrganizationScope(ctx, record.organizationId)
+    enforceCommandOptimisticLock({
+      resourceKind: JOB_HISTORY_LOCK_RESOURCE_KIND,
+      resourceId: record.id,
+      current: record.updatedAt ?? null,
+      expected: parsed.updatedAt ?? null,
+      request: ctx.request ?? null,
+    })
 
     if (parsed.entityId !== undefined) {
       const member = await requireTeamMember(em, parsed.entityId, 'Team member not found')
@@ -268,7 +341,7 @@ const updateJobHistoryCommand: CommandHandler<StaffTeamMemberJobHistoryUpdateInp
   },
 }
 
-const deleteJobHistoryCommand: CommandHandler<{ body?: Record<string, unknown>; query?: Record<string, unknown> }, { jobHistoryId: string }> =
+const deleteJobHistoryCommand: CommandHandler<{ id?: string; updatedAt?: string; body?: Record<string, unknown>; query?: Record<string, unknown> }, { jobHistoryId: string }> =
   {
     id: 'staff.team-member-job-histories.delete',
     async prepare(input, ctx) {
@@ -279,11 +352,27 @@ const deleteJobHistoryCommand: CommandHandler<{ body?: Record<string, unknown>;
     },
     async execute(input, ctx) {
       const id = requireId(input, 'Job history id required')
+      const expectedUpdatedAt = typeof input.updatedAt === 'string' ? input.updatedAt : undefined
       const em = (ctx.container.resolve('em') as EntityManager).fork()
       const record = await em.findOne(StaffTeamMemberJobHistory, { id })
-      if (!record) throw new CrudHttpError(404, { error: 'Job history entry not found' })
+      if (!record) {
+        enforceRecordGoneIsConflict({
+          resourceKind: JOB_HISTORY_LOCK_RESOURCE_KIND,
+          resourceId: id,
+          expected: expectedUpdatedAt ?? null,
+          request: ctx.request ?? null,
+        })
+        throw new CrudHttpError(404, { error: 'Job history entry not found' })
+      }
       ensureTenantScope(ctx, record.tenantId)
       ensureOrganizationScope(ctx, record.organizationId)
+      enforceCommandOptimisticLock({
+        resourceKind: JOB_HISTORY_LOCK_RESOURCE_KIND,
+        resourceId: record.id,
+        current: record.updatedAt ?? null,
+        expected: expectedUpdatedAt ?? null,
+        request: ctx.request ?? null,
+      })
       em.remove(record)
       await em.flush()
 

package/src/modules/staff/commands/leave-requests.ts

@@ -5,6 +5,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { emitCrudSideEffects, emitCrudUndoSideEffects, buildChanges } from '@open-mercato/shared/lib/commands/helpers'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
@@ -143,6 +144,29 @@ async function loadLeaveRequestSnapshot(em: EntityManager, id: string): Promise<
   }
 }
 
+function leaveRequestSeedFromSnapshot(snapshot: LeaveRequestSnapshot): Record<string, unknown> {
+  return {
+    id: snapshot.id,
+    tenantId: snapshot.tenantId,
+    organizationId: snapshot.organizationId,
+    member: snapshot.memberId,
+    startDate: new Date(snapshot.startDate),
+    endDate: new Date(snapshot.endDate),
+    timezone: snapshot.timezone,
+    status: snapshot.status,
+    unavailabilityReasonEntryId: snapshot.unavailabilityReasonEntryId ?? null,
+    unavailabilityReasonValue: snapshot.unavailabilityReasonValue ?? null,
+    note: snapshot.note ?? null,
+    decisionComment: snapshot.decisionComment ?? null,
+    submittedByUserId: snapshot.submittedByUserId ?? null,
+    decidedByUserId: snapshot.decidedByUserId ?? null,
+    decidedAt: snapshot.decidedAt ? new Date(snapshot.decidedAt) : null,
+    createdAt: snapshot.createdAt ? new Date(snapshot.createdAt) : new Date(),
+    updatedAt: new Date(),
+    deletedAt: null,
+  }
+}
+
 async function requireLeaveRequest(em: EntityManager, id: string): Promise<StaffLeaveRequest> {
   const request = await findOneWithDecryption(em, StaffLeaveRequest, { id, deletedAt: null }, undefined, { tenantId: null, organizationId: null })
   if (!request) throw new CrudHttpError(404, { error: 'Leave request not found.' })
@@ -347,6 +371,22 @@ const createLeaveRequestCommand: CommandHandler<StaffLeaveRequestCreateInput, {
       })
     }
   },
+  redo: makeCreateRedo<StaffLeaveRequest, LeaveRequestSnapshot, StaffLeaveRequestCreateInput, { requestId: string }>({
+    entityClass: StaffLeaveRequest,
+    getSnapshotId: (snapshot) => snapshot.id,
+    seedFromSnapshot: leaveRequestSeedFromSnapshot,
+    findRow: ({ em, id, snapshot }) =>
+      findOneWithDecryption(
+        em,
+        StaffLeaveRequest,
+        { id },
+        undefined,
+        { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId },
+      ),
+    buildResult: (entity) => ({ requestId: entity.id }),
+    events: staffLeaveRequestCrudEvents,
+    indexer: leaveRequestCrudIndexer,
+  }),
 }
 
 const updateLeaveRequestCommand: CommandHandler<StaffLeaveRequestUpdateInput, { requestId: string }> = {

package/src/modules/staff/commands/tag-assignments.ts

@@ -126,6 +126,41 @@ const assignTeamMemberTagCommand: CommandHandler<StaffTeamMemberTagAssignmentInp
       events: staffTeamMemberCrudEvents,
     })
   },
+  redo: async ({ logEntry, ctx }) => {
+    const payload = extractUndoPayload<TeamMemberTagAssignmentUndoPayload>(logEntry)
+    const before = payload?.before
+    if (!before) return { memberId: logEntry.resourceId ?? '' }
+    const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const member = await findOneWithDecryption(
+      em,
+      StaffTeamMember,
+      { id: before.memberId, deletedAt: null },
+      undefined,
+      { tenantId: before.tenantId, organizationId: before.organizationId },
+    )
+    if (!member) throw new CrudHttpError(404, { error: 'Team member not found.' })
+    const currentTags = normalizeTagList(Array.isArray(member.tags) ? member.tags : [])
+    if (!currentTags.includes(before.tag)) {
+      member.tags = normalizeTagList([...currentTags, before.tag])
+      member.updatedAt = new Date()
+      await em.flush()
+    }
+
+    const dataEngine = (ctx.container.resolve('dataEngine') as DataEngine)
+    await emitCrudSideEffects({
+      dataEngine,
+      action: 'updated',
+      entity: member,
+      identifiers: {
+        id: member.id,
+        tenantId: member.tenantId,
+        organizationId: member.organizationId,
+      },
+      events: staffTeamMemberCrudEvents,
+    })
+
+    return { memberId: member.id }
+  },
 }
 
 const unassignTeamMemberTagCommand: CommandHandler<StaffTeamMemberTagAssignmentInput, { memberId: string }> = {

package/src/modules/staff/commands/team-members.ts

@@ -6,6 +6,7 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { findOneWithDecryption, findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { buildChanges, emitCrudSideEffects, emitCrudUndoSideEffects, parseWithCustomFields, setCustomFieldsIfAny } from '@open-mercato/shared/lib/commands/helpers'
 import { buildCustomFieldResetMap, diffCustomFieldChanges, loadCustomFieldSnapshot, type CustomFieldSnapshot } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
@@ -88,6 +89,34 @@ async function loadTeamMemberCustomSnapshot(
   })
 }
 
+function teamMemberSeedFromSnapshot(snapshot: TeamMemberSnapshot): Record<string, unknown> {
+  return {
+    id: snapshot.id,
+    tenantId: snapshot.tenantId,
+    organizationId: snapshot.organizationId,
+    teamId: snapshot.teamId ?? null,
+    displayName: snapshot.displayName,
+    description: snapshot.description ?? null,
+    userId: snapshot.userId ?? null,
+    roleIds: Array.isArray(snapshot.roleIds) ? snapshot.roleIds : [],
+    tags: Array.isArray(snapshot.tags) ? snapshot.tags : [],
+    availabilityRuleSetId: null,
+    isActive: snapshot.isActive,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    deletedAt: null,
+  }
+}
+
+const redoTeamMemberCreate = makeCreateRedo<StaffTeamMember, TeamMemberSnapshot, StaffTeamMemberCreateInput, { memberId: string }>({
+  entityClass: StaffTeamMember,
+  getSnapshotId: (snapshot) => snapshot.id,
+  seedFromSnapshot: teamMemberSeedFromSnapshot,
+  buildResult: (entity) => ({ memberId: entity.id }),
+  events: staffTeamMemberCrudEvents,
+  indexer: teamMemberCrudIndexer,
+})
+
 async function ensureRolesExist(em: EntityManager, roleIds: string[], tenantId: string, organizationId: string): Promise<void> {
   if (!roleIds.length) return
   const roles = await findWithDecryption(
@@ -245,6 +274,22 @@ const createTeamMemberCommand: CommandHandler<StaffTeamMemberCreateInput, { memb
       })
     }
   },
+  redo: async ({ logEntry, ctx }) => {
+    const result = await redoTeamMemberCreate({ input: undefined as unknown as StaffTeamMemberCreateInput, ctx, logEntry })
+    const payload = extractUndoPayload<TeamMemberUndoPayload>(logEntry)
+    const customAfter = payload?.customAfter
+    if (customAfter && Object.keys(customAfter).length) {
+      await setCustomFieldsIfAny({
+        dataEngine: ctx.container.resolve('dataEngine') as DataEngine,
+        entityId: E.staff.staff_team_member,
+        recordId: result.memberId,
+        tenantId: payload?.after?.tenantId ?? '',
+        organizationId: payload?.after?.organizationId ?? '',
+        values: customAfter,
+      })
+    }
+    return result
+  },
 }
 
 const updateTeamMemberCommand: CommandHandler<StaffTeamMemberUpdateInput, { memberId: string }> = {

package/src/modules/staff/commands/team-roles.ts

@@ -6,6 +6,7 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { buildChanges, emitCrudSideEffects, emitCrudUndoSideEffects, parseWithCustomFields, setCustomFieldsIfAny } from '@open-mercato/shared/lib/commands/helpers'
 import { buildCustomFieldResetMap, diffCustomFieldChanges, loadCustomFieldSnapshot, type CustomFieldSnapshot } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
 import { StaffTeam, StaffTeamMember, StaffTeamRole } from '../data/entities'
@@ -70,6 +71,13 @@ async function loadTeamRoleCustomSnapshot(
   })
 }
 
+const redoTeamRoleCreate = makeCreateRedo<StaffTeamRole, TeamRoleSnapshot, StaffTeamRoleCreateInput, { roleId: string }>({
+  entityClass: StaffTeamRole,
+  buildResult: (entity) => ({ roleId: entity.id }),
+  events: staffTeamRoleCrudEvents,
+  indexer: teamRoleCrudIndexer,
+})
+
 async function ensureTeamExists(
   em: EntityManager,
   teamId: string,
@@ -191,6 +199,22 @@ const createTeamRoleCommand: CommandHandler<StaffTeamRoleCreateInput, { roleId:
       })
     }
   },
+  redo: async ({ logEntry, ctx }) => {
+    const result = await redoTeamRoleCreate({ input: undefined as unknown as StaffTeamRoleCreateInput, ctx, logEntry })
+    const payload = extractUndoPayload<TeamRoleUndoPayload>(logEntry)
+    const customAfter = payload?.customAfter
+    if (customAfter && Object.keys(customAfter).length) {
+      await setCustomFieldsIfAny({
+        dataEngine: ctx.container.resolve('dataEngine') as DataEngine,
+        entityId: E.staff.staff_team_role,
+        recordId: result.roleId,
+        tenantId: payload?.after?.tenantId ?? '',
+        organizationId: payload?.after?.organizationId ?? '',
+        values: customAfter,
+      })
+    }
+    return result
+  },
 }
 
 const updateTeamRoleCommand: CommandHandler<StaffTeamRoleUpdateInput, { roleId: string }> = {

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

@@ -6,6 +6,7 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { buildChanges, emitCrudSideEffects, emitCrudUndoSideEffects, parseWithCustomFields, setCustomFieldsIfAny } from '@open-mercato/shared/lib/commands/helpers'
 import { buildCustomFieldResetMap, diffCustomFieldChanges, loadCustomFieldSnapshot, type CustomFieldSnapshot } from '@open-mercato/shared/lib/commands/customFieldSnapshots'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
 import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
 import { StaffTeam, StaffTeamMember } from '../data/entities'
@@ -63,6 +64,13 @@ async function loadTeamCustomSnapshot(em: EntityManager, snapshot: TeamSnapshot)
   })
 }
 
+const redoTeamCreate = makeCreateRedo<StaffTeam, TeamSnapshot, StaffTeamCreateInput, { teamId: string }>({
+  entityClass: StaffTeam,
+  buildResult: (entity) => ({ teamId: entity.id }),
+  events: staffTeamCrudEvents,
+  indexer: teamCrudIndexer,
+})
+
 const createTeamCommand: CommandHandler<StaffTeamCreateInput, { teamId: string }> = {
   id: 'staff.teams.create',
   async execute(rawInput, ctx) {
@@ -163,6 +171,22 @@ const createTeamCommand: CommandHandler<StaffTeamCreateInput, { teamId: string }
       })
     }
   },
+  redo: async ({ logEntry, ctx }) => {
+    const result = await redoTeamCreate({ input: undefined as unknown as StaffTeamCreateInput, ctx, logEntry })
+    const payload = extractUndoPayload<TeamUndoPayload>(logEntry)
+    const customAfter = payload?.customAfter
+    if (customAfter && Object.keys(customAfter).length) {
+      await setCustomFieldsIfAny({
+        dataEngine: ctx.container.resolve('dataEngine') as DataEngine,
+        entityId: E.staff.staff_team,
+        recordId: result.teamId,
+        tenantId: payload?.after?.tenantId ?? '',
+        organizationId: payload?.after?.organizationId ?? '',
+        values: customAfter,
+      })
+    }
+    return result
+  },
 }
 
 const updateTeamCommand: CommandHandler<StaffTeamUpdateInput, { teamId: string }> = {

package/src/modules/staff/commands/timesheets-entries.ts

@@ -5,6 +5,7 @@ import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { buildChanges, emitCrudSideEffects, emitCrudUndoSideEffects } from '@open-mercato/shared/lib/commands/helpers'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
 import { StaffTimeEntry, StaffTimeProject, type StaffTimeEntrySource } from '../data/entities'
 
@@ -142,6 +143,28 @@ async function loadTimeEntrySnapshot(em: EntityManager, id: string): Promise<Tim
   }
 }
 
+function timeEntrySeedFromSnapshot(snapshot: TimeEntrySnapshot): Record<string, unknown> {
+  return {
+    id: snapshot.id,
+    tenantId: snapshot.tenantId,
+    organizationId: snapshot.organizationId,
+    staffMemberId: snapshot.staffMemberId,
+    date: snapshot.date,
+    durationMinutes: snapshot.durationMinutes,
+    startedAt: snapshot.startedAt ? new Date(snapshot.startedAt) : null,
+    endedAt: snapshot.endedAt ? new Date(snapshot.endedAt) : null,
+    notes: snapshot.notes ?? null,
+    timeProjectId: snapshot.timeProjectId ?? null,
+    customerId: snapshot.customerId ?? null,
+    dealId: snapshot.dealId ?? null,
+    orderId: snapshot.orderId ?? null,
+    source: (snapshot.source ?? 'manual') as StaffTimeEntrySource,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    deletedAt: null,
+  }
+}
+
 const createTimeEntryCommand: CommandHandler<StaffTimeEntryCreateInput, { timeEntryId: string }> = {
   id: 'staff.timesheets.time_entries.create',
   async execute(rawInput, ctx) {
@@ -248,6 +271,14 @@ const createTimeEntryCommand: CommandHandler<StaffTimeEntryCreateInput, { timeEn
       })
     }
   },
+  redo: makeCreateRedo<StaffTimeEntry, TimeEntrySnapshot, StaffTimeEntryCreateInput, { timeEntryId: string }>({
+    entityClass: StaffTimeEntry,
+    getSnapshotId: (snapshot) => snapshot.id,
+    seedFromSnapshot: timeEntrySeedFromSnapshot,
+    buildResult: (entity) => ({ timeEntryId: entity.id }),
+    events: staffTimeEntryCrudEvents,
+    indexer: timeEntryCrudIndexer,
+  }),
 }
 
 const updateTimeEntryCommand: CommandHandler<StaffTimeEntryUpdateInput, { timeEntryId: string }> = {

package/src/modules/staff/commands/timesheets-projects.ts

@@ -6,6 +6,7 @@ import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { buildChanges, emitCrudSideEffects, emitCrudUndoSideEffects } from '@open-mercato/shared/lib/commands/helpers'
+import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
 import { StaffTeamMember, StaffTimeProject, StaffTimeProjectMember, type StaffTimeProjectStatus, type StaffTimeProjectMemberStatus } from '../data/entities'
 
@@ -117,6 +118,45 @@ async function loadTimeProjectMemberSnapshot(em: EntityManager, id: string): Pro
   }
 }
 
+function timeProjectSeedFromSnapshot(snapshot: TimeProjectSnapshot): Record<string, unknown> {
+  return {
+    id: snapshot.id,
+    tenantId: snapshot.tenantId,
+    organizationId: snapshot.organizationId,
+    name: snapshot.name,
+    customerId: snapshot.customerId ?? null,
+    code: snapshot.code,
+    description: snapshot.description ?? null,
+    projectType: snapshot.projectType ?? null,
+    color: snapshot.color ?? null,
+    status: (snapshot.status ?? 'active') as StaffTimeProjectStatus,
+    ownerUserId: snapshot.ownerUserId ?? null,
+    costCenter: snapshot.costCenter ?? null,
+    startDate: snapshot.startDate ? new Date(snapshot.startDate) : null,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    deletedAt: null,
+  }
+}
+
+function timeProjectMemberSeedFromSnapshot(snapshot: TimeProjectMemberSnapshot): Record<string, unknown> {
+  return {
+    id: snapshot.id,
+    tenantId: snapshot.tenantId,
+    organizationId: snapshot.organizationId,
+    timeProjectId: snapshot.timeProjectId,
+    staffMemberId: snapshot.staffMemberId,
+    role: snapshot.role ?? null,
+    status: (snapshot.status ?? 'active') as StaffTimeProjectMemberStatus,
+    showInGrid: snapshot.showInGrid ?? false,
+    assignedStartDate: new Date(snapshot.assignedStartDate),
+    assignedEndDate: snapshot.assignedEndDate ? new Date(snapshot.assignedEndDate) : null,
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    deletedAt: null,
+  }
+}
+
 const createTimeProjectCommand: CommandHandler<StaffTimeProjectCreateInput, { timeProjectId: string }> = {
   id: 'staff.timesheets.time_projects.create',
   async execute(rawInput, ctx) {
@@ -220,6 +260,14 @@ const createTimeProjectCommand: CommandHandler<StaffTimeProjectCreateInput, { ti
       })
     }
   },
+  redo: makeCreateRedo<StaffTimeProject, TimeProjectSnapshot, StaffTimeProjectCreateInput, { timeProjectId: string }>({
+    entityClass: StaffTimeProject,
+    getSnapshotId: (snapshot) => snapshot.id,
+    seedFromSnapshot: timeProjectSeedFromSnapshot,
+    buildResult: (entity) => ({ timeProjectId: entity.id }),
+    events: staffTimeProjectCrudEvents,
+    indexer: timeProjectCrudIndexer,
+  }),
 }
 
 const updateTimeProjectCommand: CommandHandler<StaffTimeProjectUpdateInput, { timeProjectId: string }> = {
@@ -586,6 +634,14 @@ const assignTimeProjectMemberCommand: CommandHandler<StaffTimeProjectMemberAssig
       })
     }
   },
+  redo: makeCreateRedo<StaffTimeProjectMember, TimeProjectMemberSnapshot, StaffTimeProjectMemberAssignInput, { timeProjectMemberId: string }>({
+    entityClass: StaffTimeProjectMember,
+    getSnapshotId: (snapshot) => snapshot.id,
+    seedFromSnapshot: timeProjectMemberSeedFromSnapshot,
+    buildResult: (entity) => ({ timeProjectMemberId: entity.id }),
+    events: staffTimeProjectMemberCrudEvents,
+    indexer: timeProjectMemberCrudIndexer,
+  }),
 }
 
 const unassignTimeProjectMemberCommand: CommandHandler<{ id?: string }, { timeProjectMemberId: string }> = {

package/src/modules/staff/components/LeaveRequestForm.tsx

@@ -32,6 +32,7 @@ export type LeaveRequestFormValues = {
   unavailabilityReasonEntryId?: string | null
   unavailabilityReasonValue?: string | null
   note?: string | null
+  updatedAt?: string | null
 }
 
 export type LeaveRequestFormProps = {
@@ -283,6 +284,7 @@ export function LeaveRequestForm(props: LeaveRequestFormProps) {
             createOption={canManageReasons ? createReasonOption : undefined}
             labels={reasonLabels}
             selectClassName="w-full"
+            sortOptions="none"
             manageHref={canManageReasons ? '/backend/config/dictionaries' : undefined}
             allowInlineCreate={canManageReasons}
             showManage={canManageReasons}
@@ -316,6 +318,7 @@ export function LeaveRequestForm(props: LeaveRequestFormProps) {
       title={title}
       fields={fields}
       initialValues={normalizedInitialValues}
+      optimisticLockUpdatedAt={normalizedInitialValues.updatedAt}
       submitLabel={submitLabel}
       backHref={backHref}
       cancelHref={cancelHref}

package/src/modules/staff/components/TeamForm.tsx

@@ -12,6 +12,7 @@ export type TeamFormValues = {
   name: string
   description?: string | null
   isActive?: boolean
+  updatedAt?: string | null
 } & Record<string, unknown>
 
 export type TeamFormProps = {
@@ -67,7 +68,7 @@ export function TeamForm(props: TeamFormProps) {
 
   const fields = React.useMemo<CrudField[]>(() => [
     { id: 'name', label: t('staff.teams.form.fields.name', 'Name'), type: 'text', required: true },
-    { id: 'description', label: t('staff.teams.form.fields.description', 'Description'), type: 'richtext', editor: 'html' },
+    { id: 'description', label: t('staff.teams.form.fields.description', 'Description'), type: 'richtext', editor: 'uiw' },
     { id: 'isActive', label: t('staff.teams.form.fields.active', 'Active'), type: 'checkbox' },
   ], [t])
 
@@ -89,6 +90,7 @@ export function TeamForm(props: TeamFormProps) {
       groups={groups}
       entityId={E.staff.staff_team}
       initialValues={initialValues}
+      optimisticLockUpdatedAt={initialValues.updatedAt}
       onSubmit={onSubmit}
       onDelete={onDelete}
       isLoading={isLoading}