@open-mercato/core 0.8.1-develop.7275.1.f772b944d4 → 0.8.1-develop.7294.1.0ef99fc518

package/src/modules/warranty_claims/api/portal/events/route.ts

@@ -4,7 +4,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import type { AuthContext } from '@open-mercato/shared/lib/auth/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
-import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { runRouteMutationGuards, type RouteMutationGuardResult } from '@open-mercato/shared/lib/crud/route-mutation-guard'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
@@ -212,7 +212,7 @@ export async function POST(req: Request) {
     await guarded.runAfterSuccess()
   } catch (err) {
     if (isCrudHttpError(err)) {
-      return NextResponse.json(err.body, { status: err.status })
+      return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     }
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {

package/src/modules/warranty_claims/api/receiving/route.ts

@@ -4,7 +4,7 @@ import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
@@ -186,7 +186,7 @@ export async function POST(req: Request) {
 
     return NextResponse.json({ ok: true, lineId: result.lineId, claimId: result.claimId })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })

package/src/modules/warranty_claims/api/replacement-order/route.ts

@@ -4,7 +4,7 @@ import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
@@ -157,7 +157,7 @@ export async function POST(req: Request) {
       skippedLineIds: result.skippedLineIds,
     })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })

package/src/modules/warranty_claims/api/return-label/route.ts

@@ -5,7 +5,7 @@ import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
@@ -268,7 +268,7 @@ export async function POST(req: Request) {
     await guarded.runAfterSuccess()
     return NextResponse.json(response)
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })

package/src/modules/warranty_claims/api/risk/route.ts

@@ -4,7 +4,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
@@ -85,8 +85,8 @@ export async function GET(req: Request) {
     const result = await evaluateClaimRisk(context.em, claim, lines)
     return NextResponse.json({ ok: true, result })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
     const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/api/sales-return/route.ts

@@ -4,7 +4,7 @@ import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
@@ -149,7 +149,7 @@ export async function POST(req: Request) {
     await guarded.runAfterSuccess()
     return NextResponse.json({ salesReturnId: result.salesReturnId, skippedLineIds: result.skippedLineIds })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })

package/src/modules/warranty_claims/api/settings-general/route.ts

@@ -6,7 +6,7 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { runRouteMutationGuards } from '@open-mercato/shared/lib/crud/route-mutation-guard'
@@ -105,8 +105,8 @@ export async function GET(req: Request) {
     const result = await buildSettingsResult(em, { tenantId, organizationId })
     return NextResponse.json({ ok: true, result })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
     const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     logger.error('warranty_claims.settings-general.get failed', { err })
     return NextResponse.json({ error: translate('warranty_claims.errors.load_failed', 'Failed to load warranty claim data.') }, { status: 500 })
   }
@@ -165,12 +165,12 @@ export async function PUT(req: Request) {
       },
     })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
     }
-    const { translate } = await resolveTranslations()
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/api/stats/route.ts

@@ -5,7 +5,7 @@ import { sql, type SelectQueryBuilder } from 'kysely'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { resolveEffectiveWarrantyClaimSettings } from '../../lib/settings'
@@ -277,8 +277,8 @@ export async function GET(req: Request) {
       },
     })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
     const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/api/submit/route.ts

@@ -5,7 +5,7 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { runRouteMutationGuards, type RouteMutationGuardResult } from '@open-mercato/shared/lib/crud/route-mutation-guard'
@@ -118,12 +118,12 @@ export async function POST(req: Request) {
 
     return NextResponse.json({ ok: true, claimId: result?.claimId ?? commandInput.id })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
     }
-    const { translate } = await resolveTranslations()
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/api/transition/route.ts

@@ -5,7 +5,7 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { runRouteMutationGuards, type RouteMutationGuardResult } from '@open-mercato/shared/lib/crud/route-mutation-guard'
@@ -116,12 +116,12 @@ export async function POST(req: Request) {
 
     return NextResponse.json({ ok: true, claimId: result?.claimId ?? commandInput.id })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
     }
