@open-mercato/core 0.7.1-develop.7130.1.fef2396fd8 → 0.7.1-develop.7135.1.19bf969756

package/src/modules/customers/api/tags/unassign/route.ts

@@ -15,6 +15,7 @@ import {
 } from '@open-mercato/shared/lib/crud/mutation-guard'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('customers')
 
@@ -108,6 +109,10 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('customers.tags.unassign failed', { err })
     return NextResponse.json({ error: translate('customers.errors.unassign_failed', 'Failed to unassign tag') }, { status: 400 })

package/src/modules/customers/api/todos/route.ts

@@ -37,6 +37,7 @@ import {
   resolveLegacyTodoDetails,
 } from '../../lib/todoCompatibility'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('customers')
 
@@ -439,6 +440,10 @@ export async function POST(request: Request): Promise<Response> {
     if (isCrudHttpError(err)) {
       return withAdapterHeaders(NextResponse.json(err.body, { status: err.status }))
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return withAdapterHeaders(NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status }))
+    }
     if (err instanceof z.ZodError) {
       return withAdapterHeaders(
         NextResponse.json({ error: 'Validation failed', details: err.issues }, { status: 400 }),
@@ -536,6 +541,10 @@ export async function PUT(request: Request): Promise<Response> {
     if (isCrudHttpError(err)) {
       return withAdapterHeaders(NextResponse.json(err.body, { status: err.status }))
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return withAdapterHeaders(NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status }))
+    }
     if (err instanceof z.ZodError) {
       return withAdapterHeaders(
         NextResponse.json({ error: 'Validation failed', details: err.issues }, { status: 400 }),
@@ -616,6 +625,10 @@ export async function DELETE(request: Request): Promise<Response> {
     if (isCrudHttpError(err)) {
       return withAdapterHeaders(NextResponse.json(err.body, { status: err.status }))
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return withAdapterHeaders(NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status }))
+    }
     if (err instanceof z.ZodError) {
       return withAdapterHeaders(
         NextResponse.json({ error: 'Validation failed', details: err.issues }, { status: 400 }),

package/src/modules/dictionaries/api/[dictionaryId]/entries/[entryId]/route.ts

@@ -22,6 +22,7 @@ import {
   updateDictionaryEntrySchema as updateEntryDocSchema,
 } from '../../../openapi'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('dictionaries').child({ component: 'entries-api' })
 const paramsSchema = z.object({
@@ -167,6 +168,10 @@ export async function PATCH(req: Request, ctx: { params?: { dictionaryId?: strin
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: 'Invalid input', details: err.issues }, { status: 400 })
     }
@@ -244,6 +249,10 @@ export async function DELETE(req: Request, ctx: { params?: { dictionaryId?: stri
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: 'Invalid input', details: err.issues }, { status: 400 })
     }

package/src/modules/dictionaries/api/[dictionaryId]/entries/reorder/route.ts

@@ -26,6 +26,7 @@ import {
 } from '../../../openapi'
 import { resolveDictionaryActorId } from '../../../context'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('dictionaries').child({ component: 'entries-api' })
 
@@ -130,6 +131,10 @@ export async function POST(req: Request, ctx: { params?: { dictionaryId?: string
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: 'Invalid input', details: err.issues }, { status: 400 })
     }

package/src/modules/dictionaries/api/[dictionaryId]/entries/route.ts

@@ -37,6 +37,7 @@ import {
   sortDictionaryEntries,
 } from '@open-mercato/core/modules/dictionaries/lib/entrySort'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('dictionaries').child({ component: 'entries-api' })
 
@@ -282,6 +283,10 @@ export async function POST(req: Request, ctx: { params?: { dictionaryId?: string
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: 'Invalid input', details: err.issues }, { status: 400 })
     }

package/src/modules/dictionaries/api/[dictionaryId]/entries/set-default/route.ts

@@ -26,6 +26,7 @@ import {
 } from '../../../openapi'
 import { resolveDictionaryActorId } from '../../../context'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('dictionaries').child({ component: 'entries-api' })
 
@@ -130,6 +131,10 @@ export async function POST(req: Request, ctx: { params?: { dictionaryId?: string
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (err instanceof z.ZodError) {
       return NextResponse.json({ error: 'Invalid input', details: err.issues }, { status: 400 })
     }

package/src/modules/directory/api/organization-branding/route.ts

@@ -19,6 +19,7 @@ import { organizationUpdateSchema } from '@open-mercato/core/modules/directory/d
 import { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'
 import '@open-mercato/core/modules/directory/commands/organizations'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('directory').child({ component: 'organization-branding' })
 
@@ -268,6 +269,10 @@ export async function PUT(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     logger.error('Organization branding update failed', { err })
     return NextResponse.json(
       { error: resolved.translate('directory.branding.errors.save', 'Failed to update organization branding.') },

package/src/modules/eudr/api/plots/import/route.ts

@@ -323,6 +323,13 @@ export async function POST(req: Request) {
     if (isCrudHttpError(error)) {
       return Response.json(error.body, { status: error.status })
     }
+    // No command-interceptor mapping here (issue #5097): every `commandBus.execute`
+    // in this route runs inside the per-item loop above, whose catch records the
+    // failure in `failed[]` and continues, so an interceptor rejection can never
+    // reach this handler. The batch contract — HTTP 200 with a per-item failure
+    // list — is deliberately unchanged; the route is listed in
+    // `ROUTES_WITH_BATCH_ITEM_ERROR_HANDLING` in
+    // `packages/core/src/__tests__/command-interceptor-http-coverage.test.ts`.
     const { translate } = await resolveTranslations()
     if (error instanceof z.ZodError) {
       return Response.json(

package/src/modules/eudr/api/product-mappings/suggestions/apply/route.ts

@@ -337,6 +337,13 @@ export async function POST(req: Request) {
     if (isCrudHttpError(error)) {
       return Response.json(error.body, { status: error.status })
     }
+    // No command-interceptor mapping here (issue #5097): every `commandBus.execute`
+    // in this route runs inside the per-item loop above, whose catch records the
+    // failure in `failed[]` and continues, so an interceptor rejection can never
+    // reach this handler. The batch contract — HTTP 200 with a per-item failure
+    // list — is deliberately unchanged; the route is listed in
+    // `ROUTES_WITH_BATCH_ITEM_ERROR_HANDLING` in
+    // `packages/core/src/__tests__/command-interceptor-http-coverage.test.ts`.
     const { translate } = await resolveTranslations()
     if (error instanceof z.ZodError) {
       return Response.json(

package/src/modules/feature_toggles/api/overrides/route.ts

@@ -25,6 +25,7 @@ import {
 } from '../openapi'
 import type { OpenApiRouteDoc, OpenApiMethodDoc } from '@open-mercato/shared/lib/openapi'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('feature_toggles').child({ component: 'overrides' })
 
@@ -186,6 +187,10 @@ export async function PUT(req: Request) {
     if (isCrudHttpError(error)) {
       return NextResponse.json(error.body, { status: error.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(error)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const message = error instanceof Error ? error.message : 'Unknown error'
     if (message === 'NOT_FOUND') return NextResponse.json({ error: 'Not found' }, { status: 404 })
     if (message === 'INVALID_STATE' || message === 'INVALID_TOGGLE_ID' || message === 'INVALID_TENANT_ID') {

package/src/modules/messages/api/[id]/actions/[actionId]/route.ts

@@ -6,6 +6,7 @@ import { resolveMessageContext } from '../../../../lib/routeHelpers'
 import { resolveUserFeatures, runMessageMutationGuardAfterSuccess, runMessageMutationGuards } from '../../../guards'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi/types'
 import { actionResultResponseSchema } from '../../../openapi'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['messages.actions'] },
@@ -95,6 +96,10 @@ export async function POST(
     if (isCrudHttpError(error)) {
       return Response.json(error.body, { status: error.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(error)
+    if (interceptorRejection) {
+      return Response.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (error instanceof Error) {
       if (error.message === 'Message not found') {
         return Response.json({ error: 'Message not found' }, { status: 404 })

package/src/modules/messages/api/[id]/conversation/archive/route.ts

@@ -7,6 +7,7 @@ import {
   conversationMutationResponseSchema,
   errorResponseSchema,
 } from '../../../openapi'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 export const metadata = {
   PUT: { requireAuth: true, requireFeatures: ['messages.view'] },
@@ -78,6 +79,10 @@ async function runConversationArchiveMutation(
     })
     return response
   } catch (error) {
+    const interceptorRejection = getCommandInterceptorHttpRejection(error)
+    if (interceptorRejection) {
+      return Response.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (error instanceof Error) {
       if (error.message === 'Message not found') {
         return Response.json({ error: error.message }, { status: 404 })

package/src/modules/messages/api/[id]/conversation/read/route.ts

@@ -7,6 +7,7 @@ import {
   conversationMutationResponseSchema,
   errorResponseSchema,
 } from '../../../openapi'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 export const metadata = {
   PUT: { requireAuth: true, requireFeatures: ['messages.view'] },
@@ -78,6 +79,10 @@ async function runConversationReadMutation(
     })
     return response
   } catch (error) {
+    const interceptorRejection = getCommandInterceptorHttpRejection(error)
+    if (interceptorRejection) {
+      return Response.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (error instanceof Error) {
       if (error.message === 'Message not found') {
         return Response.json({ error: error.message }, { status: 404 })

package/src/modules/messages/api/[id]/conversation/route.ts

@@ -7,6 +7,7 @@ import {
   conversationMutationResponseSchema,
   errorResponseSchema,
 } from '../../openapi'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 export const metadata = {
   DELETE: { requireAuth: true, requireFeatures: ['messages.view'] },
@@ -73,6 +74,10 @@ export async function DELETE(req: Request, { params }: { params: { id: string }
     })
     return response
   } catch (error) {
+    const interceptorRejection = getCommandInterceptorHttpRejection(error)
+    if (interceptorRejection) {
+      return Response.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (error instanceof Error) {
       if (error.message === 'Message not found') {
         return Response.json({ error: error.message }, { status: 404 })

package/src/modules/messages/api/[id]/forward/route.ts

@@ -6,6 +6,7 @@ import { resolveUserFeatures, runMessageMutationGuardAfterSuccess, runMessageMut
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi/types'
 import { forwardResponseSchema, forwardMessageSchema as forwardSchema } from '../../openapi'
 import { MessageCommandExecuteResult } from '../../../commands/shared'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['messages.compose'] },
@@ -62,6 +63,10 @@ export async function POST(req: Request, { params }: { params: { id: string } })
       },
     })
   } catch (error) {
+    const interceptorRejection = getCommandInterceptorHttpRejection(error)
+    if (interceptorRejection) {
+      return Response.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (error instanceof Error) {
       if (error.message === 'Message not found') {
         return Response.json({ error: 'Message not found' }, { status: 404 })

package/src/modules/messages/api/[id]/reply/route.ts

@@ -10,6 +10,7 @@ import {
   replyMessageSchema as replyOpenApiSchema,
 } from '../../openapi'
 import { MessageCommandExecuteResult } from '../../../commands/shared'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['messages.compose'] },
@@ -66,6 +67,10 @@ export async function POST(req: Request, { params }: { params: { id: string } })
       },
     })
   } catch (error) {
+    const interceptorRejection = getCommandInterceptorHttpRejection(error)
+    if (interceptorRejection) {
+      return Response.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (error instanceof Error) {
       if (error.message === 'Message not found') {
         return Response.json({ error: 'Message not found' }, { status: 404 })

package/src/modules/messages/api/[id]/route.ts

@@ -22,6 +22,7 @@ import {
   updateDraftSchema as updateDraftOpenApiSchema,
 } from '../openapi'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('messages').child({ component: 'api' })
 
@@ -421,6 +422,10 @@ export async function PATCH(req: Request, { params }: { params: { id: string } }
     if (isCrudHttpError(error)) {
       return Response.json(error.body, { status: error.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(error)
+    if (interceptorRejection) {
+      return Response.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (error instanceof Error) {
       if (error.message === 'Message type cannot be created by users') {
         return Response.json({ error: error.message }, { status: 400 })
@@ -546,6 +551,10 @@ export async function DELETE(req: Request, { params }: { params: { id: string }
     if (isCrudHttpError(error)) {
       return Response.json(error.body, { status: error.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(error)
+    if (interceptorRejection) {
+      return Response.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     if (error instanceof Error && error.message === 'Access denied') {
       return Response.json({ error: 'Access denied' }, { status: 403 })
     }

package/src/modules/messages/api/token/[token]/route.ts

@@ -8,6 +8,7 @@ import { Message, MessageAccessToken, MessageObject, MessageRecipient } from '..
 import { MAX_TOKEN_USE_COUNT } from '../../../commands/tokens'
 import { messageTokenResponseSchema } from '../../openapi'
 import { hashAuthToken } from '../../../../auth/lib/tokenHash'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 export const metadata = {
   GET: { requireAuth: false },
@@ -134,6 +135,10 @@ export async function GET(req: Request, { params }: { params: { token: string }
     })
     commandResult = executed.result
   } catch (error) {
+    const interceptorRejection = getCommandInterceptorHttpRejection(error)
+    if (interceptorRejection) {
+      return Response.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const errorResponse = responseForTokenError(error)
     if (errorResponse) return errorResponse
     throw error

package/src/modules/resources/api/resources/tags/assign/route.ts

@@ -18,6 +18,7 @@ import {
   type ResourcesResourceTagAssignmentInput,
 } from '../../../../data/validators'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('resources').child({ component: 'tags' })
 
@@ -112,6 +113,10 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('Tag assign failed', { err })
     return NextResponse.json({ error: translate('resources.resources.tags.updateError', 'Failed to update tags.') }, { status: 400 })

package/src/modules/resources/api/resources/tags/unassign/route.ts

@@ -18,6 +18,7 @@ import {
   type ResourcesResourceTagAssignmentInput,
 } from '../../../../data/validators'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('resources').child({ component: 'tags' })
 
@@ -112,6 +113,10 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('Tag unassign failed', { err })
     return NextResponse.json({ error: translate('resources.resources.tags.updateError', 'Failed to update tags.') }, { status: 400 })

package/src/modules/sales/api/quotes/accept/route.ts

@@ -21,6 +21,7 @@ import { resolveStatusEntryIdByValue } from '../../../lib/statusHelpers'
 import { resolveEffectiveTenantId } from '../../../lib/publicQuoteTenantScope'
 import { QuoteAcceptedAdminEmail } from '../../../emails/QuoteAcceptedAdminEmail'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('sales')
 
@@ -179,6 +180,10 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('sales.quotes.accept failed', { err })
     return NextResponse.json({ error: translate('sales.quotes.accept.failed', 'Failed to accept quote.') }, { status: 400 })

package/src/modules/sales/api/quotes/convert/route.ts

@@ -16,6 +16,7 @@ import {
 } from '@open-mercato/shared/lib/crud/mutation-guard-registry'
 import { withScopedPayload } from '../../utils'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('sales')
 
@@ -175,6 +176,10 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('sales.quotes.convert failed', { err })
     return NextResponse.json(

package/src/modules/sales/api/settings/document-numbers/route.ts

@@ -19,6 +19,7 @@ import {
   validateCrudMutationGuard,
 } from '@open-mercato/shared/lib/crud/mutation-guard'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('sales')
 
@@ -160,6 +161,10 @@ export async function PUT(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('sales.settings.document-numbers.put failed', { err })
     return NextResponse.json(

package/src/modules/sales/api/settings/order-editing/route.ts

@@ -20,6 +20,7 @@ import {
 import { ensureSalesDictionary } from '../../../lib/dictionaries'
 import { DictionaryEntry } from '@open-mercato/core/modules/dictionaries/data/entities'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('sales')
 
@@ -179,6 +180,10 @@ export async function PUT(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('sales.settings.order-editing.put failed', { err })
     return NextResponse.json(

package/src/modules/staff/api/leave-requests/accept/route.ts

@@ -16,6 +16,7 @@ import {
   runStaffMutationGuards,
 } from '../../guards'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('staff')
 
@@ -112,6 +113,10 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('staff.leave-requests.accept failed', { err })
     return NextResponse.json({ error: translate('staff.leaveRequests.errors.accept', 'Failed to approve leave request.') }, { status: 400 })

package/src/modules/staff/api/leave-requests/reject/route.ts

@@ -16,6 +16,7 @@ import {
   runStaffMutationGuards,
 } from '../../guards'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('staff')
 
@@ -112,6 +113,10 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('staff.leave-requests.reject failed', { err })
     return NextResponse.json({ error: translate('staff.leaveRequests.errors.reject', 'Failed to reject leave request.') }, { status: 400 })

package/src/modules/staff/api/team-members/self/route.ts

@@ -22,6 +22,7 @@ import {
   runStaffMutationGuards,
 } from '../../guards'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('staff')
 
@@ -185,6 +186,10 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('staff.teamMembers.self.create failed', { err })
     return NextResponse.json({ error: translate('staff.teamMembers.form.errors.create', 'Failed to create team member.') }, { status: 400 })

package/src/modules/staff/api/team-members/tags/assign/route.ts

@@ -19,6 +19,7 @@ import {
   runStaffMutationGuards,
 } from '../../../guards'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('staff')
 
@@ -115,6 +116,10 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('staff.teamMembers.tags.assign failed', { err })
     return NextResponse.json({ error: translate('staff.teamMembers.tags.updateError', 'Failed to update tags.') }, { status: 400 })

package/src/modules/staff/api/team-members/tags/unassign/route.ts

@@ -19,6 +19,7 @@ import {
   runStaffMutationGuards,
 } from '../../../guards'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('staff')
 
@@ -115,6 +116,10 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('staff.teamMembers.tags.unassign failed', { err })
     return NextResponse.json({ error: translate('staff.teamMembers.tags.updateError', 'Failed to update tags.') }, { status: 400 })

package/src/modules/staff/api/timesheets/time-entries/start-timer/route.ts

@@ -11,6 +11,7 @@ import { parseScopedCommandInput } from '@open-mercato/shared/lib/api/scoped'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { staffTimeEntryStartTimerSchema, type StaffTimeEntryStartTimerInput } from '../../../../data/validators'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getCommandInterceptorHttpRejection } from '@open-mercato/shared/lib/commands/errors'
 
 const logger = createLogger('staff')
 
@@ -67,6 +68,10 @@ export async function POST(req: Request) {
     if (isCrudHttpError(err)) {
       return NextResponse.json(err.body, { status: err.status })
     }
+    const interceptorRejection = getCommandInterceptorHttpRejection(err)
+    if (interceptorRejection) {
+      return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })
+    }
     const { translate } = await resolveTranslations()
     logger.error('staff.timesheets.time-entries.start-timer failed', { err })
     return NextResponse.json(