Merge upstream/main into main

Resolve conflicts while keeping field-expert lock/view fixes and user
party-access query improvements from the fork.

src/helpers/tenant-scope.ts

@@ -1,4 +1,5 @@
 import { BadRequestException, ForbiddenException } from "@nestjs/common";
+import { RoleEnum } from "src/Types&Enums/role.enum";
 
 /** Insurance company tenant id on the actor JWT (Mongo ObjectId string). */
 export function requireActorClientKey(actor: { clientKey?: string }): string {