-    const { translate } = await resolveTranslations()
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/api/vendor-recovery/route.ts

@@ -5,7 +5,7 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { runRouteMutationGuards, type RouteMutationGuardResult } from '@open-mercato/shared/lib/crud/route-mutation-guard'
@@ -120,12 +120,12 @@ export async function POST(req: Request) {
 
     return NextResponse.json({ ok: true, claimId: createdClaimId })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
+    const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     const interceptorRejection = getCommandInterceptorHttpRejection(err)
     if (interceptorRejection) {
       return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
     }
-    const { translate } = await resolveTranslations()
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/api/vendor-recovery-suggestions/route.ts

@@ -4,7 +4,7 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
-import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { CrudHttpError, isCrudHttpError, translateCrudErrorBody } from '@open-mercato/shared/lib/crud/errors'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
@@ -140,8 +140,8 @@ export async function GET(req: Request) {
     }))
     return NextResponse.json({ ok: true, result: { claimId: claim.id, suggestions } })
   } catch (err) {
-    if (isCrudHttpError(err)) return NextResponse.json(err.body, { status: err.status })
     const { translate } = await resolveTranslations()
+    if (isCrudHttpError(err)) return NextResponse.json(translateCrudErrorBody(err.body, translate), { status: err.status })
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: translate('warranty_claims.errors.invalidInput', 'Invalid input') }, { status: 400 })
     }

package/src/modules/warranty_claims/backend/page.tsx

@@ -23,6 +23,7 @@ import { buildCrudExportUrl } from '@open-mercato/ui/backend/utils/crud'
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { useCurrentUserId } from '@open-mercato/ui/backend/utils/useCurrentUserId'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { emitProgressUpdate } from '@open-mercato/shared/lib/frontend/progressEvents'
 import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
