@open-mercato/enterprise 0.6.6-develop.6474.1.2c411ad42b → 0.6.6-develop.6480.1.309f47ca1c

package/dist/modules/record_locks/api/acquire/route.js

@@ -146,7 +146,8 @@ const openApi = {
       errors: [
         { status: 400, description: "Invalid payload", schema: recordLockErrorSchema },
         { status: 401, description: "Unauthorized", schema: recordLockErrorSchema },
-        { status: 423, description: "Record locked by another user", schema: recordLockErrorSchema }
+        { status: 423, description: "Record locked by another user", schema: recordLockErrorSchema },
+        { status: 429, description: "Per-user active lock quota exceeded", schema: recordLockErrorSchema }
       ]
     }
   }

package/dist/modules/record_locks/api/acquire/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/record_locks/api/acquire/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport {\n  recordLockAcquireResponseSchema,\n  recordLockAcquireSchema,\n  recordLockErrorSchema,\n} from '../../data/validators'\nimport { resolveRecordLocksApiContext, resolveRequestIp } from '../utils'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { User } from '@open-mercato/core/modules/auth/data/entities'\nimport type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'\n\ntype LockPayload = {\n  lockedByUserId?: string\n  lockedByIp?: string | null\n  lockedByName?: string | null\n  lockedByEmail?: string | null\n  participants?: Array<{\n    userId: string\n    lockedByIp?: string | null\n    lockedByName?: string | null\n    lockedByEmail?: string | null\n    lockedAt: string\n    lastHeartbeatAt: string\n    expiresAt: string\n  }>\n  activeParticipantCount?: number\n}\n\nfunction maskEmail(email: string | null | undefined): string | null {\n  if (typeof email !== 'string') return null\n  const normalized = email.trim().toLowerCase()\n  const atIndex = normalized.indexOf('@')\n  if (atIndex <= 0 || atIndex === normalized.length - 1) return null\n  const local = normalized.slice(0, atIndex)\n  const domain = normalized.slice(atIndex + 1)\n  const dotIndex = domain.indexOf('.')\n  if (dotIndex <= 0 || dotIndex === domain.length - 1) return null\n  const domainName = domain.slice(0, dotIndex)\n  const domainSuffix = domain.slice(dotIndex)\n  const localPrefix = local.slice(0, Math.min(2, local.length))\n  const domainPrefix = domainName.slice(0, Math.min(4, domainName.length))\n  return `${localPrefix}**@${domainPrefix}**${domainSuffix}`\n}\n\nasync function redactPersonalData(\n  em: EntityManager,\n  lock: LockPayload | null | undefined,\n  scope: { tenantId: string; organizationId: string | null },\n): Promise<LockPayload | null> {\n  if (!lock) return null\n  const userIds = new Set<string>()\n  if (typeof lock.lockedByUserId === 'string' && lock.lockedByUserId.trim().length > 0) {\n    userIds.add(lock.lockedByUserId)\n  }\n  for (const participant of lock.participants ?? []) {\n    if (typeof participant.userId === 'string' && participant.userId.trim().length > 0) {\n      userIds.add(participant.userId)\n    }\n  }\n\n  const users = userIds.size\n    ? await em.find(User, {\n      id: { $in: Array.from(userIds) },\n      deletedAt: null,\n      tenantId: scope.tenantId,\n      organizationId: scope.organizationId,\n    })\n    : []\n  const userById = new Map(users.map((user) => [user.id, user]))\n\n  const participants = (lock.participants ?? []).map((participant) => {\n    const { lockedByIp, lockedByName, lockedByEmail, ...rest } = participant\n    const maskedEmail = maskEmail(userById.get(participant.userId)?.email ?? null)\n    return {\n      ...rest,\n      ...(maskedEmail ? { lockedByEmail: maskedEmail } : {}),\n    }\n  })\n\n  const { lockedByIp, lockedByName, lockedByEmail, lockedByUserId, ...rest } = lock\n  const maskedOwnerEmail = maskEmail(\n    lockedByUserId ? (userById.get(lockedByUserId)?.email ?? null) : null,\n  )\n  return {\n    ...rest,\n    lockedByIp: null,\n    lockedByName: null,\n    lockedByEmail: maskedOwnerEmail,\n    participants,\n    activeParticipantCount: lock.activeParticipantCount ?? participants.length,\n  }\n}\n\nexport const metadata = {\n  POST: { requireAuth: true, requireFeatures: ['record_locks.view'] },\n}\n\nasync function resolveCanForceRelease(\n  ctx: Exclude<Awaited<ReturnType<typeof resolveRecordLocksApiContext>>, Response>,\n): Promise<boolean> {\n  try {\n    const rbacService = ctx.container.resolve<RbacService>('rbacService')\n    return await rbacService.userHasAllFeatures(\n      ctx.auth.sub,\n      ['record_locks.force_release'],\n      {\n        tenantId: ctx.auth.tenantId,\n        organizationId: ctx.organizationId ?? null,\n      },\n    )\n  } catch {\n    return false\n  }\n}\n\nexport async function POST(req: Request) {\n  const ctxOrResponse = await resolveRecordLocksApiContext(req)\n  if (ctxOrResponse instanceof Response) return ctxOrResponse\n\n  const body = await req.json().catch(() => ({}))\n  const parsed = recordLockAcquireSchema.safeParse(body)\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid acquire payload', details: parsed.error.issues }, { status: 400 })\n  }\n\n  const result = await ctxOrResponse.recordLockService.acquire({\n    resourceKind: parsed.data.resourceKind,\n    resourceId: parsed.data.resourceId,\n    tenantId: ctxOrResponse.auth.tenantId,\n    organizationId: ctxOrResponse.organizationId,\n    userId: ctxOrResponse.auth.sub,\n    lockedByIp: resolveRequestIp(req),\n  })\n\n  const em = ctxOrResponse.container.resolve<EntityManager>('em').fork()\n  const canForceRelease = result.allowForceUnlock\n    ? await resolveCanForceRelease(ctxOrResponse)\n    : false\n  const allowForceUnlock = result.allowForceUnlock && canForceRelease\n\n  if (!result.ok) {\n    const lock = await redactPersonalData(em, result.lock as LockPayload | null, {\n      tenantId: ctxOrResponse.auth.tenantId,\n      organizationId: ctxOrResponse.organizationId ?? null,\n    })\n    return NextResponse.json(\n      {\n        error: result.error,\n        code: result.code,\n        allowForceUnlock,\n        currentUserId: ctxOrResponse.auth.sub,\n        lock,\n      },\n      { status: result.status },\n    )\n  }\n\n  const lock = await redactPersonalData(em, result.lock as LockPayload | null, {\n    tenantId: ctxOrResponse.auth.tenantId,\n    organizationId: ctxOrResponse.organizationId ?? null,\n  })\n  return NextResponse.json({\n    ok: true,\n    enabled: result.enabled,\n    resourceEnabled: result.resourceEnabled,\n    strategy: result.strategy,\n    heartbeatSeconds: result.heartbeatSeconds,\n    acquired: result.acquired,\n    latestActionLogId: result.latestActionLogId,\n    allowForceUnlock,\n    currentUserId: ctxOrResponse.auth.sub,\n    lock,\n  })\n}\n\nexport const openApi: OpenApiRouteDoc = {\n  tag: 'Record Locks',\n  summary: 'Acquire record lock',\n  methods: {\n    POST: {\n      summary: 'Acquire lock for editing',\n      requestBody: {\n        contentType: 'application/json',\n        schema: recordLockAcquireSchema,\n      },\n      responses: [\n        { status: 200, description: 'Lock acquisition result', schema: recordLockAcquireResponseSchema },\n      ],\n      errors: [\n        { status: 400, description: 'Invalid payload', schema: recordLockErrorSchema },\n        { status: 401, description: 'Unauthorized', schema: recordLockErrorSchema },\n        { status: 423, description: 'Record locked by another user', schema: recordLockErrorSchema },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "AAAA,SAAS,oBAAoB;AAE7B;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,8BAA8B,wBAAwB;AAE/D,SAAS,YAAY;AAoBrB,SAAS,UAAU,OAAiD;AAClE,MAAI,OAAO,UAAU,SAAU,QAAO;AACtC,QAAM,aAAa,MAAM,KAAK,EAAE,YAAY;AAC5C,QAAM,UAAU,WAAW,QAAQ,GAAG;AACtC,MAAI,WAAW,KAAK,YAAY,WAAW,SAAS,EAAG,QAAO;AAC9D,QAAM,QAAQ,WAAW,MAAM,GAAG,OAAO;AACzC,QAAM,SAAS,WAAW,MAAM,UAAU,CAAC;AAC3C,QAAM,WAAW,OAAO,QAAQ,GAAG;AACnC,MAAI,YAAY,KAAK,aAAa,OAAO,SAAS,EAAG,QAAO;AAC5D,QAAM,aAAa,OAAO,MAAM,GAAG,QAAQ;AAC3C,QAAM,eAAe,OAAO,MAAM,QAAQ;AAC1C,QAAM,cAAc,MAAM,MAAM,GAAG,KAAK,IAAI,GAAG,MAAM,MAAM,CAAC;AAC5D,QAAM,eAAe,WAAW,MAAM,GAAG,KAAK,IAAI,GAAG,WAAW,MAAM,CAAC;AACvE,SAAO,GAAG,WAAW,MAAM,YAAY,KAAK,YAAY;AAC1D;AAEA,eAAe,mBACb,IACA,MACA,OAC6B;AAC7B,MAAI,CAAC,KAAM,QAAO;AAClB,QAAM,UAAU,oBAAI,IAAY;AAChC,MAAI,OAAO,KAAK,mBAAmB,YAAY,KAAK,eAAe,KAAK,EAAE,SAAS,GAAG;AACpF,YAAQ,IAAI,KAAK,cAAc;AAAA,EACjC;AACA,aAAW,eAAe,KAAK,gBAAgB,CAAC,GAAG;AACjD,QAAI,OAAO,YAAY,WAAW,YAAY,YAAY,OAAO,KAAK,EAAE,SAAS,GAAG;AAClF,cAAQ,IAAI,YAAY,MAAM;AAAA,IAChC;AAAA,EACF;AAEA,QAAM,QAAQ,QAAQ,OAClB,MAAM,GAAG,KAAK,MAAM;AAAA,IACpB,IAAI,EAAE,KAAK,MAAM,KAAK,OAAO,EAAE;AAAA,IAC/B,WAAW;AAAA,IACX,UAAU,MAAM;AAAA,IAChB,gBAAgB,MAAM;AAAA,EACxB,CAAC,IACC,CAAC;AACL,QAAM,WAAW,IAAI,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC;AAE7D,QAAM,gBAAgB,KAAK,gBAAgB,CAAC,GAAG,IAAI,CAAC,gBAAgB;AAClE,UAAM,EAAE,YAAAA,aAAY,cAAAC,eAAc,eAAAC,gBAAe,GAAGC,MAAK,IAAI;AAC7D,UAAM,cAAc,UAAU,SAAS,IAAI,YAAY,MAAM,GAAG,SAAS,IAAI;AAC7E,WAAO;AAAA,MACL,GAAGA;AAAA,MACH,GAAI,cAAc,EAAE,eAAe,YAAY,IAAI,CAAC;AAAA,IACtD;AAAA,EACF,CAAC;AAED,QAAM,EAAE,YAAY,cAAc,eAAe,gBAAgB,GAAG,KAAK,IAAI;AAC7E,QAAM,mBAAmB;AAAA,IACvB,iBAAkB,SAAS,IAAI,cAAc,GAAG,SAAS,OAAQ;AAAA,EACnE;AACA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,YAAY;AAAA,IACZ,cAAc;AAAA,IACd,eAAe;AAAA,IACf;AAAA,IACA,wBAAwB,KAAK,0BAA0B,aAAa;AAAA,EACtE;AACF;AAEO,MAAM,WAAW;AAAA,EACtB,MAAM,EAAE,aAAa,MAAM,iBAAiB,CAAC,mBAAmB,EAAE;AACpE;AAEA,eAAe,uBACb,KACkB;AAClB,MAAI;AACF,UAAM,cAAc,IAAI,UAAU,QAAqB,aAAa;AACpE,WAAO,MAAM,YAAY;AAAA,MACvB,IAAI,KAAK;AAAA,MACT,CAAC,4BAA4B;AAAA,MAC7B;AAAA,QACE,UAAU,IAAI,KAAK;AAAA,QACnB,gBAAgB,IAAI,kBAAkB;AAAA,MACxC;AAAA,IACF;AAAA,EACF,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEA,eAAsB,KAAK,KAAc;AACvC,QAAM,gBAAgB,MAAM,6BAA6B,GAAG;AAC5D,MAAI,yBAAyB,SAAU,QAAO;AAE9C,QAAM,OAAO,MAAM,IAAI,KAAK,EAAE,MAAM,OAAO,CAAC,EAAE;AAC9C,QAAM,SAAS,wBAAwB,UAAU,IAAI;AACrD,MAAI,CAAC,OAAO,SAAS;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,2BAA2B,SAAS,OAAO,MAAM,OAAO,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC9G;AAEA,QAAM,SAAS,MAAM,cAAc,kBAAkB,QAAQ;AAAA,IAC3D,cAAc,OAAO,KAAK;AAAA,IAC1B,YAAY,OAAO,KAAK;AAAA,IACxB,UAAU,cAAc,KAAK;AAAA,IAC7B,gBAAgB,cAAc;AAAA,IAC9B,QAAQ,cAAc,KAAK;AAAA,IAC3B,YAAY,iBAAiB,GAAG;AAAA,EAClC,CAAC;AAED,QAAM,KAAK,cAAc,UAAU,QAAuB,IAAI,EAAE,KAAK;AACrE,QAAM,kBAAkB,OAAO,mBAC3B,MAAM,uBAAuB,aAAa,IAC1C;AACJ,QAAM,mBAAmB,OAAO,oBAAoB;AAEpD,MAAI,CAAC,OAAO,IAAI;AACd,UAAMC,QAAO,MAAM,mBAAmB,IAAI,OAAO,MAA4B;AAAA,MAC3E,UAAU,cAAc,KAAK;AAAA,MAC7B,gBAAgB,cAAc,kBAAkB;AAAA,IAClD,CAAC;AACD,WAAO,aAAa;AAAA,MAClB;AAAA,QACE,OAAO,OAAO;AAAA,QACd,MAAM,OAAO;AAAA,QACb;AAAA,QACA,eAAe,cAAc,KAAK;AAAA,QAClC,MAAAA;AAAA,MACF;AAAA,MACA,EAAE,QAAQ,OAAO,OAAO;AAAA,IAC1B;AAAA,EACF;AAEA,QAAM,OAAO,MAAM,mBAAmB,IAAI,OAAO,MAA4B;AAAA,IAC3E,UAAU,cAAc,KAAK;AAAA,IAC7B,gBAAgB,cAAc,kBAAkB;AAAA,EAClD,CAAC;AACD,SAAO,aAAa,KAAK;AAAA,IACvB,IAAI;AAAA,IACJ,SAAS,OAAO;AAAA,IAChB,iBAAiB,OAAO;AAAA,IACxB,UAAU,OAAO;AAAA,IACjB,kBAAkB,OAAO;AAAA,IACzB,UAAU,OAAO;AAAA,IACjB,mBAAmB,OAAO;AAAA,IAC1B;AAAA,IACA,eAAe,cAAc,KAAK;AAAA,IAClC;AAAA,EACF,CAAC;AACH;AAEO,MAAM,UAA2B;AAAA,EACtC,KAAK;AAAA,EACL,SAAS;AAAA,EACT,SAAS;AAAA,IACP,MAAM;AAAA,MACJ,SAAS;AAAA,MACT,aAAa;AAAA,QACX,aAAa;AAAA,QACb,QAAQ;AAAA,MACV;AAAA,MACA,WAAW;AAAA,QACT,EAAE,QAAQ,KAAK,aAAa,2BAA2B,QAAQ,gCAAgC;AAAA,MACjG;AAAA,MACA,QAAQ;AAAA,QACN,EAAE,QAAQ,KAAK,aAAa,mBAAmB,QAAQ,sBAAsB;AAAA,QAC7E,EAAE,QAAQ,KAAK,aAAa,gBAAgB,QAAQ,sBAAsB;AAAA,QAC1E,EAAE,QAAQ,KAAK,aAAa,iCAAiC,QAAQ,sBAAsB;AAAA,MAC7F;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport {\n  recordLockAcquireResponseSchema,\n  recordLockAcquireSchema,\n  recordLockErrorSchema,\n} from '../../data/validators'\nimport { resolveRecordLocksApiContext, resolveRequestIp } from '../utils'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { User } from '@open-mercato/core/modules/auth/data/entities'\nimport type { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'\n\ntype LockPayload = {\n  lockedByUserId?: string\n  lockedByIp?: string | null\n  lockedByName?: string | null\n  lockedByEmail?: string | null\n  participants?: Array<{\n    userId: string\n    lockedByIp?: string | null\n    lockedByName?: string | null\n    lockedByEmail?: string | null\n    lockedAt: string\n    lastHeartbeatAt: string\n    expiresAt: string\n  }>\n  activeParticipantCount?: number\n}\n\nfunction maskEmail(email: string | null | undefined): string | null {\n  if (typeof email !== 'string') return null\n  const normalized = email.trim().toLowerCase()\n  const atIndex = normalized.indexOf('@')\n  if (atIndex <= 0 || atIndex === normalized.length - 1) return null\n  const local = normalized.slice(0, atIndex)\n  const domain = normalized.slice(atIndex + 1)\n  const dotIndex = domain.indexOf('.')\n  if (dotIndex <= 0 || dotIndex === domain.length - 1) return null\n  const domainName = domain.slice(0, dotIndex)\n  const domainSuffix = domain.slice(dotIndex)\n  const localPrefix = local.slice(0, Math.min(2, local.length))\n  const domainPrefix = domainName.slice(0, Math.min(4, domainName.length))\n  return `${localPrefix}**@${domainPrefix}**${domainSuffix}`\n}\n\nasync function redactPersonalData(\n  em: EntityManager,\n  lock: LockPayload | null | undefined,\n  scope: { tenantId: string; organizationId: string | null },\n): Promise<LockPayload | null> {\n  if (!lock) return null\n  const userIds = new Set<string>()\n  if (typeof lock.lockedByUserId === 'string' && lock.lockedByUserId.trim().length > 0) {\n    userIds.add(lock.lockedByUserId)\n  }\n  for (const participant of lock.participants ?? []) {\n    if (typeof participant.userId === 'string' && participant.userId.trim().length > 0) {\n      userIds.add(participant.userId)\n    }\n  }\n\n  const users = userIds.size\n    ? await em.find(User, {\n      id: { $in: Array.from(userIds) },\n      deletedAt: null,\n      tenantId: scope.tenantId,\n      organizationId: scope.organizationId,\n    })\n    : []\n  const userById = new Map(users.map((user) => [user.id, user]))\n\n  const participants = (lock.participants ?? []).map((participant) => {\n    const { lockedByIp, lockedByName, lockedByEmail, ...rest } = participant\n    const maskedEmail = maskEmail(userById.get(participant.userId)?.email ?? null)\n    return {\n      ...rest,\n      ...(maskedEmail ? { lockedByEmail: maskedEmail } : {}),\n    }\n  })\n\n  const { lockedByIp, lockedByName, lockedByEmail, lockedByUserId, ...rest } = lock\n  const maskedOwnerEmail = maskEmail(\n    lockedByUserId ? (userById.get(lockedByUserId)?.email ?? null) : null,\n  )\n  return {\n    ...rest,\n    lockedByIp: null,\n    lockedByName: null,\n    lockedByEmail: maskedOwnerEmail,\n    participants,\n    activeParticipantCount: lock.activeParticipantCount ?? participants.length,\n  }\n}\n\nexport const metadata = {\n  POST: { requireAuth: true, requireFeatures: ['record_locks.view'] },\n}\n\nasync function resolveCanForceRelease(\n  ctx: Exclude<Awaited<ReturnType<typeof resolveRecordLocksApiContext>>, Response>,\n): Promise<boolean> {\n  try {\n    const rbacService = ctx.container.resolve<RbacService>('rbacService')\n    return await rbacService.userHasAllFeatures(\n      ctx.auth.sub,\n      ['record_locks.force_release'],\n      {\n        tenantId: ctx.auth.tenantId,\n        organizationId: ctx.organizationId ?? null,\n      },\n    )\n  } catch {\n    return false\n  }\n}\n\nexport async function POST(req: Request) {\n  const ctxOrResponse = await resolveRecordLocksApiContext(req)\n  if (ctxOrResponse instanceof Response) return ctxOrResponse\n\n  const body = await req.json().catch(() => ({}))\n  const parsed = recordLockAcquireSchema.safeParse(body)\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid acquire payload', details: parsed.error.issues }, { status: 400 })\n  }\n\n  const result = await ctxOrResponse.recordLockService.acquire({\n    resourceKind: parsed.data.resourceKind,\n    resourceId: parsed.data.resourceId,\n    tenantId: ctxOrResponse.auth.tenantId,\n    organizationId: ctxOrResponse.organizationId,\n    userId: ctxOrResponse.auth.sub,\n    lockedByIp: resolveRequestIp(req),\n  })\n\n  const em = ctxOrResponse.container.resolve<EntityManager>('em').fork()\n  const canForceRelease = result.allowForceUnlock\n    ? await resolveCanForceRelease(ctxOrResponse)\n    : false\n  const allowForceUnlock = result.allowForceUnlock && canForceRelease\n\n  if (!result.ok) {\n    const lock = await redactPersonalData(em, result.lock as LockPayload | null, {\n      tenantId: ctxOrResponse.auth.tenantId,\n      organizationId: ctxOrResponse.organizationId ?? null,\n    })\n    return NextResponse.json(\n      {\n        error: result.error,\n        code: result.code,\n        allowForceUnlock,\n        currentUserId: ctxOrResponse.auth.sub,\n        lock,\n      },\n      { status: result.status },\n    )\n  }\n\n  const lock = await redactPersonalData(em, result.lock as LockPayload | null, {\n    tenantId: ctxOrResponse.auth.tenantId,\n    organizationId: ctxOrResponse.organizationId ?? null,\n  })\n  return NextResponse.json({\n    ok: true,\n    enabled: result.enabled,\n    resourceEnabled: result.resourceEnabled,\n    strategy: result.strategy,\n    heartbeatSeconds: result.heartbeatSeconds,\n    acquired: result.acquired,\n    latestActionLogId: result.latestActionLogId,\n    allowForceUnlock,\n    currentUserId: ctxOrResponse.auth.sub,\n    lock,\n  })\n}\n\nexport const openApi: OpenApiRouteDoc = {\n  tag: 'Record Locks',\n  summary: 'Acquire record lock',\n  methods: {\n    POST: {\n      summary: 'Acquire lock for editing',\n      requestBody: {\n        contentType: 'application/json',\n        schema: recordLockAcquireSchema,\n      },\n      responses: [\n        { status: 200, description: 'Lock acquisition result', schema: recordLockAcquireResponseSchema },\n      ],\n      errors: [\n        { status: 400, description: 'Invalid payload', schema: recordLockErrorSchema },\n        { status: 401, description: 'Unauthorized', schema: recordLockErrorSchema },\n        { status: 423, description: 'Record locked by another user', schema: recordLockErrorSchema },\n        { status: 429, description: 'Per-user active lock quota exceeded', schema: recordLockErrorSchema },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "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",
   "names": ["lockedByIp", "lockedByName", "lockedByEmail", "rest", "lock"]
 }

package/dist/modules/record_locks/lib/config.js

@@ -5,6 +5,7 @@ const recordLockSettingsSchema = z.object({
   strategy: recordLockStrategySchema.default("optimistic"),
   timeoutSeconds: z.number().int().min(30).max(3600).default(300),
   heartbeatSeconds: z.number().int().min(5).max(300).default(30),
+  maxActiveLocksPerUser: z.number().int().min(1).max(500).default(50),
   enabledResources: z.array(z.string().trim().min(1)).default([]),
   allowForceUnlock: z.boolean().default(true),
   allowIncomingOverride: z.boolean().default(true),
@@ -15,6 +16,7 @@ const DEFAULT_RECORD_LOCK_SETTINGS = {
   strategy: "optimistic",
   timeoutSeconds: 300,
   heartbeatSeconds: 30,
+  maxActiveLocksPerUser: 50,
   enabledResources: ["*"],
   allowForceUnlock: true,
   allowIncomingOverride: true,

package/dist/modules/record_locks/lib/config.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/record_locks/lib/config.ts"],
-  "sourcesContent": ["import { z } from 'zod'\n\nexport const recordLockStrategySchema = z.enum(['optimistic', 'pessimistic'])\n\nexport const recordLockSettingsSchema = z.object({\n  enabled: z.boolean().default(true),\n  strategy: recordLockStrategySchema.default('optimistic'),\n  timeoutSeconds: z.number().int().min(30).max(3600).default(300),\n  heartbeatSeconds: z.number().int().min(5).max(300).default(30),\n  enabledResources: z.array(z.string().trim().min(1)).default([]),\n  allowForceUnlock: z.boolean().default(true),\n  allowIncomingOverride: z.boolean().default(true),\n  notifyOnConflict: z.boolean().default(true),\n})\n\nexport type RecordLockStrategy = z.infer<typeof recordLockStrategySchema>\nexport type RecordLockSettings = z.infer<typeof recordLockSettingsSchema>\n\nexport const DEFAULT_RECORD_LOCK_SETTINGS: RecordLockSettings = {\n  enabled: true,\n  strategy: 'optimistic',\n  timeoutSeconds: 300,\n  heartbeatSeconds: 30,\n  enabledResources: ['*'],\n  allowForceUnlock: true,\n  allowIncomingOverride: true,\n  notifyOnConflict: true,\n}\n\nexport const RECORD_LOCKS_MODULE_ID = 'record_locks'\nexport const RECORD_LOCKS_SETTINGS_NAME = 'settings'\n\nexport function normalizeRecordLockSettings(input: unknown): RecordLockSettings {\n  const parsed = recordLockSettingsSchema.parse(input ?? {})\n  const seen = new Set<string>()\n  const enabledResources = parsed.enabledResources\n    .map((resource) => resource.trim())\n    .filter((resource) => {\n      if (!resource) return false\n      if (seen.has(resource)) return false\n      seen.add(resource)\n      return true\n    })\n\n  return {\n    ...parsed,\n    enabledResources,\n  }\n}\n\nexport function isRecordLockingEnabledForResource(\n  settings: RecordLockSettings,\n  resourceKind: string | null | undefined,\n): boolean {\n  if (!settings.enabled) return false\n  if (!resourceKind || resourceKind.trim().length === 0) return false\n  const normalizedResourceKind = resourceKind.trim()\n  const enabledResources = settings.enabledResources.map((item) => item.trim()).filter((item) => item.length > 0)\n  if (!enabledResources.length) return true\n  if (enabledResources.includes('*')) return true\n  return enabledResources.some((entry) => {\n    if (entry === normalizedResourceKind) return true\n    if (entry.endsWith('.*')) {\n      const prefix = entry.slice(0, -1)\n      return normalizedResourceKind.startsWith(prefix)\n    }\n    return false\n  })\n}\n"],
-  "mappings": "AAAA,SAAS,SAAS;AAEX,MAAM,2BAA2B,EAAE,KAAK,CAAC,cAAc,aAAa,CAAC;AAErE,MAAM,2BAA2B,EAAE,OAAO;AAAA,EAC/C,SAAS,EAAE,QAAQ,EAAE,QAAQ,IAAI;AAAA,EACjC,UAAU,yBAAyB,QAAQ,YAAY;AAAA,EACvD,gBAAgB,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,IAAI,EAAE,QAAQ,GAAG;AAAA,EAC9D,kBAAkB,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE,QAAQ,EAAE;AAAA,EAC7D,kBAAkB,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;AAAA,EAC9D,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,IAAI;AAAA,EAC1C,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,IAAI;AAAA,EAC/C,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,IAAI;AAC5C,CAAC;AAKM,MAAM,+BAAmD;AAAA,EAC9D,SAAS;AAAA,EACT,UAAU;AAAA,EACV,gBAAgB;AAAA,EAChB,kBAAkB;AAAA,EAClB,kBAAkB,CAAC,GAAG;AAAA,EACtB,kBAAkB;AAAA,EAClB,uBAAuB;AAAA,EACvB,kBAAkB;AACpB;AAEO,MAAM,yBAAyB;AAC/B,MAAM,6BAA6B;AAEnC,SAAS,4BAA4B,OAAoC;AAC9E,QAAM,SAAS,yBAAyB,MAAM,SAAS,CAAC,CAAC;AACzD,QAAM,OAAO,oBAAI,IAAY;AAC7B,QAAM,mBAAmB,OAAO,iBAC7B,IAAI,CAAC,aAAa,SAAS,KAAK,CAAC,EACjC,OAAO,CAAC,aAAa;AACpB,QAAI,CAAC,SAAU,QAAO;AACtB,QAAI,KAAK,IAAI,QAAQ,EAAG,QAAO;AAC/B,SAAK,IAAI,QAAQ;AACjB,WAAO;AAAA,EACT,CAAC;AAEH,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,EACF;AACF;AAEO,SAAS,kCACd,UACA,cACS;AACT,MAAI,CAAC,SAAS,QAAS,QAAO;AAC9B,MAAI,CAAC,gBAAgB,aAAa,KAAK,EAAE,WAAW,EAAG,QAAO;AAC9D,QAAM,yBAAyB,aAAa,KAAK;AACjD,QAAM,mBAAmB,SAAS,iBAAiB,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC;AAC9G,MAAI,CAAC,iBAAiB,OAAQ,QAAO;AACrC,MAAI,iBAAiB,SAAS,GAAG,EAAG,QAAO;AAC3C,SAAO,iBAAiB,KAAK,CAAC,UAAU;AACtC,QAAI,UAAU,uBAAwB,QAAO;AAC7C,QAAI,MAAM,SAAS,IAAI,GAAG;AACxB,YAAM,SAAS,MAAM,MAAM,GAAG,EAAE;AAChC,aAAO,uBAAuB,WAAW,MAAM;AAAA,IACjD;AACA,WAAO;AAAA,EACT,CAAC;AACH;",
+  "sourcesContent": ["import { z } from 'zod'\n\nexport const recordLockStrategySchema = z.enum(['optimistic', 'pessimistic'])\n\nexport const recordLockSettingsSchema = z.object({\n  enabled: z.boolean().default(true),\n  strategy: recordLockStrategySchema.default('optimistic'),\n  timeoutSeconds: z.number().int().min(30).max(3600).default(300),\n  heartbeatSeconds: z.number().int().min(5).max(300).default(30),\n  maxActiveLocksPerUser: z.number().int().min(1).max(500).default(50),\n  enabledResources: z.array(z.string().trim().min(1)).default([]),\n  allowForceUnlock: z.boolean().default(true),\n  allowIncomingOverride: z.boolean().default(true),\n  notifyOnConflict: z.boolean().default(true),\n})\n\nexport type RecordLockStrategy = z.infer<typeof recordLockStrategySchema>\nexport type RecordLockSettings = z.infer<typeof recordLockSettingsSchema>\n\nexport const DEFAULT_RECORD_LOCK_SETTINGS: RecordLockSettings = {\n  enabled: true,\n  strategy: 'optimistic',\n  timeoutSeconds: 300,\n  heartbeatSeconds: 30,\n  maxActiveLocksPerUser: 50,\n  enabledResources: ['*'],\n  allowForceUnlock: true,\n  allowIncomingOverride: true,\n  notifyOnConflict: true,\n}\n\nexport const RECORD_LOCKS_MODULE_ID = 'record_locks'\nexport const RECORD_LOCKS_SETTINGS_NAME = 'settings'\n\nexport function normalizeRecordLockSettings(input: unknown): RecordLockSettings {\n  const parsed = recordLockSettingsSchema.parse(input ?? {})\n  const seen = new Set<string>()\n  const enabledResources = parsed.enabledResources\n    .map((resource) => resource.trim())\n    .filter((resource) => {\n      if (!resource) return false\n      if (seen.has(resource)) return false\n      seen.add(resource)\n      return true\n    })\n\n  return {\n    ...parsed,\n    enabledResources,\n  }\n}\n\nexport function isRecordLockingEnabledForResource(\n  settings: RecordLockSettings,\n  resourceKind: string | null | undefined,\n): boolean {\n  if (!settings.enabled) return false\n  if (!resourceKind || resourceKind.trim().length === 0) return false\n  const normalizedResourceKind = resourceKind.trim()\n  const enabledResources = settings.enabledResources.map((item) => item.trim()).filter((item) => item.length > 0)\n  if (!enabledResources.length) return true\n  if (enabledResources.includes('*')) return true\n  return enabledResources.some((entry) => {\n    if (entry === normalizedResourceKind) return true\n    if (entry.endsWith('.*')) {\n      const prefix = entry.slice(0, -1)\n      return normalizedResourceKind.startsWith(prefix)\n    }\n    return false\n  })\n}\n"],
+  "mappings": "AAAA,SAAS,SAAS;AAEX,MAAM,2BAA2B,EAAE,KAAK,CAAC,cAAc,aAAa,CAAC;AAErE,MAAM,2BAA2B,EAAE,OAAO;AAAA,EAC/C,SAAS,EAAE,QAAQ,EAAE,QAAQ,IAAI;AAAA,EACjC,UAAU,yBAAyB,QAAQ,YAAY;AAAA,EACvD,gBAAgB,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,IAAI,EAAE,QAAQ,GAAG;AAAA,EAC9D,kBAAkB,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE,QAAQ,EAAE;AAAA,EAC7D,uBAAuB,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE,QAAQ,EAAE;AAAA,EAClE,kBAAkB,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;AAAA,EAC9D,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,IAAI;AAAA,EAC1C,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,IAAI;AAAA,EAC/C,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,IAAI;AAC5C,CAAC;AAKM,MAAM,+BAAmD;AAAA,EAC9D,SAAS;AAAA,EACT,UAAU;AAAA,EACV,gBAAgB;AAAA,EAChB,kBAAkB;AAAA,EAClB,uBAAuB;AAAA,EACvB,kBAAkB,CAAC,GAAG;AAAA,EACtB,kBAAkB;AAAA,EAClB,uBAAuB;AAAA,EACvB,kBAAkB;AACpB;AAEO,MAAM,yBAAyB;AAC/B,MAAM,6BAA6B;AAEnC,SAAS,4BAA4B,OAAoC;AAC9E,QAAM,SAAS,yBAAyB,MAAM,SAAS,CAAC,CAAC;AACzD,QAAM,OAAO,oBAAI,IAAY;AAC7B,QAAM,mBAAmB,OAAO,iBAC7B,IAAI,CAAC,aAAa,SAAS,KAAK,CAAC,EACjC,OAAO,CAAC,aAAa;AACpB,QAAI,CAAC,SAAU,QAAO;AACtB,QAAI,KAAK,IAAI,QAAQ,EAAG,QAAO;AAC/B,SAAK,IAAI,QAAQ;AACjB,WAAO;AAAA,EACT,CAAC;AAEH,SAAO;AAAA,IACL,GAAG;AAAA,IACH;AAAA,EACF;AACF;AAEO,SAAS,kCACd,UACA,cACS;AACT,MAAI,CAAC,SAAS,QAAS,QAAO;AAC9B,MAAI,CAAC,gBAAgB,aAAa,KAAK,EAAE,WAAW,EAAG,QAAO;AAC9D,QAAM,yBAAyB,aAAa,KAAK;AACjD,QAAM,mBAAmB,SAAS,iBAAiB,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC;AAC9G,MAAI,CAAC,iBAAiB,OAAQ,QAAO;AACrC,MAAI,iBAAiB,SAAS,GAAG,EAAG,QAAO;AAC3C,SAAO,iBAAiB,KAAK,CAAC,UAAU;AACtC,QAAI,UAAU,uBAAwB,QAAO;AAC7C,QAAI,MAAM,SAAS,IAAI,GAAG;AACxB,YAAM,SAAS,MAAM,MAAM,GAAG,EAAE;AAChC,aAAO,uBAAuB,WAAW,MAAM;AAAA,IACjD;AACA,WAAO;AAAA,EACT,CAAC;AACH;",
   "names": []
 }

package/dist/modules/record_locks/lib/recordLockService.js

@@ -298,8 +298,8 @@ class RecordLockService {
     }
     const now = /* @__PURE__ */ new Date();
     let activeLocks = await this.findActiveLocks(input, now);
-    const ownedActiveLock = activeLocks.find((lock2) => lock2.lockedByUserId === input.userId) ?? null;
-    const competingActiveLock = activeLocks.find((lock2) => lock2.lockedByUserId !== input.userId) ?? null;
+    const ownedActiveLock = activeLocks.find((lock) => lock.lockedByUserId === input.userId) ?? null;
+    const competingActiveLock = activeLocks.find((lock) => lock.lockedByUserId !== input.userId) ?? null;
     if (settings.strategy === "pessimistic" && !ownedActiveLock && competingActiveLock) {
       const lockView = this.toLockView(competingActiveLock, false, activeLocks);
       if (shouldEmitLockContentionEvent({
@@ -348,25 +348,151 @@ class RecordLockService {
         lock: this.toLockView(ownedActiveLock, true, activeLocks)
       };
     }
-    const lock = this.em.create(RecordLock, {
-      resourceKind: input.resourceKind,
-      resourceId: input.resourceId,
-      token: randomUUID(),
-      strategy: settings.strategy,
-      status: ACTIVE_LOCK_STATUS,
-      lockedByUserId: input.userId,
-      lockedByIp: input.lockedByIp ?? null,
-      baseActionLogId: latest?.id ?? null,
-      lockedAt: now,
-      lastHeartbeatAt: now,
-      expiresAt: new Date(now.getTime() + settings.timeoutSeconds * 1e3),
-      tenantId: input.tenantId,
-      organizationId: normalizeScopeOrganization(input.organizationId)
-    });
-    this.em.persist(lock);
-    let createdNewLock = true;
+    let activeAfterAcquire = [];
+    let ownedAfterAcquire = null;
+    let createdNewLock = false;
     try {
-      await this.em.flush();
+      const outcome = await this.em.transactional(async (tx) => {
+        const writeEm = tx;
+        await this.lockUserQuotaScope(writeEm, input);
+        const activeLocksInTransaction = await this.findActiveLocks(input, now, writeEm);
+        const ownedLockInTransaction = activeLocksInTransaction.find((lock2) => lock2.lockedByUserId === input.userId) ?? null;
+        const competingLockInTransaction = activeLocksInTransaction.find((lock2) => lock2.lockedByUserId !== input.userId) ?? null;
+        if (settings.strategy === "pessimistic" && !ownedLockInTransaction && competingLockInTransaction) {
+          return {
+            result: {
+              ok: false,
+              status: 423,
+              error: "Record is currently locked by another user",
+              code: "record_locked",
+              allowForceUnlock: settings.allowForceUnlock,
+              lock: this.toLockView(competingLockInTransaction, false, activeLocksInTransaction)
+            },
+            contentionLock: competingLockInTransaction,
+            createdNewLock: false,
+            activeAfterAcquire: activeLocksInTransaction,
+            ownedAfterAcquire: null
+          };
+        }
+        if (ownedLockInTransaction) {
+          ownedLockInTransaction.strategy = settings.strategy;
+          ownedLockInTransaction.lockedByIp = input.lockedByIp ?? ownedLockInTransaction.lockedByIp ?? null;
+          ownedLockInTransaction.lastHeartbeatAt = now;
+          ownedLockInTransaction.expiresAt = new Date(now.getTime() + settings.timeoutSeconds * 1e3);
+          await writeEm.flush();
+          const renewedActiveLocks = await this.findActiveLocks(input, now, writeEm);
+          return {
+            result: {
+              ok: true,
+              enabled: settings.enabled,
+              resourceEnabled: true,
+              strategy: settings.strategy,
+              allowForceUnlock: settings.allowForceUnlock,
+              heartbeatSeconds: settings.heartbeatSeconds,
+              acquired: false,
+              latestActionLogId: latest?.id ?? null,
+              lock: this.toLockView(ownedLockInTransaction, true, renewedActiveLocks)
+            },
+            createdNewLock: false,
+            activeAfterAcquire: renewedActiveLocks,
+            ownedAfterAcquire: ownedLockInTransaction
+          };
+        }
+        const activeLocksForUser = await this.countActiveLocksForUser(input, now, writeEm);
+        if (activeLocksForUser >= settings.maxActiveLocksPerUser) {
+          return {
+            result: {
+              ok: false,
+              status: 429,
+              error: "Active record lock limit reached",
+              code: "record_lock_quota_exceeded",
+              allowForceUnlock: false,
+              lock: null
+            },
+            createdNewLock: false,
+            activeAfterAcquire: activeLocksInTransaction,
+            ownedAfterAcquire: null
+          };
+        }
+        const lock = writeEm.create(RecordLock, {
+          resourceKind: input.resourceKind,
+          resourceId: input.resourceId,
+          token: randomUUID(),
+          strategy: settings.strategy,
+          status: ACTIVE_LOCK_STATUS,
+          lockedByUserId: input.userId,
+          lockedByIp: input.lockedByIp ?? null,
+          baseActionLogId: latest?.id ?? null,
+          lockedAt: now,
+          lastHeartbeatAt: now,
+          expiresAt: new Date(now.getTime() + settings.timeoutSeconds * 1e3),
+          tenantId: input.tenantId,
+          organizationId: normalizeScopeOrganization(input.organizationId)
+        });
+        writeEm.persist(lock);
+        await writeEm.flush();
+        const acquiredActiveLocks = await this.findActiveLocks(input, now, writeEm);
+        const acquiredOwnedLock = acquiredActiveLocks.find((item) => item.lockedByUserId === input.userId) ?? await this.findOwnedActiveLock(input, writeEm) ?? lock ?? null;
+        if (!acquiredOwnedLock) {
+          const fallbackLock = acquiredActiveLocks[0] ?? null;
+          return {
+            result: {
+              ok: true,
+              enabled: settings.enabled,
+              resourceEnabled: true,
+              strategy: settings.strategy,
+              allowForceUnlock: settings.allowForceUnlock,
+              heartbeatSeconds: settings.heartbeatSeconds,
+              acquired: false,
+              latestActionLogId: latest?.id ?? null,
+              lock: fallbackLock ? this.toLockView(fallbackLock, false, acquiredActiveLocks) : null
+            },
+            createdNewLock: false,
+            activeAfterAcquire: acquiredActiveLocks,
+            ownedAfterAcquire: null
+          };
+        }
+        return {
+          result: {
+            ok: true,
+            enabled: settings.enabled,
+            resourceEnabled: true,
+            strategy: settings.strategy,
+            allowForceUnlock: settings.allowForceUnlock,
+            heartbeatSeconds: settings.heartbeatSeconds,
+            acquired: true,
+            latestActionLogId: latest?.id ?? null,
+            lock: this.toLockView(acquiredOwnedLock, true, acquiredActiveLocks)
+          },
+          createdNewLock: true,
+          activeAfterAcquire: acquiredActiveLocks,
+          ownedAfterAcquire: acquiredOwnedLock
+        };
+      });
+      if (outcome.contentionLock && shouldEmitLockContentionEvent({
+        tenantId: outcome.contentionLock.tenantId,
+        organizationId: outcome.contentionLock.organizationId,
+        resourceKind: outcome.contentionLock.resourceKind,
+        resourceId: outcome.contentionLock.resourceId,
+        lockedByUserId: outcome.contentionLock.lockedByUserId,
+        attemptedByUserId: input.userId
+      })) {
+        await emitRecordLocksEvent("record_locks.lock.contended", {
+          lockId: outcome.contentionLock.id,
+          resourceKind: outcome.contentionLock.resourceKind,
+          resourceId: outcome.contentionLock.resourceId,
+          tenantId: outcome.contentionLock.tenantId,
+          organizationId: outcome.contentionLock.organizationId,
+          lockedByUserId: outcome.contentionLock.lockedByUserId,
+          attemptedByUserId: input.userId
+        });
+      }
+      activeAfterAcquire = outcome.activeAfterAcquire;
+      ownedAfterAcquire = outcome.ownedAfterAcquire;
+      createdNewLock = outcome.createdNewLock;
+      if (!outcome.result.ok || !createdNewLock) {
+        return outcome.result;
+      }
     } catch (error) {
       if (!isActiveLockScopeUniqueViolation(error)) throw error;
       const clear = this.em.clear;
@@ -408,12 +534,8 @@ class RecordLockService {
       existingOwned.lastHeartbeatAt = now;
       existingOwned.expiresAt = new Date(now.getTime() + settings.timeoutSeconds * 1e3);
       await this.em.flush();
-      createdNewLock = false;
-    }
-    const activeAfterAcquire = await this.findActiveLocks(input, now);
-    const ownedAfterAcquire = activeAfterAcquire.find((item) => item.lockedByUserId === input.userId) ?? await this.findOwnedActiveLock(input) ?? lock ?? null;
-    if (!ownedAfterAcquire) {
-      const fallbackLock = activeAfterAcquire[0] ?? null;
+      activeAfterAcquire = await this.findActiveLocks(input, now);
+      ownedAfterAcquire = existingOwned;
       return {
         ok: true,
         enabled: settings.enabled,
@@ -423,10 +545,10 @@ class RecordLockService {
         heartbeatSeconds: settings.heartbeatSeconds,
         acquired: false,
         latestActionLogId: latest?.id ?? null,
-        lock: fallbackLock ? this.toLockView(fallbackLock, false, activeAfterAcquire) : null
+        lock: this.toLockView(existingOwned, true, activeAfterAcquire)
       };
     }
-    if (createdNewLock) {
+    if (createdNewLock && ownedAfterAcquire) {
       await emitRecordLocksEvent("record_locks.lock.acquired", {
         lockId: ownedAfterAcquire.id,
         resourceKind: ownedAfterAcquire.resourceKind,
@@ -470,7 +592,7 @@ class RecordLockService {
       heartbeatSeconds: settings.heartbeatSeconds,
       acquired: createdNewLock,
       latestActionLogId: latest?.id ?? null,
-      lock: this.toLockView(ownedAfterAcquire, true, activeAfterAcquire)
+      lock: ownedAfterAcquire ? this.toLockView(ownedAfterAcquire, true, activeAfterAcquire) : null
     };
   }
   async heartbeat(input) {
@@ -983,7 +1105,7 @@ class RecordLockService {
     }
     return where;
   }
-  async findActiveLocks(input, now) {
+  async findActiveLocks(input, now, em = this.em) {
     const legacyFinder = this.findActiveLock;
     if (typeof legacyFinder === "function") {
       const legacyResult = await legacyFinder(input, now);
@@ -995,7 +1117,7 @@ class RecordLockService {
       resourceId: input.resourceId,
       status: ACTIVE_LOCK_STATUS
     };
-    const locks = await this.em.find(RecordLock, where, { orderBy: { updatedAt: "desc" } });
+    const locks = await em.find(RecordLock, where, { orderBy: { updatedAt: "desc" } });
     if (!Array.isArray(locks) || !locks.length) return [];
     let dirty = false;
     const active = [];
@@ -1014,7 +1136,7 @@ class RecordLockService {
       }
       active.push(lock);
     }
-    if (dirty) await this.em.flush();
+    if (dirty) await em.flush();
     if (expiredLocks.length) {
       const recipientUserIds = active.map((lock) => lock.lockedByUserId);
       for (const expiredLock of expiredLocks) {
@@ -1033,6 +1155,25 @@ class RecordLockService {
     }
     return active;
   }
+  async countActiveLocksForUser(input, now, em = this.em) {
+    const where = {
+      ...this.buildScopeWhere(input),
+      lockedByUserId: input.userId,
+      status: ACTIVE_LOCK_STATUS,
+      expiresAt: { $gt: now }
+    };
+    return em.count(RecordLock, where);
+  }
+  async lockUserQuotaScope(em, input) {
+    const lockKey = [
+      "record_locks",
+      "quota",
+      input.tenantId,
+      normalizeScopeOrganization(input.organizationId) ?? "global",
+      input.userId
+    ].join(":");
+    await em.getConnection().execute("select pg_advisory_xact_lock(hashtext(?))", [lockKey]);
+  }
   async findOwnedLockByToken(input) {
     if (!input.token) return null;
     const where = {
@@ -1045,7 +1186,7 @@ class RecordLockService {
     };
     return this.em.findOne(RecordLock, where);
   }
-  async findOwnedActiveLock(input) {
+  async findOwnedActiveLock(input, em = this.em) {
     const where = {
       ...this.buildScopeWhere(input),
       resourceKind: input.resourceKind,
@@ -1053,7 +1194,7 @@ class RecordLockService {
       lockedByUserId: input.userId,
       status: ACTIVE_LOCK_STATUS
     };
-    return this.em.findOne(RecordLock, where);
+    return em.findOne(RecordLock, where);
   }
   async hasRecentSavedRelease(input) {
     const cutoff = new Date(input.now.getTime() - PARTICIPANT_REJOIN_AFTER_SAVE_SUPPRESS_MS);