@open-mercato/core 0.6.6-develop.6460.1.f94c74174c → 0.6.6-develop.6471.1.9ab5bdd79a

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

@@ -41,6 +41,9 @@ import {
   type ProjectCardData,
   type ProjectCardLabels,
 } from '../../../../lib/timesheets-projects-ui/ProjectCard'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const logger = createLogger('staff')
 
 const PAGE_SIZE = 50
 const INCLUDE_FIELDS = 'hoursWeek,hoursTrend,members,myRole'
@@ -401,7 +404,7 @@ export default function TimesheetProjectsPage() {
           : Math.max(1, Math.ceil(items.length / PAGE_SIZE)),
       )
     } catch (error) {
-      console.error('staff.timesheets.projects.list', error)
+      logger.error('staff.timesheets.projects.list', { err: error })
       flash(labels.errors.load, 'error')
     } finally {
       setIsLoading(false)
@@ -477,7 +480,7 @@ export default function TimesheetProjectsPage() {
         handleRefresh()
       } catch (error) {
         if (surfaceRecordConflict(error, t)) { handleRefresh(); return }
-        console.error('staff.timesheets.projects.delete', error)
+        logger.error('staff.timesheets.projects.delete', { err: error })
         flash(labels.errors.delete, 'error')
       }
     },

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

@@ -31,6 +31,10 @@ import {
   explicitStaffCommandScope,
   extractUndoPayload,
   requireTeamMember,
+  scopedStaffSnapshotWhere,
+  staffSnapshotScopeFromContext,
+  staffSnapshotScopeFromSnapshot,
+  type StaffSnapshotScope,
 } from './shared'
 import { resolveRedoSnapshot } from '@open-mercato/shared/lib/commands/redo'
 import { E } from '#generated/entities.ids.generated'
@@ -71,8 +75,8 @@ type ActivityChangeMap = Record<string, { from: unknown; to: unknown }> & {
   custom?: CustomFieldChangeSet
 }
 