@@ -411,6 +412,7 @@ export default function WarrantyClaimsPage() {
   const pathname = usePathname()
   const searchParams = useSearchParams()
   const scopeVersion = useOrganizationScopeVersion()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const currentUserId = useCurrentUserId()
   const initialUrlStateRef = React.useRef<RestoredClaimListState | null>(null)
@@ -617,7 +619,7 @@ export default function WarrantyClaimsPage() {
   )
 
   const loadAssignableStaffOptions = React.useCallback(async (query?: string): Promise<CrudFieldOption[]> => {
-    const page = await fetchAssignableStaffMembersPage(query ?? '', { pageSize: 24 })
+    const page = await fetchAssignableStaffMembersPage(query ?? '', { pageSize: 24, activeOrgId })
     const options = page.items.map((member) => ({
       value: member.userId,
       label: staffOptionLabel(member),
@@ -629,7 +631,7 @@ export default function WarrantyClaimsPage() {
       },
       ...options,
     ]
-  }, [t])
+  }, [activeOrgId, t])
 
   const formatAssigneeFilterValue = React.useCallback((value: string) => {
     if (value === UNASSIGNED_ASSIGNEE_VALUE) return t('warranty_claims.form.assigneeUserId.unassigned', 'Unassigned')

package/src/modules/warranty_claims/backend/warranty_claims/[id]/page.tsx

@@ -45,6 +45,7 @@ import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { mapCrudServerErrorToFormErrors } from '@open-mercato/ui/backend/utils/serverErrors'
 import { useCurrentUserId } from '@open-mercato/ui/backend/utils/useCurrentUserId'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import { AttachmentInput } from '@open-mercato/core/modules/attachments/fields/attachment'
 import {
   fetchAssignableStaffMembersPage,
@@ -766,6 +767,7 @@ export default function WarrantyClaimDetailPage({ params }: { params?: { id?: st
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const currentUserId = useCurrentUserId()
   const scopeVersion = useOrganizationScopeVersion()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const [claim, setClaim] = React.useState<ClaimRecord | null>(null)
   const [lines, setLines] = React.useState<ClaimLine[]>([])
   const [events, setEvents] = React.useState<ClaimEvent[]>([])
@@ -1007,14 +1009,19 @@ export default function WarrantyClaimDetailPage({ params }: { params?: { id?: st
     if (!assignDialogOpen) return
     const controller = new AbortController()
     setAssignLoading(true)
-    fetchAssignableStaffMembersPage(assignSearch, { page: 1, pageSize: 24, signal: controller.signal })
+    fetchAssignableStaffMembersPage(assignSearch, {
+      page: 1,
+      pageSize: 24,
+      activeOrgId,
+      signal: controller.signal,
+    })
       .then((page) => setAssignOptions(page.items))
       .catch(() => setAssignOptions([]))
       .finally(() => {
         if (!controller.signal.aborted) setAssignLoading(false)
       })
     return () => controller.abort()
-  }, [assignDialogOpen, assignSearch])
+  }, [activeOrgId, assignDialogOpen, assignSearch])
 
   const claimCustomerId = claim?.customerId ?? null
   React.useEffect(() => {

package/src/modules/warranty_claims/backend/warranty_claims/settings/page.tsx

@@ -22,6 +22,7 @@ import { Switch } from '@open-mercato/ui/primitives/switch'
 import { Textarea } from '@open-mercato/ui/primitives/textarea'
 import { ComboboxInput, type ComboboxOption } from '@open-mercato/ui/backend/inputs/ComboboxInput'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
+import { useCurrentOrganization } from '@open-mercato/ui/backend/BackendChromeProvider'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { ICON_SUGGESTIONS } from '@open-mercato/core/modules/dictionaries/components/dictionaryAppearance'
 import {
@@ -1006,6 +1007,7 @@ function GeneralSettingsSubsection({
 export default function WarrantyClaimSettingsPage() {
   const t = useT()
   const scopeVersion = useOrganizationScopeVersion()
+  const activeOrgId = useCurrentOrganization()?.id ?? null
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const [entriesByKind, setEntriesByKind] = React.useState<Record<WarrantyDictionaryKind, DictionaryTableEntry[]>>({
     'warranty-claim-fault-code': [],
@@ -1198,9 +1200,9 @@ export default function WarrantyClaimSettingsPage() {
   ), [])
 
   const loadEscalationStaffOptions = React.useCallback(async (query?: string): Promise<ComboboxOption[]> => {
-    const page = await fetchAssignableStaffMembersPage(query ?? '', { pageSize: 24 })
+    const page = await fetchAssignableStaffMembersPage(query ?? '', { pageSize: 24, activeOrgId })
     return page.items.map((member) => ({ value: member.userId, label: staffOptionLabel(member) }))
-  }, [staffOptionLabel])
+  }, [activeOrgId, staffOptionLabel])
 
   const resolveStaffUserLabel = React.useCallback(async (userId: string): Promise<string> => {
     const unknownUserLabel = t('warranty_claims.detail.unknownUser')

package/src/modules/warranty_claims/frontend/[orgSlug]/portal/claims/[id]/page.tsx

@@ -2,8 +2,8 @@
 
 import * as React from 'react'
 import Link from 'next/link'
-import { useRouter } from 'next/navigation'
 import { ArrowLeft, Check, CircleAlert, Info, Paperclip, RefreshCw, ShieldCheck, Trash2, TriangleAlert } from 'lucide-react'
+import { replaceWithPageReload } from '@open-mercato/core/modules/portal/lib/navigation'
 import { useLocale, useT, type TranslateFn } from '@open-mercato/shared/lib/i18n/context'
 import { localizeDictionaryLabel } from '@open-mercato/core/modules/warranty_claims/lib/dictionaryLabels'
 import { formatQuantity } from '@open-mercato/core/modules/warranty_claims/lib/quantity'
@@ -330,7 +330,6 @@ const DARK_BUTTON_CLASS = 'rounded-md px-3 py-2 text-sm font-medium'
 export default function WarrantyClaimPortalDetailPage({ params }: Props) {
   const t = useT()
   const locale = useLocale()
-  const router = useRouter()
   const { auth } = usePortalContext()
   const { user, loading } = auth
   const guardedMutation = useGuardedMutation<Record<string, unknown>>({
@@ -354,11 +353,13 @@ export default function WarrantyClaimPortalDetailPage({ params }: Props) {
   const replacementInputRef = React.useRef<HTMLInputElement | null>(null)
   const replacementTargetRef = React.useRef<PortalAttachment | null>(null)
 
+  // Leaving an authenticated page for the login page crosses the public/authenticated
+  // boundary, so it must be a full page load — see `replaceWithPageReload`.
   React.useEffect(() => {
     if (!loading && !user) {
-      router.replace(`/${params.orgSlug}/portal/login`)
+      replaceWithPageReload(`/${params.orgSlug}/portal/login`)
     }
-  }, [loading, user, router, params.orgSlug])
+  }, [loading, user, params.orgSlug])
 
   const refreshEvents = React.useCallback(async (claimId: string) => {
     const result = await apiCall<EventResponse>(`/api/warranty_claims/portal/events?claimId=${encodeURIComponent(claimId)}`)

package/src/modules/warranty_claims/frontend/[orgSlug]/portal/claims/new/page.tsx

@@ -4,6 +4,7 @@ import * as React from 'react'
 import Link from 'next/link'
 import { useRouter } from 'next/navigation'
 import { ArrowLeft, ArrowRight, FileText, Plus, Send, Trash2 } from 'lucide-react'
+import { replaceWithPageReload } from '@open-mercato/core/modules/portal/lib/navigation'
 import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Checkbox } from '@open-mercato/ui/primitives/checkbox'
@@ -307,11 +308,13 @@ export default function WarrantyClaimPortalNewPage({ params }: Props) {
   const serialLookupTimers = React.useRef<Record<string, number>>({})
   const isMountedRef = React.useRef(true)
 
+  // Leaving an authenticated page for the login page crosses the public/authenticated
+  // boundary, so it must be a full page load — see `replaceWithPageReload`.
   React.useEffect(() => {
     if (!loading && !user) {
-      router.replace(`/${params.orgSlug}/portal/login`)
+      replaceWithPageReload(`/${params.orgSlug}/portal/login`)
     }
-  }, [loading, user, router, params.orgSlug])
+  }, [loading, user, params.orgSlug])
 
   React.useEffect(() => {
     isMountedRef.current = true

package/src/modules/warranty_claims/frontend/[orgSlug]/portal/claims/page.tsx

@@ -5,6 +5,7 @@ import Link from 'next/link'
 import { useRouter } from 'next/navigation'
 import type { LegacyColumnDef as ColumnDef } from '@tanstack/react-table/legacy'
 import { ChevronRight, Plus, ShieldCheck } from 'lucide-react'
+import { replaceWithPageReload } from '@open-mercato/core/modules/portal/lib/navigation'
 import { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
 import { formatRelativeTime } from '@open-mercato/shared/lib/time'
 import { Button } from '@open-mercato/ui/primitives/button'
@@ -72,11 +73,13 @@ export default function WarrantyClaimsPortalListPage({ params }: Props) {
   const [stateGroup, setStateGroup] = React.useState<'all' | 'open' | 'resolved'>('all')
   const [tabCounts, setTabCounts] = React.useState<Partial<Record<'all' | 'open' | 'resolved', number>>>({})
 
+  // Leaving an authenticated page for the login page crosses the public/authenticated
+  // boundary, so it must be a full page load — see `replaceWithPageReload`.
   React.useEffect(() => {
     if (!loading && !user) {
-      router.replace(`/${params.orgSlug}/portal/login`)
+      replaceWithPageReload(`/${params.orgSlug}/portal/login`)
     }
-  }, [loading, user, router, params.orgSlug])
+  }, [loading, user, params.orgSlug])
 
   const statusFilter = typeof filterValues.status === 'string' ? filterValues.status : ''
 

package/src/modules/workflows/components/DefinitionTriggersEditor.tsx

@@ -628,7 +628,7 @@ export function DefinitionTriggersEditor({
                   placeholder={t('workflows.triggers.placeholders.debounce', 'e.g. 1000')}
                 />
                 <p className="text-xs text-muted-foreground">
-                  {t('workflows.triggers.hints.debounce', 'Wait this many milliseconds after an event before starting, so a burst of similar events starts only one workflow. Leave empty to start immediately.')}
+                  {t('workflows.triggers.hints.debounce', 'The first matching event starts an instance immediately; further events for the same record within this many milliseconds are skipped. Leave empty to start an instance for every event.')}
                 </p>
               </div>
               <div className="space-y-1">

package/src/modules/workflows/frontend/[orgSlug]/portal/tasks/[id]/page.tsx

@@ -116,9 +116,9 @@ export default function PortalTaskDetailPage({ params }: Props) {
         setFailure('submit')
         return
       }
-      router.push(listHref)
+      router.push(`/${params.orgSlug}/portal/tasks`)
     },
-    [task, values, comments, router, listHref],
+    [task, values, comments, router, params.orgSlug],
   )
 
   if (notFound) {

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

@@ -1952,7 +1952,7 @@
   "workflows.triggers.fields.name": "Name",
   "workflows.triggers.fields.priority": "Priorität",
   "workflows.triggers.hints.contextMapping": "Werte aus der Ereignis-Nutzlast dem anfänglichen Workflow-Kontext zuordnen",
-  "workflows.triggers.hints.debounce": "So viele Millisekunden nach einem Ereignis warten, damit ein Schwall ähnlicher Ereignisse nur einen Workflow startet. Leer lassen, um sofort zu starten.",
+  "workflows.triggers.hints.debounce": "Das erste passende Ereignis startet sofort eine Instanz; weitere Ereignisse für denselben Datensatz innerhalb dieser Millisekundenspanne werden übersprungen. Leer lassen, um für jedes Ereignis eine Instanz zu starten.",
   "workflows.triggers.hints.eventPattern": "Verwenden Sie * als Platzhalter: \"sales.orders.*\" passt auf jedes Bestellereignis",
   "workflows.triggers.hints.filterConditions": "Nur auslösen, wenn die Ereignis-Nutzlast diese Bedingungen erfüllt (alle müssen zutreffen)",
   "workflows.triggers.hints.maxConcurrent": "Begrenzt, wie viele Instanzen dieser Auslöser gleichzeitig laufen lassen darf; Ereignisse über dem Limit werden übersprungen. Leer lassen für kein Limit.",

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

@@ -1952,7 +1952,7 @@
   "workflows.triggers.fields.name": "Name",
   "workflows.triggers.fields.priority": "Priority",
   "workflows.triggers.hints.contextMapping": "Map values from the event payload to the workflow's initial context",
-  "workflows.triggers.hints.debounce": "Wait this many milliseconds after an event before starting, so a burst of similar events starts only one workflow. Leave empty to start immediately.",
+  "workflows.triggers.hints.debounce": "The first matching event starts an instance immediately; further events for the same record within this many milliseconds are skipped. Leave empty to start an instance for every event.",
   "workflows.triggers.hints.eventPattern": "Use * as wildcard: \"sales.orders.*\" matches any order event",
   "workflows.triggers.hints.filterConditions": "Only trigger when the event payload matches these conditions (all must match)",
   "workflows.triggers.hints.maxConcurrent": "Cap how many instances this trigger can have running at the same time; events past the cap are skipped. Leave empty for no limit.",

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

@@ -1952,7 +1952,7 @@
   "workflows.triggers.fields.name": "Nombre",
   "workflows.triggers.fields.priority": "Prioridad",
   "workflows.triggers.hints.contextMapping": "Mapea valores de la carga del evento al contexto inicial del flujo de trabajo",
-  "workflows.triggers.hints.debounce": "Espera esta cantidad de milisegundos tras un evento antes de iniciar, para que una ráfaga de eventos similares inicie solo un flujo. Deja vacío para iniciar de inmediato.",
+  "workflows.triggers.hints.debounce": "El primer evento coincidente inicia una instancia de inmediato; los eventos posteriores del mismo registro dentro de esta cantidad de milisegundos se omiten. Deja vacío para iniciar una instancia por cada evento.",
   "workflows.triggers.hints.eventPattern": "Usa * como comodin: \"sales.orders.*\" coincide con cualquier evento de pedido",
   "workflows.triggers.hints.filterConditions": "Solo se dispara cuando la carga del evento coincida con estas condiciones (todas deben coincidir)",
   "workflows.triggers.hints.maxConcurrent": "Limita cuántas instancias puede tener este disparador en ejecución a la vez; los eventos que superen el límite se omiten. Deja vacío para no limitar.",

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

@@ -1952,7 +1952,7 @@
   "workflows.triggers.fields.name": "이름",
   "workflows.triggers.fields.priority": "우선순위",
   "workflows.triggers.hints.contextMapping": "이벤트 페이로드의 값을 워크플로우의 초기 컨텍스트에 매핑합니다",
-  "workflows.triggers.hints.debounce": "잦은 재트리거를 방지하기 위한 지연 시간",
+  "workflows.triggers.hints.debounce": "일치하는 첫 이벤트가 즉시 인스턴스를 시작합니다. 이 시간(밀리초) 이내에 동일한 레코드에 대한 후속 이벤트는 건너뜁니다. 비워두면 모든 이벤트마다 인스턴스가 시작됩니다.",
   "workflows.triggers.hints.eventPattern": "와일드카드로 *를 사용하세요: \"sales.orders.*\"는 모든 주문 이벤트와 일치합니다",
   "workflows.triggers.hints.filterConditions": "이벤트 페이로드가 이 조건들과 모두 일치할 때만 트리거됩니다",
   "workflows.triggers.hints.maxConcurrent": "동시에 실행되는 워크플로우 인스턴스 수를 제한합니다",

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

@@ -1952,7 +1952,7 @@
   "workflows.triggers.fields.name": "Nazwa",
   "workflows.triggers.fields.priority": "Priorytet",
   "workflows.triggers.hints.contextMapping": "Mapuj wartości z zawartości zdarzenia do początkowego kontekstu przepływu",
-  "workflows.triggers.hints.debounce": "Odczekaj tyle milisekund po zdarzeniu przed uruchomieniem, aby seria podobnych zdarzeń uruchomiła tylko jeden przepływ. Pozostaw puste, aby uruchamiać od razu.",
+  "workflows.triggers.hints.debounce": "Pierwsze pasujące zdarzenie uruchamia instancję natychmiast; kolejne zdarzenia dla tego samego rekordu w tym oknie czasowym (w milisekundach) są pomijane. Pozostaw puste, aby uruchamiać instancję dla każdego zdarzenia.",
   "workflows.triggers.hints.eventPattern": "Użyj * jako znaku wieloznacznego: \"sales.orders.*\" pasuje do dowolnego zdarzenia zamówienia",
   "workflows.triggers.hints.filterConditions": "Wyzwalaj tylko wtedy, gdy zawartość zdarzenia pasuje do tych warunków (wszystkie muszą pasować)",
   "workflows.triggers.hints.maxConcurrent": "Ogranicz liczbę instancji uruchomionych jednocześnie przez ten wyzwalacz; zdarzenia ponad limit są pomijane. Pozostaw puste, aby nie ograniczać.",