@open-mercato/core 0.8.1-develop.7274.1.21a0083828 → 0.8.1-develop.7294.1.0ef99fc518

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.8.1-develop.7274.1.21a0083828",
+  "version": "0.8.1-develop.7294.1.0ef99fc518",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -253,16 +253,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.8.1-develop.7274.1.21a0083828",
-    "@open-mercato/shared": "0.8.1-develop.7274.1.21a0083828",
-    "@open-mercato/ui": "0.8.1-develop.7274.1.21a0083828",
+    "@open-mercato/ai-assistant": "0.8.1-develop.7294.1.0ef99fc518",
+    "@open-mercato/shared": "0.8.1-develop.7294.1.0ef99fc518",
+    "@open-mercato/ui": "0.8.1-develop.7294.1.0ef99fc518",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.8.1-develop.7274.1.21a0083828",
-    "@open-mercato/shared": "0.8.1-develop.7274.1.21a0083828",
-    "@open-mercato/ui": "0.8.1-develop.7274.1.21a0083828",
+    "@open-mercato/ai-assistant": "0.8.1-develop.7294.1.0ef99fc518",
+    "@open-mercato/shared": "0.8.1-develop.7294.1.0ef99fc518",
+    "@open-mercato/ui": "0.8.1-develop.7294.1.0ef99fc518",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.3.3",

package/src/modules/auth/api/users/acl/route.ts