-async function loadActivitySnapshot(em: EntityManager, id: string): Promise<ActivitySnapshot | null> {
-  const activity = await em.findOne(StaffTeamMemberActivity, { id })
+async function loadActivitySnapshot(em: EntityManager, id: string, scope?: StaffSnapshotScope | null): Promise<ActivitySnapshot | null> {
+  const activity = await em.findOne(StaffTeamMemberActivity, scopedStaffSnapshotWhere(id, scope))
   if (!activity) return null
   const custom = await loadCustomFieldSnapshot(em, {
     entityId: E.staff.staff_team_member_activity,
@@ -177,7 +181,7 @@ const createActivityCommand: CommandHandler<
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return await loadActivitySnapshot(em, result.activityId)
+    return await loadActivitySnapshot(em, result.activityId, staffSnapshotScopeFromContext(ctx))
   },
   buildLog: async ({ result, snapshots }) => {
     const { translate } = await resolveTranslations()
@@ -199,10 +203,15 @@ const createActivityCommand: CommandHandler<
     }
   },
   undo: async ({ logEntry, ctx }) => {
-    const activityId = logEntry?.resourceId ?? null
+    const payload = extractUndoPayload<ActivityUndoPayload>(logEntry)
+    const after = payload?.after
+    const activityId = after?.activity.id ?? logEntry?.resourceId ?? null
     if (!activityId) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const existing = await em.findOne(StaffTeamMemberActivity, { id: activityId })
+    const existing = await em.findOne(
+      StaffTeamMemberActivity,
+      scopedStaffSnapshotWhere(activityId, staffSnapshotScopeFromSnapshot(after?.activity)),
+    )
     if (existing) {
       em.remove(existing)
       await em.flush()
@@ -214,13 +223,14 @@ const createActivityCommand: CommandHandler<
       throw new CrudHttpError(400, { error: '[internal] redo snapshot unavailable for activity create' })
     }
     const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const snapshotScope = staffSnapshotScopeFromSnapshot(after.activity)
     const member = await requireTeamMember(
       em,
       after.activity.memberId,
       explicitStaffCommandScope(after.activity.tenantId, after.activity.organizationId),
       'Team member not found',
     )
-    let activity = await em.findOne(StaffTeamMemberActivity, { id: after.activity.id })
+    let activity = await em.findOne(StaffTeamMemberActivity, scopedStaffSnapshotWhere(after.activity.id, snapshotScope))
     if (!activity) {
       activity = em.create(StaffTeamMemberActivity, {
         id: after.activity.id,
@@ -275,7 +285,7 @@ const updateActivityCommand: CommandHandler<StaffTeamMemberActivityUpdateInput,
   async prepare(rawInput, ctx) {
     const parsed = staffTeamMemberActivityUpdateSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager)
-    const snapshot = await loadActivitySnapshot(em, parsed.id)
+    const snapshot = await loadActivitySnapshot(em, parsed.id, staffSnapshotScopeFromContext(ctx))
     return snapshot ? { before: snapshot } : {}
   },
   async execute(rawInput, ctx) {
@@ -326,7 +336,7 @@ const updateActivityCommand: CommandHandler<StaffTeamMemberActivityUpdateInput,
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return await loadActivitySnapshot(em, result.activityId)
+    return await loadActivitySnapshot(em, result.activityId, staffSnapshotScopeFromContext(ctx))
   },
   buildLog: async ({ snapshots }) => {
     const { translate } = await resolveTranslations()
@@ -377,7 +387,8 @@ const updateActivityCommand: CommandHandler<StaffTeamMemberActivityUpdateInput,
     const before = payload?.before
     if (!before) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    let activity = await em.findOne(StaffTeamMemberActivity, { id: before.activity.id })
+    const snapshotScope = staffSnapshotScopeFromSnapshot(before.activity)
+    let activity = await em.findOne(StaffTeamMemberActivity, scopedStaffSnapshotWhere(before.activity.id, snapshotScope))
     const member = await requireTeamMember(
       em,
       before.activity.memberId,
@@ -449,7 +460,7 @@ const deleteActivityCommand: CommandHandler<{ body?: Record<string, unknown>; qu
     async prepare(input, ctx) {
       const id = requireId(input, 'Activity id required')
       const em = (ctx.container.resolve('em') as EntityManager)
-      const snapshot = await loadActivitySnapshot(em, id)
+      const snapshot = await loadActivitySnapshot(em, id, staffSnapshotScopeFromContext(ctx))
       return snapshot ? { before: snapshot } : {}
     },
     async execute(input, ctx) {
@@ -506,13 +517,14 @@ const deleteActivityCommand: CommandHandler<{ body?: Record<string, unknown>; qu
       const before = payload?.before
       if (!before) return
       const em = (ctx.container.resolve('em') as EntityManager).fork()
+      const snapshotScope = staffSnapshotScopeFromSnapshot(before.activity)
       const member = await requireTeamMember(
         em,
         before.activity.memberId,
         explicitStaffCommandScope(before.activity.tenantId, before.activity.organizationId),
         'Team member not found',
       )
-      let activity = await em.findOne(StaffTeamMemberActivity, { id: before.activity.id })
+      let activity = await em.findOne(StaffTeamMemberActivity, scopedStaffSnapshotWhere(before.activity.id, snapshotScope))
       if (!activity) {
         activity = em.create(StaffTeamMemberActivity, {
           id: before.activity.id,

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

@@ -20,6 +20,10 @@ import {
   explicitStaffCommandScope,
   extractUndoPayload,
   requireTeamMember,
+  scopedStaffSnapshotWhere,
+  staffSnapshotScopeFromContext,
+  staffSnapshotScopeFromSnapshot,
+  type StaffSnapshotScope,
 } from './shared'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { resolveRedoSnapshot } from '@open-mercato/shared/lib/commands/redo'
@@ -57,8 +61,8 @@ type AddressUndoPayload = {
   after?: AddressSnapshot | null
 }
 
-async function loadAddressSnapshot(em: EntityManager, id: string): Promise<AddressSnapshot | null> {
-  const address = await em.findOne(StaffTeamMemberAddress, { id })
+async function loadAddressSnapshot(em: EntityManager, id: string, scope?: StaffSnapshotScope | null): Promise<AddressSnapshot | null> {
+  const address = await em.findOne(StaffTeamMemberAddress, scopedStaffSnapshotWhere(id, scope))
   if (!address) return null
   return {
     id: address.id,
@@ -155,7 +159,7 @@ const createAddressCommand: CommandHandler<StaffTeamMemberAddressCreateInput, {
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return await loadAddressSnapshot(em, result.addressId)
+    return await loadAddressSnapshot(em, result.addressId, staffSnapshotScopeFromContext(ctx))
   },
   buildLog: async ({ result, snapshots }) => {
     const { translate } = await resolveTranslations()
@@ -177,10 +181,12 @@ const createAddressCommand: CommandHandler<StaffTeamMemberAddressCreateInput, {
     }
   },
   undo: async ({ logEntry, ctx }) => {
-    const addressId = logEntry?.resourceId ?? null
+    const payload = extractUndoPayload<AddressUndoPayload>(logEntry)
+    const after = payload?.after
+    const addressId = after?.id ?? logEntry?.resourceId ?? null
     if (!addressId) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const address = await em.findOne(StaffTeamMemberAddress, { id: addressId })
+    const address = await em.findOne(StaffTeamMemberAddress, scopedStaffSnapshotWhere(addressId, staffSnapshotScopeFromSnapshot(after)))
     if (address) {
       em.remove(address)
       await em.flush()
@@ -192,13 +198,14 @@ const createAddressCommand: CommandHandler<StaffTeamMemberAddressCreateInput, {
       throw new CrudHttpError(400, { error: '[internal] redo snapshot unavailable for address create' })
     }
     const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const snapshotScope = staffSnapshotScopeFromSnapshot(after)
     const member = await requireTeamMember(
       em,
       after.memberId,
       explicitStaffCommandScope(after.tenantId, after.organizationId),
       'Team member not found',
     )
-    let address = await em.findOne(StaffTeamMemberAddress, { id: after.id })
+    let address = await em.findOne(StaffTeamMemberAddress, scopedStaffSnapshotWhere(after.id, snapshotScope))
     if (!address) {
       address = em.create(StaffTeamMemberAddress, {
         id: after.id,
@@ -269,7 +276,7 @@ const updateAddressCommand: CommandHandler<StaffTeamMemberAddressUpdateInput, {
   async prepare(rawInput, ctx) {
     const parsed = staffTeamMemberAddressUpdateSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager)
-    const snapshot = await loadAddressSnapshot(em, parsed.id)
+    const snapshot = await loadAddressSnapshot(em, parsed.id, staffSnapshotScopeFromContext(ctx))
     return snapshot ? { before: snapshot } : {}
   },
   async execute(rawInput, ctx) {
@@ -330,7 +337,7 @@ const updateAddressCommand: CommandHandler<StaffTeamMemberAddressUpdateInput, {
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return await loadAddressSnapshot(em, result.addressId)
+    return await loadAddressSnapshot(em, result.addressId, staffSnapshotScopeFromContext(ctx))
   },
   buildLog: async ({ snapshots }) => {
     const { translate } = await resolveTranslations()
@@ -385,7 +392,8 @@ const updateAddressCommand: CommandHandler<StaffTeamMemberAddressUpdateInput, {
     const before = payload?.before
     if (!before) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    let address = await em.findOne(StaffTeamMemberAddress, { id: before.id })
+    const snapshotScope = staffSnapshotScopeFromSnapshot(before)
+    let address = await em.findOne(StaffTeamMemberAddress, scopedStaffSnapshotWhere(before.id, snapshotScope))
     const member = await requireTeamMember(
       em,
       before.memberId,
@@ -462,7 +470,7 @@ const deleteAddressCommand: CommandHandler<{ body?: Record<string, unknown>; que
     async prepare(input, ctx) {
       const id = requireId(input, 'Address id required')
       const em = (ctx.container.resolve('em') as EntityManager)
-      const snapshot = await loadAddressSnapshot(em, id)
+      const snapshot = await loadAddressSnapshot(em, id, staffSnapshotScopeFromContext(ctx))
       return snapshot ? { before: snapshot } : {}
     },
     async execute(input, ctx) {
@@ -519,13 +527,14 @@ const deleteAddressCommand: CommandHandler<{ body?: Record<string, unknown>; que
       const before = payload?.before
       if (!before) return
       const em = (ctx.container.resolve('em') as EntityManager).fork()
+      const snapshotScope = staffSnapshotScopeFromSnapshot(before)
       const member = await requireTeamMember(
         em,
         before.memberId,
         explicitStaffCommandScope(before.tenantId, before.organizationId),
         'Team member not found',
       )
-      let address = await em.findOne(StaffTeamMemberAddress, { id: before.id })
+      let address = await em.findOne(StaffTeamMemberAddress, scopedStaffSnapshotWhere(before.id, snapshotScope))
       if (!address) {
         address = em.create(StaffTeamMemberAddress, {
           id: before.id,

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

@@ -23,6 +23,10 @@ import {
   explicitStaffCommandScope,
   extractUndoPayload,
   requireTeamMember,
+  scopedStaffSnapshotWhere,
+  staffSnapshotScopeFromContext,
+  staffSnapshotScopeFromSnapshot,
+  type StaffSnapshotScope,
 } from './shared'
 import { makeCreateRedo } from '@open-mercato/shared/lib/commands/redo'
 import { E } from '#generated/entities.ids.generated'
@@ -47,8 +51,8 @@ type CommentUndoPayload = {
   after?: CommentSnapshot | null
 }
 
-async function loadCommentSnapshot(em: EntityManager, id: string): Promise<CommentSnapshot | null> {
-  const comment = await em.findOne(StaffTeamMemberComment, { id })
+async function loadCommentSnapshot(em: EntityManager, id: string, scope?: StaffSnapshotScope | null): Promise<CommentSnapshot | null> {
+  const comment = await em.findOne(StaffTeamMemberComment, scopedStaffSnapshotWhere(id, scope))
   if (!comment) return null
   return {
     id: comment.id,
@@ -116,7 +120,7 @@ const createCommentCommand: CommandHandler<
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return await loadCommentSnapshot(em, result.commentId)
+    return await loadCommentSnapshot(em, result.commentId, staffSnapshotScopeFromContext(ctx))
   },
   buildLog: async ({ result, snapshots }) => {
     const { translate } = await resolveTranslations()
@@ -138,10 +142,12 @@ const createCommentCommand: CommandHandler<
     }
   },
   undo: async ({ logEntry, ctx }) => {
-    const commentId = logEntry?.resourceId ?? null
+    const payload = extractUndoPayload<CommentUndoPayload>(logEntry)
+    const after = payload?.after
+    const commentId = after?.id ?? logEntry?.resourceId ?? null
     if (!commentId) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const existing = await em.findOne(StaffTeamMemberComment, { id: commentId })
+    const existing = await em.findOne(StaffTeamMemberComment, scopedStaffSnapshotWhere(commentId, staffSnapshotScopeFromSnapshot(after)))
     if (existing) {
       em.remove(existing)
       await em.flush()
@@ -183,7 +189,7 @@ const updateCommentCommand: CommandHandler<StaffTeamMemberCommentUpdateInput, {
   async prepare(rawInput, ctx) {
     const parsed = staffTeamMemberCommentUpdateSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager)
-    const snapshot = await loadCommentSnapshot(em, parsed.id)
+    const snapshot = await loadCommentSnapshot(em, parsed.id, staffSnapshotScopeFromContext(ctx))
     return snapshot ? { before: snapshot } : {}
   },
   async execute(rawInput, ctx) {
@@ -229,7 +235,7 @@ const updateCommentCommand: CommandHandler<StaffTeamMemberCommentUpdateInput, {
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return await loadCommentSnapshot(em, result.commentId)
+    return await loadCommentSnapshot(em, result.commentId, staffSnapshotScopeFromContext(ctx))
   },
   buildLog: async ({ snapshots }) => {
     const { translate } = await resolveTranslations()
@@ -268,7 +274,8 @@ const updateCommentCommand: CommandHandler<StaffTeamMemberCommentUpdateInput, {
     const before = payload?.before
     if (!before) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    let comment = await em.findOne(StaffTeamMemberComment, { id: before.id })
+    const snapshotScope = staffSnapshotScopeFromSnapshot(before)
+    let comment = await em.findOne(StaffTeamMemberComment, scopedStaffSnapshotWhere(before.id, snapshotScope))
     const member = await requireTeamMember(
       em,
       before.memberId,
@@ -321,7 +328,7 @@ const deleteCommentCommand: CommandHandler<{ body?: Record<string, unknown>; que
     async prepare(input, ctx) {
       const id = requireId(input, 'Comment id required')
       const em = (ctx.container.resolve('em') as EntityManager)
-      const snapshot = await loadCommentSnapshot(em, id)
+      const snapshot = await loadCommentSnapshot(em, id, staffSnapshotScopeFromContext(ctx))
       return snapshot ? { before: snapshot } : {}
     },
     async execute(input, ctx) {
@@ -378,13 +385,14 @@ const deleteCommentCommand: CommandHandler<{ body?: Record<string, unknown>; que
       const before = payload?.before
       if (!before) return
       const em = (ctx.container.resolve('em') as EntityManager).fork()
+      const snapshotScope = staffSnapshotScopeFromSnapshot(before)
       const member = await requireTeamMember(
         em,
         before.memberId,
         explicitStaffCommandScope(before.tenantId, before.organizationId),
         'Team member not found',
       )
-      let comment = await em.findOne(StaffTeamMemberComment, { id: before.id })
+      let comment = await em.findOne(StaffTeamMemberComment, scopedStaffSnapshotWhere(before.id, snapshotScope))
       if (!comment) {
         comment = em.create(StaffTeamMemberComment, {
           id: before.id,

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

@@ -20,6 +20,10 @@ import {
   explicitStaffCommandScope,
   extractUndoPayload,
   requireTeamMember,
+  scopedStaffSnapshotWhere,
+  staffSnapshotScopeFromContext,
+  staffSnapshotScopeFromSnapshot,
+  type StaffSnapshotScope,
 } from './shared'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { resolveRedoSnapshot } from '@open-mercato/shared/lib/commands/redo'
@@ -55,8 +59,12 @@ type JobHistoryUndoPayload = {
   after?: JobHistorySnapshot | null
 }
 
-async function loadJobHistorySnapshot(em: EntityManager, id: string): Promise<JobHistorySnapshot | null> {
-  const record = await em.findOne(StaffTeamMemberJobHistory, { id })
+async function loadJobHistorySnapshot(
+  em: EntityManager,
+  id: string,
+  scope?: StaffSnapshotScope | null,
+): Promise<JobHistorySnapshot | null> {
+  const record = await em.findOne(StaffTeamMemberJobHistory, scopedStaffSnapshotWhere(id, scope))
   if (!record) return null
   return {
     id: record.id,
@@ -123,7 +131,7 @@ const createJobHistoryCommand: CommandHandler<StaffTeamMemberJobHistoryCreateInp
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return await loadJobHistorySnapshot(em, result.jobHistoryId)
+    return await loadJobHistorySnapshot(em, result.jobHistoryId, staffSnapshotScopeFromContext(ctx))
   },
   buildLog: async ({ result, snapshots }) => {
     const { translate } = await resolveTranslations()
@@ -145,10 +153,15 @@ const createJobHistoryCommand: CommandHandler<StaffTeamMemberJobHistoryCreateInp
     }
   },
   undo: async ({ logEntry, ctx }) => {
-    const jobHistoryId = logEntry?.resourceId ?? null
+    const payload = extractUndoPayload<JobHistoryUndoPayload>(logEntry)
+    const after = payload?.after ?? null
+    const jobHistoryId = after?.id ?? logEntry?.resourceId ?? null
     if (!jobHistoryId) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const record = await em.findOne(StaffTeamMemberJobHistory, { id: jobHistoryId })
+    const record = await em.findOne(
+      StaffTeamMemberJobHistory,
+      scopedStaffSnapshotWhere(jobHistoryId, staffSnapshotScopeFromSnapshot(after)),
+    )
     if (record) {
       em.remove(record)
       await em.flush()
@@ -160,13 +173,14 @@ const createJobHistoryCommand: CommandHandler<StaffTeamMemberJobHistoryCreateInp
       throw new CrudHttpError(400, { error: '[internal] redo snapshot unavailable for job history create' })
     }
     const em = (ctx.container.resolve('em') as EntityManager).fork()
+    const snapshotScope = staffSnapshotScopeFromSnapshot(after)
     const member = await requireTeamMember(
       em,
       after.memberId,
       explicitStaffCommandScope(after.tenantId, after.organizationId),
       'Team member not found',
     )
-    let record = await em.findOne(StaffTeamMemberJobHistory, { id: after.id })
+    let record = await em.findOne(StaffTeamMemberJobHistory, scopedStaffSnapshotWhere(after.id, snapshotScope))
     if (!record) {
       record = em.create(StaffTeamMemberJobHistory, {
         id: after.id,
@@ -215,7 +229,7 @@ const updateJobHistoryCommand: CommandHandler<StaffTeamMemberJobHistoryUpdateInp
   async prepare(rawInput, ctx) {
     const parsed = staffTeamMemberJobHistoryUpdateSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager)
-    const snapshot = await loadJobHistorySnapshot(em, parsed.id)
+    const snapshot = await loadJobHistorySnapshot(em, parsed.id, staffSnapshotScopeFromContext(ctx))
     return snapshot ? { before: snapshot } : {}
   },
   async execute(rawInput, ctx) {
@@ -277,7 +291,7 @@ const updateJobHistoryCommand: CommandHandler<StaffTeamMemberJobHistoryUpdateInp
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return await loadJobHistorySnapshot(em, result.jobHistoryId)
+    return await loadJobHistorySnapshot(em, result.jobHistoryId, staffSnapshotScopeFromContext(ctx))
   },
   buildLog: async ({ snapshots }) => {
     const { translate } = await resolveTranslations()
@@ -316,7 +330,8 @@ const updateJobHistoryCommand: CommandHandler<StaffTeamMemberJobHistoryUpdateInp
     const before = payload?.before
     if (!before) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    let record = await em.findOne(StaffTeamMemberJobHistory, { id: before.id })
+    const snapshotScope = staffSnapshotScopeFromSnapshot(before)
+    let record = await em.findOne(StaffTeamMemberJobHistory, scopedStaffSnapshotWhere(before.id, snapshotScope))
     const member = await requireTeamMember(
       em,
       before.memberId,
@@ -371,7 +386,7 @@ const deleteJobHistoryCommand: CommandHandler<{ id?: string; updatedAt?: string;
     async prepare(input, ctx) {
       const id = requireId(input, 'Job history id required')
       const em = (ctx.container.resolve('em') as EntityManager)
-      const snapshot = await loadJobHistorySnapshot(em, id)
+      const snapshot = await loadJobHistorySnapshot(em, id, staffSnapshotScopeFromContext(ctx))
       return snapshot ? { before: snapshot } : {}
     },
     async execute(input, ctx) {
@@ -444,13 +459,14 @@ const deleteJobHistoryCommand: CommandHandler<{ id?: string; updatedAt?: string;
       const before = payload?.before
       if (!before) return
       const em = (ctx.container.resolve('em') as EntityManager).fork()
+      const snapshotScope = staffSnapshotScopeFromSnapshot(before)
       const member = await requireTeamMember(
         em,
         before.memberId,
         explicitStaffCommandScope(before.tenantId, before.organizationId),
         'Team member not found',
       )
-      let record = await em.findOne(StaffTeamMemberJobHistory, { id: before.id })
+      let record = await em.findOne(StaffTeamMemberJobHistory, scopedStaffSnapshotWhere(before.id, snapshotScope))
       if (!record) {
         record = em.create(StaffTeamMemberJobHistory, {
           id: before.id,

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

@@ -22,6 +22,7 @@ import {
   type StaffLeaveRequestUpdateInput,
 } from '../data/validators'
 import {
+  applyScopeToWhere,
   commandActorScope,
   commandInputScope,
   ensureOrganizationScope,
@@ -30,7 +31,11 @@ import {
   extractUndoPayload,
   requireTeamMember,
   scopeForDecryption,
-  applyScopeToWhere,
+  scopedStaffSnapshotWhere,
+  staffSnapshotDecryptionScope,
+  staffSnapshotScopeFromContext,
+  staffSnapshotScopeFromSnapshot,
+  type StaffSnapshotScope,
 } from './shared'
 import { E } from '#generated/entities.ids.generated'
 import { resolveNotificationService } from '../../notifications/lib/notificationService'
@@ -128,8 +133,14 @@ function buildFullDayRrule(date: string): string | null {
   return buildAvailabilityRrule(start, end)
 }
 
-async function loadLeaveRequestSnapshot(em: EntityManager, id: string): Promise<LeaveRequestSnapshot | null> {
-  const request = await findOneWithDecryption(em, StaffLeaveRequest, { id }, undefined, { tenantId: null, organizationId: null })
+async function loadLeaveRequestSnapshot(em: EntityManager, id: string, scope?: StaffSnapshotScope | null): Promise<LeaveRequestSnapshot | null> {
+  const request = await findOneWithDecryption(
+    em,
+    StaffLeaveRequest,
+    scopedStaffSnapshotWhere(id, scope),
+    undefined,
+    staffSnapshotDecryptionScope(scope),
+  )
   if (!request) return null
   const memberId = typeof request.member === 'string' ? request.member : request.member.id
   return {
@@ -349,12 +360,12 @@ const createLeaveRequestCommand: CommandHandler<StaffLeaveRequestCreateInput, {
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return await loadLeaveRequestSnapshot(em, result.requestId)
+    return await loadLeaveRequestSnapshot(em, result.requestId, staffSnapshotScopeFromContext(ctx))
   },
   buildLog: async ({ result, ctx }) => {
     const { translate } = await resolveTranslations()
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const snapshot = await loadLeaveRequestSnapshot(em, result.requestId)
+    const snapshot = await loadLeaveRequestSnapshot(em, result.requestId, staffSnapshotScopeFromContext(ctx))
     return {
       actionLabel: translate('staff.audit.leaveRequests.create', 'Create leave request'),
       resourceKind: 'staff.leave_request',
@@ -376,7 +387,7 @@ const createLeaveRequestCommand: CommandHandler<StaffLeaveRequestCreateInput, {
     const after = payload?.after
     if (!after) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const request = await em.findOne(StaffLeaveRequest, { id: after.id })
+    const request = await em.findOne(StaffLeaveRequest, scopedStaffSnapshotWhere(after.id, staffSnapshotScopeFromSnapshot(after)))
     if (request) {
       request.deletedAt = new Date()
       request.updatedAt = new Date()
@@ -405,7 +416,7 @@ const createLeaveRequestCommand: CommandHandler<StaffLeaveRequestCreateInput, {
       findOneWithDecryption(
         em,
         StaffLeaveRequest,
-        { id },
+        scopedStaffSnapshotWhere(id, staffSnapshotScopeFromSnapshot(snapshot)),
         undefined,
         { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId },
       ),
@@ -420,7 +431,7 @@ const updateLeaveRequestCommand: CommandHandler<StaffLeaveRequestUpdateInput, {
   async prepare(rawInput, ctx) {
     const parsed = staffLeaveRequestUpdateSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager)
-    const snapshot = await loadLeaveRequestSnapshot(em, parsed.id)
+    const snapshot = await loadLeaveRequestSnapshot(em, parsed.id, staffSnapshotScopeFromContext(ctx))
     return snapshot ? { before: snapshot } : {}
   },
   async execute(rawInput, ctx) {
@@ -468,7 +479,7 @@ const updateLeaveRequestCommand: CommandHandler<StaffLeaveRequestUpdateInput, {
     const before = snapshots.before as LeaveRequestSnapshot | undefined
     if (!before) return null
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const after = await loadLeaveRequestSnapshot(em, before.id)
+    const after = await loadLeaveRequestSnapshot(em, before.id, staffSnapshotScopeFromSnapshot(before))
     const changes = after
       ? buildChanges(before as unknown as Record<string, unknown>, after as unknown as Record<string, unknown>, [
           'memberId',
@@ -505,7 +516,7 @@ const updateLeaveRequestCommand: CommandHandler<StaffLeaveRequestUpdateInput, {
     const after = payload?.after
     if (!before || !after) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const request = await em.findOne(StaffLeaveRequest, { id: after.id })
+    const request = await em.findOne(StaffLeaveRequest, scopedStaffSnapshotWhere(after.id, staffSnapshotScopeFromSnapshot(after)))
     if (!request) return
     request.startDate = new Date(before.startDate)
     request.endDate = new Date(before.endDate)
@@ -568,12 +579,12 @@ const deleteLeaveRequestCommand: CommandHandler<{ id: string }, { requestId: str
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    return await loadLeaveRequestSnapshot(em, result.requestId)
+    return await loadLeaveRequestSnapshot(em, result.requestId, staffSnapshotScopeFromContext(ctx))
   },
   buildLog: async ({ result, ctx }) => {
     const { translate } = await resolveTranslations()
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const snapshot = await loadLeaveRequestSnapshot(em, result.requestId)
+    const snapshot = await loadLeaveRequestSnapshot(em, result.requestId, staffSnapshotScopeFromContext(ctx))
     return {
       actionLabel: translate('staff.audit.leaveRequests.delete', 'Delete leave request'),
       resourceKind: 'staff.leave_request',
@@ -595,7 +606,7 @@ const deleteLeaveRequestCommand: CommandHandler<{ id: string }, { requestId: str
     const after = payload?.after
     if (!after) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const request = await em.findOne(StaffLeaveRequest, { id: after.id })
+    const request = await em.findOne(StaffLeaveRequest, scopedStaffSnapshotWhere(after.id, staffSnapshotScopeFromSnapshot(after)))
     if (!request) return
     request.deletedAt = null
     request.updatedAt = new Date()
@@ -728,7 +739,11 @@ const acceptLeaveRequestCommand: CommandHandler<StaffLeaveRequestDecisionInput,
     const { translate } = await resolveTranslations()
     const before = snapshots.before as LeaveRequestSnapshot | undefined
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const after = await loadLeaveRequestSnapshot(em, result.requestId)
+    const after = await loadLeaveRequestSnapshot(
+      em,
+      result.requestId,
+      staffSnapshotScopeFromSnapshot(before) ?? staffSnapshotScopeFromContext(ctx),
+    )
     return {
       actionLabel: translate('staff.audit.leaveRequests.accept', 'Approve leave request'),
       resourceKind: 'staff.leave_request',
@@ -751,7 +766,7 @@ const acceptLeaveRequestCommand: CommandHandler<StaffLeaveRequestDecisionInput,
   async prepare(rawInput, ctx) {
     const parsed = staffLeaveRequestDecisionSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager)
-    const snapshot = await loadLeaveRequestSnapshot(em, parsed.id)
+    const snapshot = await loadLeaveRequestSnapshot(em, parsed.id, staffSnapshotScopeFromContext(ctx))
     return snapshot ? { before: snapshot } : {}
   },
   undo: async ({ logEntry, ctx }) => {
@@ -760,7 +775,7 @@ const acceptLeaveRequestCommand: CommandHandler<StaffLeaveRequestDecisionInput,
     const availabilityRuleIds = payload?.availabilityRuleIds ?? []
     if (!before) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const request = await em.findOne(StaffLeaveRequest, { id: before.id })
+    const request = await em.findOne(StaffLeaveRequest, scopedStaffSnapshotWhere(before.id, staffSnapshotScopeFromSnapshot(before)))
     if (!request) return
 
     // Fetch rules before mutating so the query cannot reset unit-of-work tracking
@@ -891,14 +906,18 @@ const rejectLeaveRequestCommand: CommandHandler<StaffLeaveRequestDecisionInput,
   async prepare(rawInput, ctx) {
     const parsed = staffLeaveRequestDecisionSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager)
-    const snapshot = await loadLeaveRequestSnapshot(em, parsed.id)
+    const snapshot = await loadLeaveRequestSnapshot(em, parsed.id, staffSnapshotScopeFromContext(ctx))
     return snapshot ? { before: snapshot } : {}
   },
   buildLog: async ({ result, ctx, snapshots }) => {
     const { translate } = await resolveTranslations()
     const before = snapshots.before as LeaveRequestSnapshot | undefined
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const after = await loadLeaveRequestSnapshot(em, result.requestId)
+    const after = await loadLeaveRequestSnapshot(
+      em,
+      result.requestId,
+      staffSnapshotScopeFromSnapshot(before) ?? staffSnapshotScopeFromContext(ctx),
+    )
     return {
       actionLabel: translate('staff.audit.leaveRequests.reject', 'Reject leave request'),
       resourceKind: 'staff.leave_request',
@@ -922,7 +941,7 @@ const rejectLeaveRequestCommand: CommandHandler<StaffLeaveRequestDecisionInput,
     const before = payload?.before
     if (!before) return
     const em = (ctx.container.resolve('em') as EntityManager).fork()
-    const request = await em.findOne(StaffLeaveRequest, { id: before.id })
+    const request = await em.findOne(StaffLeaveRequest, scopedStaffSnapshotWhere(before.id, staffSnapshotScopeFromSnapshot(before)))
     if (!request) return
     request.status = before.status
     request.decisionComment = before.decisionComment