@@ -422,9 +422,10 @@ function normalizeOrganizations(organizations: unknown): string[] | null {
 
 // Whether the caller expressed an intentional narrowing. `null` and `__all__`
 // are the two documented ways to say "every organization"; an empty list is the
-// editor's "no organization picked" state ("Empty = all organizations"), which
-// is not a restriction an administrator chose. Only a concrete list narrows, so
-// only a concrete list has to justify itself against the feature grant below.
+// editor's "no organization picked" state, which this route treats as
+// unrestricted rather than a deliberate restriction. Only a concrete list
+// narrows, so only a concrete list has to justify itself against the feature
+// grant below.
 function hasOrganizationRestriction(organizations: string[] | null): boolean {
   if (!organizations || organizations.length === 0) return false
   return !organizations.includes('__all__')

package/src/modules/auth/components/AclEditor.tsx

@@ -282,12 +282,36 @@ export function AclEditor({
 
   const hasGlobalWildcard = granted.includes('*')
   const hasOrganizationRestriction = Array.isArray(organizations) && organizations.length > 0
+  // `null` (unrestricted) and `[]` (deny-all, the #4033 semantic) both leave every
+  // checkbox unticked, so the scope has to be reported explicitly instead of being
+  // inferred from checkbox emptiness (#5642).
+  const isDenyAllOrganizations = Array.isArray(organizations) && organizations.length === 0
   const showOrganizationWarning =
     (kind === 'role' || overrideEnabled) &&
     canEditOrganizations &&
     !isSuperAdmin &&
     hasOrganizationRestriction &&
     granted.length === 0
+  // A role ACL is persisted verbatim, so its empty scope really is a deny-all. A
+  // per-user override without a single feature is not persisted at all — the API
+  // clears the row instead of writing an empty scope — so warning there would
+  // claim a permission loss that never happens.
+  const denyAllOrganizationsWouldPersist = kind === 'role' || granted.length > 0
+  const showDenyAllOrganizationsWarning =
+    (kind === 'role' || overrideEnabled) &&
+    canEditOrganizations &&
+    !isSuperAdmin &&
+    isDenyAllOrganizations &&
+    denyAllOrganizationsWouldPersist
+  const organizationScopeSummary = isDenyAllOrganizations
+    ? t('auth.acl.organizationsScopeCurrent.none', 'Current scope: no organizations.')
+    : organizations && organizations.length > 0
+      ? t(
+          'auth.acl.organizationsScopeCurrent.selected',
+          'Current scope: {count} selected organization(s).',
+          { count: organizations.length },
+        )
+      : t('auth.acl.organizationsScopeCurrent.all', 'Current scope: all organizations.')
 
   
   const toggleWildcard = React.useCallback((wildcard: string, enable: boolean) => {
@@ -399,6 +423,7 @@ export function AclEditor({
                 {t('auth.acl.globalWildcard.description', 'This grants access to all features in the system.')}
               </div>
               <Button
+                type="button"
                 variant="outline"
                 size="sm"
                 className="mt-2"
@@ -564,7 +589,10 @@ export function AclEditor({
                 {t('auth.acl.organizationsScope', 'Organizations scope')}
               </div>
               <div className="text-xs text-muted-foreground mb-2">
-                {t('auth.acl.organizationsScopeHint', 'Empty means all organizations. Select one or more to restrict access.')}
+                {t('auth.acl.organizationsScopeHint', 'Select one or more organizations to restrict access to them. Use "Allow all organizations" to lift the restriction — clearing every selection instead denies access to all organizations.')}
+              </div>
+              <div className="text-xs font-medium mb-2" data-testid="acl-organization-scope-summary">
+                {organizationScopeSummary}
               </div>
               <div className="grid grid-cols-1 md:grid-cols-2 gap-2">
                 {orgOptions.map((o) => {
@@ -584,13 +612,21 @@ export function AclEditor({
                 })}
               </div>
               <div className="mt-2">
-                <Button variant="outline" onClick={() => setOrganizations(null)}>{t('auth.acl.allowAllOrganizations', 'Allow all organizations')}</Button>
+                <Button type="button" variant="outline" onClick={() => setOrganizations(null)}>{t('auth.acl.allowAllOrganizations', 'Allow all organizations')}</Button>
               </div>
               {showOrganizationWarning && (
                 <div className="mt-3 rounded border border-status-warning-border bg-status-warning-bg px-3 py-2 text-sm text-status-warning-text">
                   {t('auth.acl.organizationWarning', 'Organization restrictions are saved only when at least one feature override is selected. Add a feature or enable a module wildcard before saving.')}
                 </div>
               )}
+              {showDenyAllOrganizationsWarning && (
+                <div
+                  className="mt-3 rounded border border-status-warning-border bg-status-warning-bg px-3 py-2 text-sm text-status-warning-text"
+                  data-testid="acl-organization-deny-all-warning"
+                >
+                  {t('auth.acl.organizationsDenyAllWarning', 'No organization is selected, so this override denies access in every organization — including the features granted above. Choose at least one organization, or use "Allow all organizations" to leave the scope unrestricted.')}
+                </div>
+              )}
             </div>
           )}
         </>

package/src/modules/auth/i18n/de.json

@@ -436,8 +436,12 @@
   "auth.acl.modules.wms": "Warehouse Management System",
   "auth.acl.modules.workflows": "Workflow Engine",
   "auth.acl.organizationWarning": "Organisationseinschränkungen erfordern mindestens eine Berechtigungsüberschreibung. Füge eine Berechtigung oder einen Modul-Platzhalter hinzu, oder lösche den Organisationsbereich vor dem Speichern.",
+  "auth.acl.organizationsDenyAllWarning": "Es ist keine Organisation ausgewählt, daher entzieht diese Überschreibung den Zugriff in allen Organisationen — einschließlich der oben erteilten Berechtigungen. Wähle mindestens eine Organisation aus oder verwende „Alle Organisationen zulassen“, um den Bereich nicht einzuschränken.",
   "auth.acl.organizationsScope": "Organisationsbereich",
-  "auth.acl.organizationsScopeHint": "Empty means all organizations. Select one or more to restrict access.",
+  "auth.acl.organizationsScopeCurrent.all": "Aktueller Bereich: alle Organisationen.",
+  "auth.acl.organizationsScopeCurrent.none": "Aktueller Bereich: keine Organisationen.",
+  "auth.acl.organizationsScopeCurrent.selected": "Aktueller Bereich: {count} ausgewählte Organisation(en).",
+  "auth.acl.organizationsScopeHint": "Wähle eine oder mehrere Organisationen aus, um den Zugriff darauf zu beschränken. Verwende „Alle Organisationen zulassen“, um die Beschränkung aufzuheben — werden dagegen alle Auswahlen entfernt, wird der Zugriff auf alle Organisationen entzogen.",
   "auth.acl.restricted": "Eingeschränkt",
   "auth.acl.superAdmin.hint": "Only super administrators can change this option.",
   "auth.acl.superAdmin.label": "Super Admin (all features)",

package/src/modules/auth/i18n/en.json

@@ -436,8 +436,12 @@
   "auth.acl.modules.wms": "Warehouse Management System",
   "auth.acl.modules.workflows": "Workflow Engine",
   "auth.acl.organizationWarning": "Organization restrictions require at least one feature override. Add a feature or module wildcard, or clear the organization scope before saving.",
+  "auth.acl.organizationsDenyAllWarning": "No organization is selected, so this override denies access in every organization — including the features granted above. Choose at least one organization, or use \"Allow all organizations\" to leave the scope unrestricted.",
   "auth.acl.organizationsScope": "Organizations scope",
-  "auth.acl.organizationsScopeHint": "Empty means all organizations. Select one or more to restrict access.",
+  "auth.acl.organizationsScopeCurrent.all": "Current scope: all organizations.",
+  "auth.acl.organizationsScopeCurrent.none": "Current scope: no organizations.",
+  "auth.acl.organizationsScopeCurrent.selected": "Current scope: {count} selected organization(s).",
+  "auth.acl.organizationsScopeHint": "Select one or more organizations to restrict access to them. Use \"Allow all organizations\" to lift the restriction — clearing every selection instead denies access to all organizations.",
   "auth.acl.restricted": "Restricted",
   "auth.acl.superAdmin.hint": "Only super administrators can change this option.",
   "auth.acl.superAdmin.label": "Super Admin (all features)",

package/src/modules/auth/i18n/es.json

@@ -436,8 +436,12 @@
   "auth.acl.modules.wms": "Warehouse Management System",
   "auth.acl.modules.workflows": "Workflow Engine",
   "auth.acl.organizationWarning": "Las restricciones de organización requieren al menos una anulación de función. Agrega una función o un comodín de módulo, o borra el ámbito de organización antes de guardar.",
+  "auth.acl.organizationsDenyAllWarning": "No hay ninguna organización seleccionada, por lo que esta anulación deniega el acceso en todas las organizaciones, incluidos los permisos concedidos arriba. Selecciona al menos una organización o usa «Permitir todas las organizaciones» para no restringir el alcance.",
   "auth.acl.organizationsScope": "Alcance de organizaciones",
-  "auth.acl.organizationsScopeHint": "Empty means all organizations. Select one or more to restrict access.",
+  "auth.acl.organizationsScopeCurrent.all": "Alcance actual: todas las organizaciones.",
+  "auth.acl.organizationsScopeCurrent.none": "Alcance actual: ninguna organización.",
+  "auth.acl.organizationsScopeCurrent.selected": "Alcance actual: {count} organización(es) seleccionada(s).",
+  "auth.acl.organizationsScopeHint": "Selecciona una o más organizaciones para restringir el acceso a ellas. Usa «Permitir todas las organizaciones» para levantar la restricción; en cambio, borrar todas las selecciones deniega el acceso a todas las organizaciones.",
   "auth.acl.restricted": "Restringido",
   "auth.acl.superAdmin.hint": "Only super administrators can change this option.",
   "auth.acl.superAdmin.label": "Super Admin (all features)",

package/src/modules/auth/i18n/ko.json

@@ -436,8 +436,12 @@
   "auth.acl.modules.wms": "Warehouse Management System",
   "auth.acl.modules.workflows": "Workflow Engine",
   "auth.acl.organizationWarning": "조직 제한에는 하나 이상의 기능 재정의가 필요합니다. 기능이나 모듈 와일드카드를 추가하거나 저장하기 전에 조직 범위를 지우세요.",
+  "auth.acl.organizationsDenyAllWarning": "선택된 조직이 없으므로 이 재정의는 위에서 부여한 권한을 포함해 모든 조직에서 접근을 거부합니다. 조직을 하나 이상 선택하거나, 범위를 제한하지 않으려면 ‘모든 조직 허용’을 사용하세요.",
   "auth.acl.organizationsScope": "조직 범위",
-  "auth.acl.organizationsScopeHint": "Empty means all organizations. Select one or more to restrict access.",
+  "auth.acl.organizationsScopeCurrent.all": "현재 범위: 모든 조직.",
+  "auth.acl.organizationsScopeCurrent.none": "현재 범위: 조직 없음.",
+  "auth.acl.organizationsScopeCurrent.selected": "현재 범위: 선택된 조직 {count}개.",
+  "auth.acl.organizationsScopeHint": "하나 이상의 조직을 선택하면 해당 조직으로 접근이 제한됩니다. 제한을 해제하려면 ‘모든 조직 허용’을 사용하세요. 반대로 모든 선택을 해제하면 모든 조직에서 접근이 거부됩니다.",
   "auth.acl.restricted": "제한됨",
   "auth.acl.superAdmin.hint": "Only super administrators can change this option.",
   "auth.acl.superAdmin.label": "Super Admin (all features)",

package/src/modules/auth/i18n/pl.json

@@ -436,8 +436,12 @@
   "auth.acl.modules.wms": "System zarządzania magazynem",
   "auth.acl.modules.workflows": "Mechanizm przepływów pracy",
   "auth.acl.organizationWarning": "Ograniczenia organizacyjne wymagają co najmniej jednego nadpisania uprawnień. Dodaj uprawnienie lub wildcard modułu albo wyczyść zakres organizacji przed zapisaniem.",
+  "auth.acl.organizationsDenyAllWarning": "Nie wybrano żadnej organizacji, więc to nadpisanie odbiera dostęp we wszystkich organizacjach — łącznie z uprawnieniami przyznanymi powyżej. Wybierz co najmniej jedną organizację lub użyj przycisku „Zezwól na wszystkie organizacje”, aby nie ograniczać zakresu.",
   "auth.acl.organizationsScope": "Zakres organizacji",
-  "auth.acl.organizationsScopeHint": "Brak wyboru oznacza wszystkie organizacje. Wybierz co najmniej jedną, aby ograniczyć dostęp.",
+  "auth.acl.organizationsScopeCurrent.all": "Bieżący zakres: wszystkie organizacje.",
+  "auth.acl.organizationsScopeCurrent.none": "Bieżący zakres: brak organizacji.",
+  "auth.acl.organizationsScopeCurrent.selected": "Bieżący zakres: wybrane organizacje: {count}.",
+  "auth.acl.organizationsScopeHint": "Wybierz co najmniej jedną organizację, aby ograniczyć do niej dostęp. Użyj przycisku „Zezwól na wszystkie organizacje”, aby znieść ograniczenie — usunięcie wszystkich zaznaczeń odbiera natomiast dostęp do wszystkich organizacji.",
   "auth.acl.restricted": "Ograniczone",
   "auth.acl.superAdmin.hint": "Tylko superadministratorzy mogą zmienić tę opcję.",
   "auth.acl.superAdmin.label": "Superadministrator (wszystkie funkcje)",

package/src/modules/customers/backend/customers/companies/page.tsx

@@ -26,6 +26,7 @@ import type { AdvancedFilterTree } from '@open-mercato/shared/lib/query/advanced
 import { createEmptyTree, makeRuleTree } from '@open-mercato/shared/lib/query/advanced-filter-tree'
 import { deserializeAdvancedFilter, deserializeTree, flatToTree, mapDictionaryColorToTone, serializeTree } from '@open-mercato/shared/lib/query/advanced-filter'
 import { useCurrentUserId } from '@open-mercato/ui/backend/utils/useCurrentUserId'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import {
   DictionaryValue,
   createEmptyCustomerDictionaryMaps,
@@ -327,11 +328,12 @@ export default function CustomersCompaniesPage() {
     { keyExtras: [scopeVersion, reloadToken] },
   )
   const currentUserId = useCurrentUserId()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const [ownerFilterOptions, setOwnerFilterOptions] = React.useState<AdvancedFilterOption[]>([])
   React.useEffect(() => {
     const controller = new AbortController()
     let cancelled = false
-    void fetchAssignableStaffMembers('', { pageSize: 100, signal: controller.signal })
+    void fetchAssignableStaffMembers('', { pageSize: 100, activeOrgId, signal: controller.signal })
       .then((items) => {
         if (!cancelled) setOwnerFilterOptions(mapAssignableStaffToFilterOptions(items))
       })
@@ -342,7 +344,7 @@ export default function CustomersCompaniesPage() {
       cancelled = true
       controller.abort()
     }
-  }, [scopeVersion])
+  }, [activeOrgId, scopeVersion])
   const resolvedOwnerFilterOptions = React.useMemo(
     () => ensureCurrentUserFilterOption(
       ownerFilterOptions,
@@ -352,9 +354,9 @@ export default function CustomersCompaniesPage() {
     [currentUserId, ownerFilterOptions, t],
   )
   const loadOwnerFilterOptions = React.useCallback(async (query?: string): Promise<AdvancedFilterOption[]> => {
-    const items = await fetchAssignableStaffMembers(query ?? '', { pageSize: 100 })
+    const items = await fetchAssignableStaffMembers(query ?? '', { pageSize: 100, activeOrgId })
     return mapAssignableStaffToFilterOptions(items)
-  }, [])
+  }, [activeOrgId])
 
   const queryParams = React.useMemo(() => {
     const params = new URLSearchParams()

package/src/modules/customers/backend/customers/deals/map/components/DealsMapView.tsx

@@ -12,6 +12,7 @@ import {
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { translateWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import type { FilterOptionTone } from '@open-mercato/shared/lib/query/advanced-filter'
 import { FilterBarRow, type KanbanFilterChip } from '../../pipeline/components/FilterBarRow'
 import { StatusFilterPopover } from '../../pipeline/components/StatusFilterPopover'
@@ -236,6 +237,7 @@ type DealsMapViewProps = {
 export function DealsMapView({ search }: DealsMapViewProps): React.ReactElement {
   const t = useT()
   const scopeVersion = useOrganizationScopeVersion()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
 
   const [statusFilters, setStatusFilters] = React.useState<string[]>([])
   const [selectedPipelineId, setSelectedPipelineId] = React.useState<string | null>(null)
@@ -293,13 +295,13 @@ export function DealsMapView({ search }: DealsMapViewProps): React.ReactElement
   })
 
   const staffQuery = useQuery<Map<string, string>>({
-    queryKey: ['customers', 'deals', 'map', 'staff', `scope:${scopeVersion}`],
+    queryKey: ['customers', 'deals', 'map', 'staff', `scope:${scopeVersion}`, activeOrgId],
     staleTime: 300_000,
     queryFn: async () => {
       try {
         const members = await withScopedApiRequestHeaders(
           { ...SUPPRESS_AUTH_REDIRECT_HEADERS },
-          () => fetchAssignableStaffMembers('', { pageSize: 100 }),
+          () => fetchAssignableStaffMembers('', { pageSize: 100, activeOrgId }),
         )
         const names = new Map<string, string>()
         for (const member of members) {
@@ -482,7 +484,7 @@ export function DealsMapView({ search }: DealsMapViewProps): React.ReactElement
       try {
         const members = await withScopedApiRequestHeaders(
           { ...SUPPRESS_AUTH_REDIRECT_HEADERS },
-          () => fetchAssignableStaffMembers(query ?? '', { pageSize: 100 }),
+          () => fetchAssignableStaffMembers(query ?? '', { pageSize: 100, activeOrgId }),
         )
         const options: EntityFilterOption[] = members
           .filter((member) => !!member.userId && !!member.displayName)
@@ -497,7 +499,7 @@ export function DealsMapView({ search }: DealsMapViewProps): React.ReactElement
         return []
       }
     },
-    [],
+    [activeOrgId],
   )
 
   const loadPeopleOptions = React.useCallback(

package/src/modules/customers/backend/customers/deals/page.tsx

@@ -12,6 +12,7 @@ import type { AdvancedFilterTree } from '@open-mercato/shared/lib/query/advanced
 import { createEmptyTree, makeRuleTree, makeMultiRuleTree } from '@open-mercato/shared/lib/query/advanced-filter-tree'
 import { deserializeTree, deserializeAdvancedFilter, flatToTree, mapDictionaryColorToTone, serializeTree, type FilterFieldDef, type FilterOption as AdvancedFilterOption } from '@open-mercato/shared/lib/query/advanced-filter'
 import { useCurrentUserId } from '@open-mercato/ui/backend/utils/useCurrentUserId'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
@@ -637,6 +638,7 @@ export default function CustomersDealsPage() {
     keyExtras: [scopeVersion, reloadToken],
   })
   const currentUserId = useCurrentUserId()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const [ownerFilterOptions, setOwnerFilterOptions] = React.useState<AdvancedFilterOption[]>([])
   // Single staff load drives both the owner FILTER options and the owner-name
   // map shared with the OWNER cell + the KPI strip (userId → display name).
@@ -645,7 +647,7 @@ export default function CustomersDealsPage() {
   React.useEffect(() => {
     const controller = new AbortController()
     let cancelled = false
-    void fetchAssignableStaffMembers('', { pageSize: 100, signal: controller.signal })
+    void fetchAssignableStaffMembers('', { pageSize: 100, activeOrgId, signal: controller.signal })
       .then((items) => {
         if (cancelled) return
         setOwnerFilterOptions(mapAssignableStaffToFilterOptions(items))
@@ -664,7 +666,7 @@ export default function CustomersDealsPage() {
       cancelled = true
       controller.abort()
     }
-  }, [scopeVersion])
+  }, [activeOrgId, scopeVersion])
   const resolvedOwnerFilterOptions = React.useMemo(
     () => ensureCurrentUserFilterOption(
       ownerFilterOptions,
@@ -674,9 +676,9 @@ export default function CustomersDealsPage() {
     [currentUserId, ownerFilterOptions, t],
   )
   const loadOwnerFilterOptions = React.useCallback(async (query?: string): Promise<AdvancedFilterOption[]> => {
-    const items = await fetchAssignableStaffMembers(query ?? '', { pageSize: 100 })
+    const items = await fetchAssignableStaffMembers(query ?? '', { pageSize: 100, activeOrgId })
     return mapAssignableStaffToFilterOptions(items)
-  }, [])
+  }, [activeOrgId])
 
   const startOfToday = React.useMemo(() => {
     const today = new Date()

package/src/modules/customers/backend/customers/deals/pipeline/components/ChangeOwnerDialog.tsx

@@ -15,6 +15,7 @@ import { Input } from '@open-mercato/ui/primitives/input'
 import { Avatar } from '@open-mercato/ui/primitives/avatar'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import { translateWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 import {
   fetchAssignableStaffMembers,
@@ -37,6 +38,7 @@ export function ChangeOwnerDialog({
   onConfirm,
 }: ChangeOwnerDialogProps): React.ReactElement {
   const t = useT()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const [query, setQuery] = React.useState('')
   const [items, setItems] = React.useState<AssignableStaffMember[]>([])
   const [isLoading, setIsLoading] = React.useState(false)
@@ -53,7 +55,7 @@ export function ChangeOwnerDialog({
     let cancelled = false
     const controller = new AbortController()
     setIsLoading(true)
-    fetchAssignableStaffMembers(query, { pageSize: 50, signal: controller.signal })
+    fetchAssignableStaffMembers(query, { pageSize: 50, activeOrgId, signal: controller.signal })
       .then((next) => {
         if (cancelled) return
         setItems(next)
@@ -70,7 +72,7 @@ export function ChangeOwnerDialog({
       controller.abort()
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [open, query])
+  }, [activeOrgId, open, query])
 
   const handleConfirm = () => {
     onConfirm(selectedUserId)
@@ -141,7 +143,7 @@ export function ChangeOwnerDialog({
                   <Button
                     variant="ghost"
                     size="default"
-                    key={member.teamMemberId}
+                    key={member.teamMemberId ?? member.userId}
                     type="button"
                     onClick={() => setSelectedUserId(member.userId)}
                     // Overrides on the Button base class:

package/src/modules/customers/backend/customers/deals/pipeline/page.tsx

@@ -53,6 +53,7 @@ import type { RowActionItem } from '@open-mercato/ui/backend/RowActions'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { translateWithFallback } from '@open-mercato/shared/lib/i18n/translate'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import type { FilterOptionTone } from '@open-mercato/shared/lib/query/advanced-filter'
 import { ViewTabsRow, VIEW_TABS_ROW_COMPONENT_ID, type ViewTabsRowProps } from './components/ViewTabsRow'
 import { LANE_WIDTH_CLASS } from './components/constants'
@@ -427,6 +428,7 @@ export default function DealsKanbanPage(): React.ReactElement {
   )
   const router = useRouter()
   const scopeVersion = useOrganizationScopeVersion()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const queryClient = useQueryClient()
 
   const [selectedPipelineId, setSelectedPipelineId] = React.useState<string | null>(null)
@@ -499,9 +501,9 @@ export default function DealsKanbanPage(): React.ReactElement {
   }, [pipelinesQuery.data, selectedPipelineId])
 
   const staffQuery = useQuery<AssignableStaffMember[]>({
-    queryKey: ['customers', 'deals', 'kanban', 'staff', `scope:${scopeVersion}`],
+    queryKey: ['customers', 'deals', 'kanban', 'staff', `scope:${scopeVersion}`, activeOrgId],
     staleTime: 300_000,
-    queryFn: async () => fetchAssignableStaffMembers('', { pageSize: 100 }),
+    queryFn: async () => fetchAssignableStaffMembers('', { pageSize: 100, activeOrgId }),
   })
 
   const ownerNamesById = React.useMemo(() => {
@@ -2414,7 +2416,7 @@ export default function DealsKanbanPage(): React.ReactElement {
   // Async loaders for entity-filter popovers (Owner / People / Companies)
   const loadOwnerOptions = React.useCallback(
     async (query: string, _signal: AbortSignal): Promise<EntityFilterOption[]> => {
-      const items = await fetchAssignableStaffMembers(query ?? '', { pageSize: 100 })
+      const items = await fetchAssignableStaffMembers(query ?? '', { pageSize: 100, activeOrgId })
       const opts: EntityFilterOption[] = items
         .filter((user) => !!user.userId && !!user.displayName)
         .map((user) => ({ value: user.userId!, label: user.displayName! }))
@@ -2426,7 +2428,7 @@ export default function DealsKanbanPage(): React.ReactElement {
       })
       return opts
     },
-    [],
+    [activeOrgId],
   )
   const loadPeopleOptions = React.useCallback(
     async (query: string, signal: AbortSignal): Promise<EntityFilterOption[]> => {

package/src/modules/customers/backend/customers/people/page.tsx

@@ -26,6 +26,7 @@ import type { AdvancedFilterTree } from '@open-mercato/shared/lib/query/advanced
 import { createEmptyTree, makeRuleTree } from '@open-mercato/shared/lib/query/advanced-filter-tree'
 import { deserializeAdvancedFilter, deserializeTree, flatToTree, mapDictionaryColorToTone, serializeTree } from '@open-mercato/shared/lib/query/advanced-filter'
 import { useCurrentUserId } from '@open-mercato/ui/backend/utils/useCurrentUserId'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import {
   DictionaryValue,
   createEmptyCustomerDictionaryMaps,
@@ -338,11 +339,12 @@ export default function CustomersPeoplePage() {
     { keyExtras: [scopeVersion, reloadToken] },
   )
   const currentUserId = useCurrentUserId()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const [ownerFilterOptions, setOwnerFilterOptions] = React.useState<AdvancedFilterOption[]>([])
   React.useEffect(() => {
     const controller = new AbortController()
     let cancelled = false
-    void fetchAssignableStaffMembers('', { pageSize: 100, signal: controller.signal })
+    void fetchAssignableStaffMembers('', { pageSize: 100, activeOrgId, signal: controller.signal })
       .then((items) => {
         if (!cancelled) setOwnerFilterOptions(mapAssignableStaffToFilterOptions(items))
       })
@@ -353,7 +355,7 @@ export default function CustomersPeoplePage() {
       cancelled = true
       controller.abort()
     }
-  }, [scopeVersion])
+  }, [activeOrgId, scopeVersion])
   const resolvedOwnerFilterOptions = React.useMemo(
     () => ensureCurrentUserFilterOption(
       ownerFilterOptions,
@@ -363,9 +365,9 @@ export default function CustomersPeoplePage() {
     [currentUserId, ownerFilterOptions, t],
   )
   const loadOwnerFilterOptions = React.useCallback(async (query?: string): Promise<AdvancedFilterOption[]> => {
-    const items = await fetchAssignableStaffMembers(query ?? '', { pageSize: 100 })
+    const items = await fetchAssignableStaffMembers(query ?? '', { pageSize: 100, activeOrgId })
     return mapAssignableStaffToFilterOptions(items)
-  }, [])
+  }, [activeOrgId])
 
   const queryParams = React.useMemo(() => {
     const params = new URLSearchParams()

package/src/modules/customers/components/calendar/editor/PeopleField.tsx

@@ -9,6 +9,7 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Input } from '@open-mercato/ui/primitives/input'
 import type { EditorParticipant } from '../../../lib/calendar/editorPayload'
 import { composeAccessibleName } from '../../../lib/calendar/labels'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import { searchPeopleOptions, type PersonOption } from './lookups'
 import { CONTROL_BORDER, DROPDOWN_PANEL_CLASS, PersonChip, UppercaseBadge, useDropdownDismiss } from './inputs'
 
@@ -40,6 +41,7 @@ export function PeopleField({
   includeStaff?: boolean
 }) {
   const t = useT()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const [query, setQuery] = React.useState('')
   const [open, setOpen] = React.useState(false)
   const [options, setOptions] = React.useState<PersonOption[]>([])
@@ -54,7 +56,12 @@ export function PeopleField({
     const timer = window.setTimeout(async () => {
       setLoading(true)
       try {
-        const results = await searchPeopleOptions(query.trim(), { includeCustomers, includeStaff, signal: controller.signal })
+        const results = await searchPeopleOptions(query.trim(), {
+          includeCustomers,
+          includeStaff,
+          activeOrgId,
+          signal: controller.signal,
+        })
         if (cancelled) return
         setOptions(results)
       } catch {
@@ -68,7 +75,7 @@ export function PeopleField({
       controller.abort()
       window.clearTimeout(timer)
     }
-  }, [open, query, includeCustomers, includeStaff])
+  }, [activeOrgId, open, query, includeCustomers, includeStaff])
 
   const selectedIds = new Set(value.map((participant) => participant.userId))
   const visibleOptions = options.filter((option) => !selectedIds.has(option.userId))

package/src/modules/customers/components/calendar/editor/hooks.ts

@@ -13,6 +13,7 @@ import { expandOccurrences } from '../../../lib/calendar/recurrence'
 import { getFetchWindow } from '../../../lib/calendar/range'
 import type { CalendarItem } from '../types'
 import { fetchCalendarCandidates } from '../useCalendarItems'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import { fetchDealById, fetchRelatedEntityById, findStaffMemberName } from './lookups'
 
 // Edit-mode prefill stores ids only (parseItemToFormState is pure); resolve the
@@ -22,6 +23,7 @@ export function useEditorLabelResolution(
   form: EditorFormState,
   update: (patch: Partial<EditorFormState>) => void,
 ): void {
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   React.useEffect(() => {
     if (!open) return
     const controller = new AbortController()
@@ -36,7 +38,7 @@ export function useEditorLabelResolution(
         if (!cancelled && deal) update({ dealLabel: deal.label })
       }
       if (form.assigneeUserId && !form.assigneeName) {
-        const name = await findStaffMemberName(form.assigneeUserId, controller.signal)
+        const name = await findStaffMemberName(form.assigneeUserId, controller.signal, activeOrgId)
         if (!cancelled && name) update({ assigneeName: name })
       }
     }
@@ -50,7 +52,7 @@ export function useEditorLabelResolution(
       cancelled = true
       controller.abort()
     }
-  }, [open, form.relatedTo, form.dealId, form.dealLabel, form.assigneeUserId, form.assigneeName, update])
+  }, [activeOrgId, open, form.relatedTo, form.dealId, form.dealLabel, form.assigneeUserId, form.assigneeName, update])
 }
 
 function formatClock(date: Date): string {

package/src/modules/customers/components/calendar/editor/lookups.ts

@@ -126,7 +126,7 @@ export async function fetchDealById(dealId: string, signal: AbortSignal): Promis
 
 export async function searchPeopleOptions(
   query: string,
-  options: { includeCustomers: boolean; includeStaff?: boolean; signal: AbortSignal },
+  options: { includeCustomers: boolean; includeStaff?: boolean; signal: AbortSignal; activeOrgId?: string | null },
 ): Promise<PersonOption[]> {
   // Staff lookup is optional twice over: skipped when the staff module is not
   // loaded (includeStaff === false) and non-fatal when the endpoint errors, so
@@ -134,7 +134,11 @@ export async function searchPeopleOptions(
   const [staff, customers] = await Promise.all([
     options.includeStaff === false
       ? Promise.resolve<Awaited<ReturnType<typeof fetchAssignableStaffMembers>>>([])
-      : fetchAssignableStaffMembers(query, { pageSize: 10, signal: options.signal }).catch(() => []),
+      : fetchAssignableStaffMembers(query, {
+          pageSize: 10,
+          activeOrgId: options.activeOrgId,
+          signal: options.signal,
+        }).catch(() => []),
     options.includeCustomers
       ? searchRelatedEntities('person', query, options.signal)
       : Promise.resolve<RelatedEntityOption[]>([]),
@@ -262,9 +266,13 @@ export async function fetchPeoplePhones(ids: string[], signal: AbortSignal): Pro
   }
 }
 
-export async function findStaffMemberName(userId: string, signal: AbortSignal): Promise<string | null> {
+export async function findStaffMemberName(
+  userId: string,
+  signal: AbortSignal,
+  activeOrgId?: string | null,
+): Promise<string | null> {
   try {
-    const members = await fetchAssignableStaffMembers('', { pageSize: 100, signal })
+    const members = await fetchAssignableStaffMembers('', { pageSize: 100, activeOrgId, signal })
     const match = members.find((member) => member.userId === userId)
     return match ? match.displayName : null
   } catch {

package/src/modules/customers/components/detail/AssignRoleDialog.tsx

@@ -20,6 +20,7 @@ import {
 } from '@open-mercato/ui/primitives/dialog'
 import type { DictionaryEntryOption } from '@open-mercato/core/modules/dictionaries/lib/clientEntries'
 import type { RoleAssignment } from './RoleAssignmentRow'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import { fetchAssignableStaffMembersPage } from './assignableStaff'
 
 const MANAGE_ROLE_TYPES_HREF = '/backend/config/customers'
@@ -65,6 +66,7 @@ export function AssignRoleDialog({
   canManageRoleTypes = false,
 }: AssignRoleDialogProps) {
   const t = useT()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const [step, setStep] = React.useState<StepId>(1)
   const [selectedRoleType, setSelectedRoleType] = React.useState('')
   const [selectedUser, setSelectedUser] = React.useState<StaffMember | null>(null)
@@ -144,6 +146,7 @@ export function AssignRoleDialog({
         const result = await fetchAssignableStaffMembersPage(query, {
           page,
           pageSize: ASSIGNABLE_STAFF_PAGE_SIZE,
+          activeOrgId,
         })
         if (requestSequenceRef.current !== requestId) return
 
@@ -187,7 +190,7 @@ export function AssignRoleDialog({
         }
       }
     },
-    [t],
+    [activeOrgId, t],
   )
 
   React.useEffect(() => {