@open-mercato/core 0.6.6-develop.6431.1.g1037269810 → 0.6.6-develop.6450.1.b493fb430c

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
-[build:core] found 3455 entry points
+[build:core] found 3456 entry points
 [build:core] built successfully
 [build:core:generated] found 186 entry points
 [build:core:generated] built successfully

package/dist/modules/planner/commands/shared.js

@@ -1,12 +1,5 @@
-import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
-import { ensureOrganizationScope } from "@open-mercato/shared/lib/commands/scope";
+import { ensureOrganizationScope, ensureTenantScope } from "@open-mercato/shared/lib/commands/scope";
 import { extractUndoPayload } from "@open-mercato/shared/lib/commands/undo";
-function ensureTenantScope(ctx, tenantId) {
-  const currentTenant = ctx.auth?.tenantId ?? null;
-  if (currentTenant && currentTenant !== tenantId) {
-    throw new CrudHttpError(403, { error: "Forbidden" });
-  }
-}
 export {
   ensureOrganizationScope,
   ensureTenantScope,

package/dist/modules/planner/commands/shared.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/planner/commands/shared.ts"],
-  "sourcesContent": ["import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { ensureOrganizationScope } from '@open-mercato/shared/lib/commands/scope'\nimport { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'\n\nexport function ensureTenantScope(ctx: CommandRuntimeContext, tenantId: string): void {\n  const currentTenant = ctx.auth?.tenantId ?? null\n  if (currentTenant && currentTenant !== tenantId) {\n    throw new CrudHttpError(403, { error: 'Forbidden' })\n  }\n}\n\nexport { ensureOrganizationScope, extractUndoPayload }\n"],
-  "mappings": "AACA,SAAS,qBAAqB;AAC9B,SAAS,+BAA+B;AACxC,SAAS,0BAA0B;AAE5B,SAAS,kBAAkB,KAA4B,UAAwB;AACpF,QAAM,gBAAgB,IAAI,MAAM,YAAY;AAC5C,MAAI,iBAAiB,kBAAkB,UAAU;AAC/C,UAAM,IAAI,cAAc,KAAK,EAAE,OAAO,YAAY,CAAC;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import { ensureOrganizationScope, ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'\nimport { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'\n\nexport { ensureOrganizationScope, ensureTenantScope, extractUndoPayload }\n"],
+  "mappings": "AAAA,SAAS,yBAAyB,yBAAyB;AAC3D,SAAS,0BAA0B;",
   "names": []
 }

package/dist/modules/resources/commands/shared.js

@@ -1,13 +1,7 @@
 import { CrudHttpError } from "@open-mercato/shared/lib/crud/errors";
-import { ensureOrganizationScope } from "@open-mercato/shared/lib/commands/scope";
+import { ensureOrganizationScope, ensureTenantScope } from "@open-mercato/shared/lib/commands/scope";
 import { extractUndoPayload } from "@open-mercato/shared/lib/commands/undo";
 import { ResourcesResource } from "../data/entities.js";
-function ensureTenantScope(ctx, tenantId) {
-  const currentTenant = ctx.auth?.tenantId ?? null;
-  if (currentTenant && currentTenant !== tenantId) {
-    throw new CrudHttpError(403, { error: "Forbidden" });
-  }
-}
 async function requireResource(em, resourceId, message = "Resource not found") {
   const resource = await em.findOne(ResourcesResource, { id: resourceId });
   if (!resource) throw new CrudHttpError(404, { error: message });

package/dist/modules/resources/commands/shared.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/resources/commands/shared.ts"],
-  "sourcesContent": ["import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { ensureOrganizationScope } from '@open-mercato/shared/lib/commands/scope'\nimport { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { ResourcesResource } from '../data/entities'\n\nexport function ensureTenantScope(ctx: CommandRuntimeContext, tenantId: string): void {\n  const currentTenant = ctx.auth?.tenantId ?? null\n  if (currentTenant && currentTenant !== tenantId) {\n    throw new CrudHttpError(403, { error: 'Forbidden' })\n  }\n}\n\nexport { ensureOrganizationScope, extractUndoPayload }\n\nexport async function requireResource(\n  em: EntityManager,\n  resourceId: string,\n  message = 'Resource not found',\n): Promise<ResourcesResource> {\n  const resource = await em.findOne(ResourcesResource, { id: resourceId })\n  if (!resource) throw new CrudHttpError(404, { error: message })\n  return resource\n}\n"],
-  "mappings": "AACA,SAAS,qBAAqB;AAC9B,SAAS,+BAA+B;AACxC,SAAS,0BAA0B;AAEnC,SAAS,yBAAyB;AAE3B,SAAS,kBAAkB,KAA4B,UAAwB;AACpF,QAAM,gBAAgB,IAAI,MAAM,YAAY;AAC5C,MAAI,iBAAiB,kBAAkB,UAAU;AAC/C,UAAM,IAAI,cAAc,KAAK,EAAE,OAAO,YAAY,CAAC;AAAA,EACrD;AACF;AAIA,eAAsB,gBACpB,IACA,YACA,UAAU,sBACkB;AAC5B,QAAM,WAAW,MAAM,GAAG,QAAQ,mBAAmB,EAAE,IAAI,WAAW,CAAC;AACvE,MAAI,CAAC,SAAU,OAAM,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAC9D,SAAO;AACT;",
+  "sourcesContent": ["import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { ensureOrganizationScope, ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'\nimport { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { ResourcesResource } from '../data/entities'\n\nexport { ensureOrganizationScope, ensureTenantScope, extractUndoPayload }\n\nexport async function requireResource(\n  em: EntityManager,\n  resourceId: string,\n  message = 'Resource not found',\n): Promise<ResourcesResource> {\n  const resource = await em.findOne(ResourcesResource, { id: resourceId })\n  if (!resource) throw new CrudHttpError(404, { error: message })\n  return resource\n}\n"],
+  "mappings": "AAAA,SAAS,qBAAqB;AAC9B,SAAS,yBAAyB,yBAAyB;AAC3D,SAAS,0BAA0B;AAEnC,SAAS,yBAAyB;AAIlC,eAAsB,gBACpB,IACA,YACA,UAAU,sBACkB;AAC5B,QAAM,WAAW,MAAM,GAAG,QAAQ,mBAAmB,EAAE,IAAI,WAAW,CAAC;AACvE,MAAI,CAAC,SAAU,OAAM,IAAI,cAAc,KAAK,EAAE,OAAO,QAAQ,CAAC;AAC9D,SAAO;AACT;",
   "names": []
 }

package/dist/modules/shipping_carriers/api/cancel/route.js

@@ -7,6 +7,7 @@ import {
   validateCrudMutationGuard
 } from "@open-mercato/shared/lib/crud/mutation-guard";
 import { isShipmentCancelNotAllowedError } from "../../lib/status-sync.js";
+import { shippingCarrierUpstreamErrorResponse } from "../../lib/upstream-error-response.js";
 import { cancelShipmentSchema } from "../../data/validators.js";
 import { shippingCarriersTag } from "../openapi.js";
 function resolveGuardUserId(auth) {
@@ -70,8 +71,7 @@ async function POST(req) {
     if (isShipmentCancelNotAllowedError(error)) {
       return NextResponse.json({ error: error.message }, { status: 422 });
     }
-    const message = error instanceof Error ? error.message : "Failed to cancel shipment";
-    return NextResponse.json({ error: message }, { status: 502 });
+    return shippingCarrierUpstreamErrorResponse("cancel.post", error);
   }
 }
 const openApi = {

package/dist/modules/shipping_carriers/api/cancel/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/shipping_carriers/api/cancel/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport {\n  runCrudMutationGuardAfterSuccess,\n  validateCrudMutationGuard,\n} from '@open-mercato/shared/lib/crud/mutation-guard'\nimport type { ShippingCarrierService } from '../../lib/shipping-service'\nimport { isShipmentCancelNotAllowedError } from '../../lib/status-sync'\nimport { cancelShipmentSchema } from '../../data/validators'\nimport { shippingCarriersTag } from '../openapi'\n\nfunction resolveGuardUserId(auth: {\n  sub?: string | null\n  userId?: string | null\n  keyId?: string | null\n}): string {\n  if (typeof auth.sub === 'string' && auth.sub.trim().length > 0) return auth.sub\n  if (typeof auth.userId === 'string' && auth.userId.trim().length > 0) return auth.userId\n  if (typeof auth.keyId === 'string' && auth.keyId.trim().length > 0) return auth.keyId\n  return 'system'\n}\n\nexport const metadata = {\n  path: '/shipping-carriers/cancel',\n  POST: { requireAuth: true, requireFeatures: ['shipping_carriers.manage'] },\n}\n\nexport async function POST(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const payload = await readJsonSafe<unknown>(req)\n  const parsed = cancelShipmentSchema.safeParse(payload)\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid payload', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const guardUserId = resolveGuardUserId(auth)\n  const guardResult = await validateCrudMutationGuard(container, {\n    tenantId: auth.tenantId,\n    organizationId: auth.orgId,\n    userId: guardUserId,\n    resourceKind: 'shipping_carriers.shipment',\n    resourceId: parsed.data.shipmentId,\n    operation: 'custom',\n    requestMethod: req.method,\n    requestHeaders: req.headers,\n    mutationPayload: parsed.data as Record<string, unknown>,\n  })\n  if (guardResult && !guardResult.ok) {\n    return NextResponse.json(guardResult.body, { status: guardResult.status })\n  }\n\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const result = await service.cancelShipment({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n\n    if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {\n      await runCrudMutationGuardAfterSuccess(container, {\n        tenantId: auth.tenantId,\n        organizationId: auth.orgId,\n        userId: guardUserId,\n        resourceKind: 'shipping_carriers.shipment',\n        resourceId: parsed.data.shipmentId,\n        operation: 'custom',\n        requestMethod: req.method,\n        requestHeaders: req.headers,\n        metadata: guardResult.metadata ?? null,\n      })\n    }\n\n    return NextResponse.json(result)\n  } catch (error: unknown) {\n    if (isShipmentCancelNotAllowedError(error)) {\n      return NextResponse.json({ error: error.message }, { status: 422 })\n    }\n    const message = error instanceof Error ? error.message : 'Failed to cancel shipment'\n    return NextResponse.json({ error: message }, { status: 502 })\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Cancel shipment',\n  methods: {\n    POST: {\n      summary: 'Cancel shipment',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 200, description: 'Shipment cancelled' },\n        { status: 422, description: 'Validation failed or shipment cannot be cancelled in its current status' },\n        { status: 502, description: 'Provider upstream error' },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport {\n  runCrudMutationGuardAfterSuccess,\n  validateCrudMutationGuard,\n} from '@open-mercato/shared/lib/crud/mutation-guard'\nimport type { ShippingCarrierService } from '../../lib/shipping-service'\nimport { isShipmentCancelNotAllowedError } from '../../lib/status-sync'\nimport { shippingCarrierUpstreamErrorResponse } from '../../lib/upstream-error-response'\nimport { cancelShipmentSchema } from '../../data/validators'\nimport { shippingCarriersTag } from '../openapi'\n\nfunction resolveGuardUserId(auth: {\n  sub?: string | null\n  userId?: string | null\n  keyId?: string | null\n}): string {\n  if (typeof auth.sub === 'string' && auth.sub.trim().length > 0) return auth.sub\n  if (typeof auth.userId === 'string' && auth.userId.trim().length > 0) return auth.userId\n  if (typeof auth.keyId === 'string' && auth.keyId.trim().length > 0) return auth.keyId\n  return 'system'\n}\n\nexport const metadata = {\n  path: '/shipping-carriers/cancel',\n  POST: { requireAuth: true, requireFeatures: ['shipping_carriers.manage'] },\n}\n\nexport async function POST(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const payload = await readJsonSafe<unknown>(req)\n  const parsed = cancelShipmentSchema.safeParse(payload)\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid payload', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const guardUserId = resolveGuardUserId(auth)\n  const guardResult = await validateCrudMutationGuard(container, {\n    tenantId: auth.tenantId,\n    organizationId: auth.orgId,\n    userId: guardUserId,\n    resourceKind: 'shipping_carriers.shipment',\n    resourceId: parsed.data.shipmentId,\n    operation: 'custom',\n    requestMethod: req.method,\n    requestHeaders: req.headers,\n    mutationPayload: parsed.data as Record<string, unknown>,\n  })\n  if (guardResult && !guardResult.ok) {\n    return NextResponse.json(guardResult.body, { status: guardResult.status })\n  }\n\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const result = await service.cancelShipment({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n\n    if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {\n      await runCrudMutationGuardAfterSuccess(container, {\n        tenantId: auth.tenantId,\n        organizationId: auth.orgId,\n        userId: guardUserId,\n        resourceKind: 'shipping_carriers.shipment',\n        resourceId: parsed.data.shipmentId,\n        operation: 'custom',\n        requestMethod: req.method,\n        requestHeaders: req.headers,\n        metadata: guardResult.metadata ?? null,\n      })\n    }\n\n    return NextResponse.json(result)\n  } catch (error: unknown) {\n    if (isShipmentCancelNotAllowedError(error)) {\n      return NextResponse.json({ error: error.message }, { status: 422 })\n    }\n    return shippingCarrierUpstreamErrorResponse('cancel.post', error)\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Cancel shipment',\n  methods: {\n    POST: {\n      summary: 'Cancel shipment',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 200, description: 'Shipment cancelled' },\n        { status: 422, description: 'Validation failed or shipment cannot be cancelled in its current status' },\n        { status: 502, description: 'Provider upstream error' },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/shipping_carriers/api/points/route.js

@@ -1,6 +1,7 @@
 import { NextResponse } from "next/server";
 import { getAuthFromRequest } from "@open-mercato/shared/lib/auth/server";
 import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
+import { shippingCarrierUpstreamErrorResponse } from "../../lib/upstream-error-response.js";
 import { searchDropOffPointsQuerySchema } from "../../data/validators.js";
 import { shippingCarriersTag } from "../openapi.js";
 const metadata = {
@@ -32,8 +33,7 @@ async function GET(req) {
     });
     return NextResponse.json({ points });
   } catch (error) {
-    const message = error instanceof Error ? error.message : "Failed to search drop-off points";
-    return NextResponse.json({ error: message }, { status: 502 });
+    return shippingCarrierUpstreamErrorResponse("points.search", error);
   }
 }
 const openApi = {

package/dist/modules/shipping_carriers/api/points/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/shipping_carriers/api/points/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport type { ShippingCarrierService } from '../../lib/shipping-service'\nimport { searchDropOffPointsQuerySchema } from '../../data/validators'\nimport { shippingCarriersTag } from '../openapi'\n\nexport const metadata = {\n  path: '/shipping-carriers/points',\n  GET: { requireAuth: true, requireFeatures: ['shipping_carriers.view'] },\n}\n\nexport async function GET(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const url = new URL(req.url)\n  const parsed = searchDropOffPointsQuerySchema.safeParse({\n    providerKey: url.searchParams.get('providerKey'),\n    query: url.searchParams.get('query') ?? undefined,\n    type: url.searchParams.get('type') ?? undefined,\n    postCode: url.searchParams.get('postCode') ?? undefined,\n  })\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid query', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const points = await service.searchDropOffPoints({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n    return NextResponse.json({ points })\n  } catch (error: unknown) {\n    const message = error instanceof Error ? error.message : 'Failed to search drop-off points'\n    return NextResponse.json({ error: message }, { status: 502 })\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Search drop-off points',\n  methods: {\n    GET: {\n      summary: 'Search carrier drop-off points (lockers, POP points)',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 200, description: 'Points returned' },\n        { status: 422, description: 'Validation failed' },\n        { status: 502, description: 'Provider upstream error or unsupported' },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AAEvC,SAAS,sCAAsC;AAC/C,SAAS,2BAA2B;AAE7B,MAAM,WAAW;AAAA,EACtB,MAAM;AAAA,EACN,KAAK,EAAE,aAAa,MAAM,iBAAiB,CAAC,wBAAwB,EAAE;AACxE;AAEA,eAAsB,IAAI,KAAc;AACtC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,YAAY,CAAC,KAAK,OAAO;AAClC,WAAO,aAAa,KAAK,EAAE,OAAO,eAAe,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACrE;AACA,QAAM,MAAM,IAAI,IAAI,IAAI,GAAG;AAC3B,QAAM,SAAS,+BAA+B,UAAU;AAAA,IACtD,aAAa,IAAI,aAAa,IAAI,aAAa;AAAA,IAC/C,OAAO,IAAI,aAAa,IAAI,OAAO,KAAK;AAAA,IACxC,MAAM,IAAI,aAAa,IAAI,MAAM,KAAK;AAAA,IACtC,UAAU,IAAI,aAAa,IAAI,UAAU,KAAK;AAAA,EAChD,CAAC;AACD,MAAI,CAAC,OAAO,SAAS;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,iBAAiB,SAAS,OAAO,MAAM,QAAQ,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACvG;AACA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,UAAU,UAAU,QAAQ,wBAAwB;AAC1D,MAAI;AACF,UAAM,SAAS,MAAM,QAAQ,oBAAoB;AAAA,MAC/C,GAAG,OAAO;AAAA,MACV,gBAAgB,KAAK;AAAA,MACrB,UAAU,KAAK;AAAA,IACjB,CAAC;AACD,WAAO,aAAa,KAAK,EAAE,OAAO,CAAC;AAAA,EACrC,SAAS,OAAgB;AACvB,UAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU;AACzD,WAAO,aAAa,KAAK,EAAE,OAAO,QAAQ,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC9D;AACF;AAEO,MAAM,UAAU;AAAA,EACrB,MAAM,CAAC,mBAAmB;AAAA,EAC1B,SAAS;AAAA,EACT,SAAS;AAAA,IACP,KAAK;AAAA,MACH,SAAS;AAAA,MACT,MAAM,CAAC,mBAAmB;AAAA,MAC1B,WAAW;AAAA,QACT,EAAE,QAAQ,KAAK,aAAa,kBAAkB;AAAA,QAC9C,EAAE,QAAQ,KAAK,aAAa,oBAAoB;AAAA,QAChD,EAAE,QAAQ,KAAK,aAAa,yCAAyC;AAAA,MACvE;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport type { ShippingCarrierService } from '../../lib/shipping-service'\nimport { shippingCarrierUpstreamErrorResponse } from '../../lib/upstream-error-response'\nimport { searchDropOffPointsQuerySchema } from '../../data/validators'\nimport { shippingCarriersTag } from '../openapi'\n\nexport const metadata = {\n  path: '/shipping-carriers/points',\n  GET: { requireAuth: true, requireFeatures: ['shipping_carriers.view'] },\n}\n\nexport async function GET(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const url = new URL(req.url)\n  const parsed = searchDropOffPointsQuerySchema.safeParse({\n    providerKey: url.searchParams.get('providerKey'),\n    query: url.searchParams.get('query') ?? undefined,\n    type: url.searchParams.get('type') ?? undefined,\n    postCode: url.searchParams.get('postCode') ?? undefined,\n  })\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid query', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const points = await service.searchDropOffPoints({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n    return NextResponse.json({ points })\n  } catch (error: unknown) {\n    return shippingCarrierUpstreamErrorResponse('points.search', error)\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Search drop-off points',\n  methods: {\n    GET: {\n      summary: 'Search carrier drop-off points (lockers, POP points)',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 200, description: 'Points returned' },\n        { status: 422, description: 'Validation failed' },\n        { status: 502, description: 'Provider upstream error or unsupported' },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AAEvC,SAAS,4CAA4C;AACrD,SAAS,sCAAsC;AAC/C,SAAS,2BAA2B;AAE7B,MAAM,WAAW;AAAA,EACtB,MAAM;AAAA,EACN,KAAK,EAAE,aAAa,MAAM,iBAAiB,CAAC,wBAAwB,EAAE;AACxE;AAEA,eAAsB,IAAI,KAAc;AACtC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,YAAY,CAAC,KAAK,OAAO;AAClC,WAAO,aAAa,KAAK,EAAE,OAAO,eAAe,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACrE;AACA,QAAM,MAAM,IAAI,IAAI,IAAI,GAAG;AAC3B,QAAM,SAAS,+BAA+B,UAAU;AAAA,IACtD,aAAa,IAAI,aAAa,IAAI,aAAa;AAAA,IAC/C,OAAO,IAAI,aAAa,IAAI,OAAO,KAAK;AAAA,IACxC,MAAM,IAAI,aAAa,IAAI,MAAM,KAAK;AAAA,IACtC,UAAU,IAAI,aAAa,IAAI,UAAU,KAAK;AAAA,EAChD,CAAC;AACD,MAAI,CAAC,OAAO,SAAS;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,iBAAiB,SAAS,OAAO,MAAM,QAAQ,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACvG;AACA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,UAAU,UAAU,QAAQ,wBAAwB;AAC1D,MAAI;AACF,UAAM,SAAS,MAAM,QAAQ,oBAAoB;AAAA,MAC/C,GAAG,OAAO;AAAA,MACV,gBAAgB,KAAK;AAAA,MACrB,UAAU,KAAK;AAAA,IACjB,CAAC;AACD,WAAO,aAAa,KAAK,EAAE,OAAO,CAAC;AAAA,EACrC,SAAS,OAAgB;AACvB,WAAO,qCAAqC,iBAAiB,KAAK;AAAA,EACpE;AACF;AAEO,MAAM,UAAU;AAAA,EACrB,MAAM,CAAC,mBAAmB;AAAA,EAC1B,SAAS;AAAA,EACT,SAAS;AAAA,IACP,KAAK;AAAA,MACH,SAAS;AAAA,MACT,MAAM,CAAC,mBAAmB;AAAA,MAC1B,WAAW;AAAA,QACT,EAAE,QAAQ,KAAK,aAAa,kBAAkB;AAAA,QAC9C,EAAE,QAAQ,KAAK,aAAa,oBAAoB;AAAA,QAChD,EAAE,QAAQ,KAAK,aAAa,yCAAyC;AAAA,MACvE;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/modules/shipping_carriers/api/rates/route.js

@@ -2,6 +2,7 @@ import { NextResponse } from "next/server";
 import { getAuthFromRequest } from "@open-mercato/shared/lib/auth/server";
 import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
 import { readJsonSafe } from "@open-mercato/shared/lib/http/readJsonSafe";
+import { shippingCarrierUpstreamErrorResponse } from "../../lib/upstream-error-response.js";
 import { calculateRatesSchema } from "../../data/validators.js";
 import { shippingCarriersTag } from "../openapi.js";
 const metadata = {
@@ -28,8 +29,7 @@ async function POST(req) {
     });
     return NextResponse.json({ rates });
   } catch (error) {
-    const message = error instanceof Error ? error.message : "Failed to calculate rates";
-    return NextResponse.json({ error: message }, { status: 502 });
+    return shippingCarrierUpstreamErrorResponse("rates.calculate", error);
   }
 }
 const openApi = {

package/dist/modules/shipping_carriers/api/rates/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/shipping_carriers/api/rates/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport type { ShippingCarrierService } from '../../lib/shipping-service'\nimport { calculateRatesSchema } from '../../data/validators'\nimport { shippingCarriersTag } from '../openapi'\n\nexport const metadata = {\n  path: '/shipping-carriers/rates',\n  POST: { requireAuth: true, requireFeatures: ['shipping_carriers.manage'] },\n}\n\nexport async function POST(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const payload = await readJsonSafe<unknown>(req)\n  const parsed = calculateRatesSchema.safeParse(payload)\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid payload', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const rates = await service.calculateRates({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n    return NextResponse.json({ rates })\n  } catch (error: unknown) {\n    const message = error instanceof Error ? error.message : 'Failed to calculate rates'\n    return NextResponse.json({ error: message }, { status: 502 })\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Calculate shipping rates',\n  methods: {\n    POST: {\n      summary: 'Calculate shipping rates',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 200, description: 'Rates calculated' },\n        { status: 422, description: 'Validation failed' },\n        { status: 502, description: 'Provider upstream error' },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AACvC,SAAS,oBAAoB;AAE7B,SAAS,4BAA4B;AACrC,SAAS,2BAA2B;AAE7B,MAAM,WAAW;AAAA,EACtB,MAAM;AAAA,EACN,MAAM,EAAE,aAAa,MAAM,iBAAiB,CAAC,0BAA0B,EAAE;AAC3E;AAEA,eAAsB,KAAK,KAAc;AACvC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,YAAY,CAAC,KAAK,OAAO;AAClC,WAAO,aAAa,KAAK,EAAE,OAAO,eAAe,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACrE;AACA,QAAM,UAAU,MAAM,aAAsB,GAAG;AAC/C,QAAM,SAAS,qBAAqB,UAAU,OAAO;AACrD,MAAI,CAAC,OAAO,SAAS;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,mBAAmB,SAAS,OAAO,MAAM,QAAQ,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACzG;AACA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,UAAU,UAAU,QAAQ,wBAAwB;AAC1D,MAAI;AACF,UAAM,QAAQ,MAAM,QAAQ,eAAe;AAAA,MACzC,GAAG,OAAO;AAAA,MACV,gBAAgB,KAAK;AAAA,MACrB,UAAU,KAAK;AAAA,IACjB,CAAC;AACD,WAAO,aAAa,KAAK,EAAE,MAAM,CAAC;AAAA,EACpC,SAAS,OAAgB;AACvB,UAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU;AACzD,WAAO,aAAa,KAAK,EAAE,OAAO,QAAQ,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC9D;AACF;AAEO,MAAM,UAAU;AAAA,EACrB,MAAM,CAAC,mBAAmB;AAAA,EAC1B,SAAS;AAAA,EACT,SAAS;AAAA,IACP,MAAM;AAAA,MACJ,SAAS;AAAA,MACT,MAAM,CAAC,mBAAmB;AAAA,MAC1B,WAAW;AAAA,QACT,EAAE,QAAQ,KAAK,aAAa,mBAAmB;AAAA,QAC/C,EAAE,QAAQ,KAAK,aAAa,oBAAoB;AAAA,QAChD,EAAE,QAAQ,KAAK,aAAa,0BAA0B;AAAA,MACxD;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport type { ShippingCarrierService } from '../../lib/shipping-service'\nimport { shippingCarrierUpstreamErrorResponse } from '../../lib/upstream-error-response'\nimport { calculateRatesSchema } from '../../data/validators'\nimport { shippingCarriersTag } from '../openapi'\n\nexport const metadata = {\n  path: '/shipping-carriers/rates',\n  POST: { requireAuth: true, requireFeatures: ['shipping_carriers.manage'] },\n}\n\nexport async function POST(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const payload = await readJsonSafe<unknown>(req)\n  const parsed = calculateRatesSchema.safeParse(payload)\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid payload', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const rates = await service.calculateRates({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n    return NextResponse.json({ rates })\n  } catch (error: unknown) {\n    return shippingCarrierUpstreamErrorResponse('rates.calculate', error)\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Calculate shipping rates',\n  methods: {\n    POST: {\n      summary: 'Calculate shipping rates',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 200, description: 'Rates calculated' },\n        { status: 422, description: 'Validation failed' },\n        { status: 502, description: 'Provider upstream error' },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AACvC,SAAS,oBAAoB;AAE7B,SAAS,4CAA4C;AACrD,SAAS,4BAA4B;AACrC,SAAS,2BAA2B;AAE7B,MAAM,WAAW;AAAA,EACtB,MAAM;AAAA,EACN,MAAM,EAAE,aAAa,MAAM,iBAAiB,CAAC,0BAA0B,EAAE;AAC3E;AAEA,eAAsB,KAAK,KAAc;AACvC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,YAAY,CAAC,KAAK,OAAO;AAClC,WAAO,aAAa,KAAK,EAAE,OAAO,eAAe,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACrE;AACA,QAAM,UAAU,MAAM,aAAsB,GAAG;AAC/C,QAAM,SAAS,qBAAqB,UAAU,OAAO;AACrD,MAAI,CAAC,OAAO,SAAS;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,mBAAmB,SAAS,OAAO,MAAM,QAAQ,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACzG;AACA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,UAAU,UAAU,QAAQ,wBAAwB;AAC1D,MAAI;AACF,UAAM,QAAQ,MAAM,QAAQ,eAAe;AAAA,MACzC,GAAG,OAAO;AAAA,MACV,gBAAgB,KAAK;AAAA,MACrB,UAAU,KAAK;AAAA,IACjB,CAAC;AACD,WAAO,aAAa,KAAK,EAAE,MAAM,CAAC;AAAA,EACpC,SAAS,OAAgB;AACvB,WAAO,qCAAqC,mBAAmB,KAAK;AAAA,EACtE;AACF;AAEO,MAAM,UAAU;AAAA,EACrB,MAAM,CAAC,mBAAmB;AAAA,EAC1B,SAAS;AAAA,EACT,SAAS;AAAA,IACP,MAAM;AAAA,MACJ,SAAS;AAAA,MACT,MAAM,CAAC,mBAAmB;AAAA,MAC1B,WAAW;AAAA,QACT,EAAE,QAAQ,KAAK,aAAa,mBAAmB;AAAA,QAC/C,EAAE,QAAQ,KAAK,aAAa,oBAAoB;AAAA,QAChD,EAAE,QAAQ,KAAK,aAAa,0BAA0B;AAAA,MACxD;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/modules/shipping_carriers/api/shipments/route.js

@@ -7,6 +7,7 @@ import {
   validateCrudMutationGuard
 } from "@open-mercato/shared/lib/crud/mutation-guard";
 import { isShipmentIdempotencyConflictError } from "../../lib/shipment-idempotency.js";
+import { shippingCarrierUpstreamErrorResponse } from "../../lib/upstream-error-response.js";
 import { createShipmentSchema } from "../../data/validators.js";
 import { shippingCarriersTag } from "../openapi.js";
 function resolveGuardUserId(auth) {
@@ -79,8 +80,7 @@ async function POST(req) {
         { status: 409 }
       );
     }
-    const message = error instanceof Error ? error.message : "Failed to create shipment";
-    return NextResponse.json({ error: message }, { status: 502 });
+    return shippingCarrierUpstreamErrorResponse("shipments.create", error);
   }
 }
 const openApi = {

package/dist/modules/shipping_carriers/api/shipments/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/shipping_carriers/api/shipments/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport {\n  runCrudMutationGuardAfterSuccess,\n  validateCrudMutationGuard,\n} from '@open-mercato/shared/lib/crud/mutation-guard'\nimport type { ShippingCarrierService } from '../../lib/shipping-service'\nimport { isShipmentIdempotencyConflictError } from '../../lib/shipment-idempotency'\nimport { createShipmentSchema } from '../../data/validators'\nimport { shippingCarriersTag } from '../openapi'\n\nfunction resolveGuardUserId(auth: {\n  sub?: string | null\n  userId?: string | null\n  keyId?: string | null\n}): string {\n  if (typeof auth.sub === 'string' && auth.sub.trim().length > 0) return auth.sub\n  if (typeof auth.userId === 'string' && auth.userId.trim().length > 0) return auth.userId\n  if (typeof auth.keyId === 'string' && auth.keyId.trim().length > 0) return auth.keyId\n  return 'system'\n}\n\nexport const metadata = {\n  path: '/shipping-carriers/shipments',\n  POST: { requireAuth: true, requireFeatures: ['shipping_carriers.manage'] },\n}\n\nexport async function POST(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const payload = await readJsonSafe<unknown>(req)\n  const parsed = createShipmentSchema.safeParse(payload)\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid payload', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const guardUserId = resolveGuardUserId(auth)\n  const guardResult = await validateCrudMutationGuard(container, {\n    tenantId: auth.tenantId,\n    organizationId: auth.orgId,\n    userId: guardUserId,\n    resourceKind: 'shipping_carriers.shipment',\n    resourceId: parsed.data.orderId,\n    operation: 'create',\n    requestMethod: req.method,\n    requestHeaders: req.headers,\n    mutationPayload: parsed.data as Record<string, unknown>,\n  })\n  if (guardResult && !guardResult.ok) {\n    return NextResponse.json(guardResult.body, { status: guardResult.status })\n  }\n\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const shipment = await service.createShipment({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n\n    if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {\n      await runCrudMutationGuardAfterSuccess(container, {\n        tenantId: auth.tenantId,\n        organizationId: auth.orgId,\n        userId: guardUserId,\n        resourceKind: 'shipping_carriers.shipment',\n        resourceId: parsed.data.orderId,\n        operation: 'create',\n        requestMethod: req.method,\n        requestHeaders: req.headers,\n        metadata: guardResult.metadata ?? null,\n      })\n    }\n\n    return NextResponse.json({\n      shipmentId: shipment.id,\n      carrierShipmentId: shipment.carrierShipmentId,\n      trackingNumber: shipment.trackingNumber,\n      status: shipment.unifiedStatus,\n      labelUrl: shipment.labelUrl,\n    }, { status: 201 })\n  } catch (error: unknown) {\n    if (isShipmentIdempotencyConflictError(error)) {\n      return NextResponse.json(\n        { error: 'Shipment idempotency conflict', code: 'idempotency_conflict' },\n        { status: 409 },\n      )\n    }\n    const message = error instanceof Error ? error.message : 'Failed to create shipment'\n    return NextResponse.json({ error: message }, { status: 502 })\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Create shipment',\n  methods: {\n    POST: {\n      summary: 'Create shipment',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 201, description: 'Shipment created' },\n        { status: 409, description: 'Idempotency conflict: the idempotency key was reused with a different payload' },\n        { status: 422, description: 'Validation failed' },\n        { status: 502, description: 'Provider upstream error' },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport {\n  runCrudMutationGuardAfterSuccess,\n  validateCrudMutationGuard,\n} from '@open-mercato/shared/lib/crud/mutation-guard'\nimport type { ShippingCarrierService } from '../../lib/shipping-service'\nimport { isShipmentIdempotencyConflictError } from '../../lib/shipment-idempotency'\nimport { shippingCarrierUpstreamErrorResponse } from '../../lib/upstream-error-response'\nimport { createShipmentSchema } from '../../data/validators'\nimport { shippingCarriersTag } from '../openapi'\n\nfunction resolveGuardUserId(auth: {\n  sub?: string | null\n  userId?: string | null\n  keyId?: string | null\n}): string {\n  if (typeof auth.sub === 'string' && auth.sub.trim().length > 0) return auth.sub\n  if (typeof auth.userId === 'string' && auth.userId.trim().length > 0) return auth.userId\n  if (typeof auth.keyId === 'string' && auth.keyId.trim().length > 0) return auth.keyId\n  return 'system'\n}\n\nexport const metadata = {\n  path: '/shipping-carriers/shipments',\n  POST: { requireAuth: true, requireFeatures: ['shipping_carriers.manage'] },\n}\n\nexport async function POST(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const payload = await readJsonSafe<unknown>(req)\n  const parsed = createShipmentSchema.safeParse(payload)\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid payload', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const guardUserId = resolveGuardUserId(auth)\n  const guardResult = await validateCrudMutationGuard(container, {\n    tenantId: auth.tenantId,\n    organizationId: auth.orgId,\n    userId: guardUserId,\n    resourceKind: 'shipping_carriers.shipment',\n    resourceId: parsed.data.orderId,\n    operation: 'create',\n    requestMethod: req.method,\n    requestHeaders: req.headers,\n    mutationPayload: parsed.data as Record<string, unknown>,\n  })\n  if (guardResult && !guardResult.ok) {\n    return NextResponse.json(guardResult.body, { status: guardResult.status })\n  }\n\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const shipment = await service.createShipment({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n\n    if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {\n      await runCrudMutationGuardAfterSuccess(container, {\n        tenantId: auth.tenantId,\n        organizationId: auth.orgId,\n        userId: guardUserId,\n        resourceKind: 'shipping_carriers.shipment',\n        resourceId: parsed.data.orderId,\n        operation: 'create',\n        requestMethod: req.method,\n        requestHeaders: req.headers,\n        metadata: guardResult.metadata ?? null,\n      })\n    }\n\n    return NextResponse.json({\n      shipmentId: shipment.id,\n      carrierShipmentId: shipment.carrierShipmentId,\n      trackingNumber: shipment.trackingNumber,\n      status: shipment.unifiedStatus,\n      labelUrl: shipment.labelUrl,\n    }, { status: 201 })\n  } catch (error: unknown) {\n    if (isShipmentIdempotencyConflictError(error)) {\n      return NextResponse.json(\n        { error: 'Shipment idempotency conflict', code: 'idempotency_conflict' },\n        { status: 409 },\n      )\n    }\n    return shippingCarrierUpstreamErrorResponse('shipments.create', error)\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Create shipment',\n  methods: {\n    POST: {\n      summary: 'Create shipment',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 201, description: 'Shipment created' },\n        { status: 409, description: 'Idempotency conflict: the idempotency key was reused with a different payload' },\n        { status: 422, description: 'Validation failed' },\n        { status: 502, description: 'Provider upstream error' },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/shipping_carriers/api/tracking/refresh/route.js

@@ -2,6 +2,7 @@ import { NextResponse } from "next/server";
 import { getAuthFromRequest } from "@open-mercato/shared/lib/auth/server";
 import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
 import { readJsonSafe } from "@open-mercato/shared/lib/http/readJsonSafe";
+import { shippingCarrierUpstreamErrorResponse } from "../../../lib/upstream-error-response.js";
 import { trackingRefreshSchema } from "../../../data/validators.js";
 import { shippingCarriersTag } from "../../openapi.js";
 const metadata = {
@@ -28,8 +29,7 @@ async function POST(req) {
     });
     return NextResponse.json(tracking);
   } catch (error) {
-    const message = error instanceof Error ? error.message : "Failed to refresh tracking";
-    return NextResponse.json({ error: message }, { status: 502 });
+    return shippingCarrierUpstreamErrorResponse("tracking.refresh", error);
   }
 }
 const openApi = {

package/dist/modules/shipping_carriers/api/tracking/refresh/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/modules/shipping_carriers/api/tracking/refresh/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport type { ShippingCarrierService } from '../../../lib/shipping-service'\nimport { trackingRefreshSchema } from '../../../data/validators'\nimport { shippingCarriersTag } from '../../openapi'\n\nexport const metadata = {\n  path: '/shipping-carriers/tracking/refresh',\n  POST: { requireAuth: true, requireFeatures: ['shipping_carriers.manage'] },\n}\n\nexport async function POST(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const payload = await readJsonSafe<unknown>(req)\n  const parsed = trackingRefreshSchema.safeParse(payload)\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid payload', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const tracking = await service.refreshTracking({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n    return NextResponse.json(tracking)\n  } catch (error: unknown) {\n    const message = error instanceof Error ? error.message : 'Failed to refresh tracking'\n    return NextResponse.json({ error: message }, { status: 502 })\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Refresh tracking',\n  methods: {\n    POST: {\n      summary: 'Refresh tracking and persist the latest shipment status',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 200, description: 'Tracking refreshed and shipment status persisted' },\n        { status: 422, description: 'Validation failed' },\n        { status: 502, description: 'Provider upstream error' },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AACvC,SAAS,oBAAoB;AAE7B,SAAS,6BAA6B;AACtC,SAAS,2BAA2B;AAE7B,MAAM,WAAW;AAAA,EACtB,MAAM;AAAA,EACN,MAAM,EAAE,aAAa,MAAM,iBAAiB,CAAC,0BAA0B,EAAE;AAC3E;AAEA,eAAsB,KAAK,KAAc;AACvC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,YAAY,CAAC,KAAK,OAAO;AAClC,WAAO,aAAa,KAAK,EAAE,OAAO,eAAe,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACrE;AACA,QAAM,UAAU,MAAM,aAAsB,GAAG;AAC/C,QAAM,SAAS,sBAAsB,UAAU,OAAO;AACtD,MAAI,CAAC,OAAO,SAAS;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,mBAAmB,SAAS,OAAO,MAAM,QAAQ,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACzG;AACA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,UAAU,UAAU,QAAQ,wBAAwB;AAC1D,MAAI;AACF,UAAM,WAAW,MAAM,QAAQ,gBAAgB;AAAA,MAC7C,GAAG,OAAO;AAAA,MACV,gBAAgB,KAAK;AAAA,MACrB,UAAU,KAAK;AAAA,IACjB,CAAC;AACD,WAAO,aAAa,KAAK,QAAQ;AAAA,EACnC,SAAS,OAAgB;AACvB,UAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU;AACzD,WAAO,aAAa,KAAK,EAAE,OAAO,QAAQ,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC9D;AACF;AAEO,MAAM,UAAU;AAAA,EACrB,MAAM,CAAC,mBAAmB;AAAA,EAC1B,SAAS;AAAA,EACT,SAAS;AAAA,IACP,MAAM;AAAA,MACJ,SAAS;AAAA,MACT,MAAM,CAAC,mBAAmB;AAAA,MAC1B,WAAW;AAAA,QACT,EAAE,QAAQ,KAAK,aAAa,mDAAmD;AAAA,QAC/E,EAAE,QAAQ,KAAK,aAAa,oBAAoB;AAAA,QAChD,EAAE,QAAQ,KAAK,aAAa,0BAA0B;AAAA,MACxD;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'\nimport type { ShippingCarrierService } from '../../../lib/shipping-service'\nimport { shippingCarrierUpstreamErrorResponse } from '../../../lib/upstream-error-response'\nimport { trackingRefreshSchema } from '../../../data/validators'\nimport { shippingCarriersTag } from '../../openapi'\n\nexport const metadata = {\n  path: '/shipping-carriers/tracking/refresh',\n  POST: { requireAuth: true, requireFeatures: ['shipping_carriers.manage'] },\n}\n\nexport async function POST(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const payload = await readJsonSafe<unknown>(req)\n  const parsed = trackingRefreshSchema.safeParse(payload)\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid payload', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const tracking = await service.refreshTracking({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n    return NextResponse.json(tracking)\n  } catch (error: unknown) {\n    return shippingCarrierUpstreamErrorResponse('tracking.refresh', error)\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Refresh tracking',\n  methods: {\n    POST: {\n      summary: 'Refresh tracking and persist the latest shipment status',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 200, description: 'Tracking refreshed and shipment status persisted' },\n        { status: 422, description: 'Validation failed' },\n        { status: 502, description: 'Provider upstream error' },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AACvC,SAAS,oBAAoB;AAE7B,SAAS,4CAA4C;AACrD,SAAS,6BAA6B;AACtC,SAAS,2BAA2B;AAE7B,MAAM,WAAW;AAAA,EACtB,MAAM;AAAA,EACN,MAAM,EAAE,aAAa,MAAM,iBAAiB,CAAC,0BAA0B,EAAE;AAC3E;AAEA,eAAsB,KAAK,KAAc;AACvC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,YAAY,CAAC,KAAK,OAAO;AAClC,WAAO,aAAa,KAAK,EAAE,OAAO,eAAe,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACrE;AACA,QAAM,UAAU,MAAM,aAAsB,GAAG;AAC/C,QAAM,SAAS,sBAAsB,UAAU,OAAO;AACtD,MAAI,CAAC,OAAO,SAAS;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,mBAAmB,SAAS,OAAO,MAAM,QAAQ,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACzG;AACA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,UAAU,UAAU,QAAQ,wBAAwB;AAC1D,MAAI;AACF,UAAM,WAAW,MAAM,QAAQ,gBAAgB;AAAA,MAC7C,GAAG,OAAO;AAAA,MACV,gBAAgB,KAAK;AAAA,MACrB,UAAU,KAAK;AAAA,IACjB,CAAC;AACD,WAAO,aAAa,KAAK,QAAQ;AAAA,EACnC,SAAS,OAAgB;AACvB,WAAO,qCAAqC,oBAAoB,KAAK;AAAA,EACvE;AACF;AAEO,MAAM,UAAU;AAAA,EACrB,MAAM,CAAC,mBAAmB;AAAA,EAC1B,SAAS;AAAA,EACT,SAAS;AAAA,IACP,MAAM;AAAA,MACJ,SAAS;AAAA,MACT,MAAM,CAAC,mBAAmB;AAAA,MAC1B,WAAW;AAAA,QACT,EAAE,QAAQ,KAAK,aAAa,mDAAmD;AAAA,QAC/E,EAAE,QAAQ,KAAK,aAAa,oBAAoB;AAAA,QAChD,EAAE,QAAQ,KAAK,aAAa,0BAA0B;AAAA,MACxD;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/modules/shipping_carriers/api/tracking/route.js

@@ -1,6 +1,7 @@
 import { NextResponse } from "next/server";
 import { getAuthFromRequest } from "@open-mercato/shared/lib/auth/server";
 import { createRequestContainer } from "@open-mercato/shared/lib/di/container";
+import { shippingCarrierUpstreamErrorResponse } from "../../lib/upstream-error-response.js";
 import { trackingQuerySchema } from "../../data/validators.js";
 import { shippingCarriersTag } from "../openapi.js";
 const metadata = {
@@ -31,8 +32,7 @@ async function GET(req) {
     });
     return NextResponse.json(tracking);
   } catch (error) {
-    const message = error instanceof Error ? error.message : "Failed to fetch tracking";
-    return NextResponse.json({ error: message }, { status: 502 });
+    return shippingCarrierUpstreamErrorResponse("tracking.get", error);
   }
 }
 const openApi = {

package/dist/modules/shipping_carriers/api/tracking/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/shipping_carriers/api/tracking/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport type { ShippingCarrierService } from '../../lib/shipping-service'\nimport { trackingQuerySchema } from '../../data/validators'\nimport { shippingCarriersTag } from '../openapi'\n\nexport const metadata = {\n  path: '/shipping-carriers/tracking',\n  GET: { requireAuth: true, requireFeatures: ['shipping_carriers.view'] },\n}\n\nexport async function GET(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const url = new URL(req.url)\n  const parsed = trackingQuerySchema.safeParse({\n    providerKey: url.searchParams.get('providerKey'),\n    shipmentId: url.searchParams.get('shipmentId') ?? undefined,\n    trackingNumber: url.searchParams.get('trackingNumber') ?? undefined,\n  })\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid query', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const tracking = await service.getTracking({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n    return NextResponse.json(tracking)\n  } catch (error: unknown) {\n    const message = error instanceof Error ? error.message : 'Failed to fetch tracking'\n    return NextResponse.json({ error: message }, { status: 502 })\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Get tracking',\n  methods: {\n    GET: {\n      summary: 'Get tracking',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 200, description: 'Tracking returned' },\n        { status: 422, description: 'Validation failed' },\n        { status: 502, description: 'Provider upstream error' },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AAEvC,SAAS,2BAA2B;AACpC,SAAS,2BAA2B;AAE7B,MAAM,WAAW;AAAA,EACtB,MAAM;AAAA,EACN,KAAK,EAAE,aAAa,MAAM,iBAAiB,CAAC,wBAAwB,EAAE;AACxE;AAEA,eAAsB,IAAI,KAAc;AACtC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,YAAY,CAAC,KAAK,OAAO;AAClC,WAAO,aAAa,KAAK,EAAE,OAAO,eAAe,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACrE;AACA,QAAM,MAAM,IAAI,IAAI,IAAI,GAAG;AAC3B,QAAM,SAAS,oBAAoB,UAAU;AAAA,IAC3C,aAAa,IAAI,aAAa,IAAI,aAAa;AAAA,IAC/C,YAAY,IAAI,aAAa,IAAI,YAAY,KAAK;AAAA,IAClD,gBAAgB,IAAI,aAAa,IAAI,gBAAgB,KAAK;AAAA,EAC5D,CAAC;AACD,MAAI,CAAC,OAAO,SAAS;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,iBAAiB,SAAS,OAAO,MAAM,QAAQ,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACvG;AACA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,UAAU,UAAU,QAAQ,wBAAwB;AAC1D,MAAI;AACF,UAAM,WAAW,MAAM,QAAQ,YAAY;AAAA,MACzC,GAAG,OAAO;AAAA,MACV,gBAAgB,KAAK;AAAA,MACrB,UAAU,KAAK;AAAA,IACjB,CAAC;AACD,WAAO,aAAa,KAAK,QAAQ;AAAA,EACnC,SAAS,OAAgB;AACvB,UAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU;AACzD,WAAO,aAAa,KAAK,EAAE,OAAO,QAAQ,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EAC9D;AACF;AAEO,MAAM,UAAU;AAAA,EACrB,MAAM,CAAC,mBAAmB;AAAA,EAC1B,SAAS;AAAA,EACT,SAAS;AAAA,IACP,KAAK;AAAA,MACH,SAAS;AAAA,MACT,MAAM,CAAC,mBAAmB;AAAA,MAC1B,WAAW;AAAA,QACT,EAAE,QAAQ,KAAK,aAAa,oBAAoB;AAAA,QAChD,EAAE,QAAQ,KAAK,aAAa,oBAAoB;AAAA,QAChD,EAAE,QAAQ,KAAK,aAAa,0BAA0B;AAAA,MACxD;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport type { ShippingCarrierService } from '../../lib/shipping-service'\nimport { shippingCarrierUpstreamErrorResponse } from '../../lib/upstream-error-response'\nimport { trackingQuerySchema } from '../../data/validators'\nimport { shippingCarriersTag } from '../openapi'\n\nexport const metadata = {\n  path: '/shipping-carriers/tracking',\n  GET: { requireAuth: true, requireFeatures: ['shipping_carriers.view'] },\n}\n\nexport async function GET(req: Request) {\n  const auth = await getAuthFromRequest(req)\n  if (!auth?.tenantId || !auth.orgId) {\n    return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n  }\n  const url = new URL(req.url)\n  const parsed = trackingQuerySchema.safeParse({\n    providerKey: url.searchParams.get('providerKey'),\n    shipmentId: url.searchParams.get('shipmentId') ?? undefined,\n    trackingNumber: url.searchParams.get('trackingNumber') ?? undefined,\n  })\n  if (!parsed.success) {\n    return NextResponse.json({ error: 'Invalid query', details: parsed.error.flatten() }, { status: 422 })\n  }\n  const container = await createRequestContainer()\n  const service = container.resolve('shippingCarrierService') as ShippingCarrierService\n  try {\n    const tracking = await service.getTracking({\n      ...parsed.data,\n      organizationId: auth.orgId as string,\n      tenantId: auth.tenantId,\n    })\n    return NextResponse.json(tracking)\n  } catch (error: unknown) {\n    return shippingCarrierUpstreamErrorResponse('tracking.get', error)\n  }\n}\n\nexport const openApi = {\n  tags: [shippingCarriersTag],\n  summary: 'Get tracking',\n  methods: {\n    GET: {\n      summary: 'Get tracking',\n      tags: [shippingCarriersTag],\n      responses: [\n        { status: 200, description: 'Tracking returned' },\n        { status: 422, description: 'Validation failed' },\n        { status: 502, description: 'Provider upstream error' },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AAEvC,SAAS,4CAA4C;AACrD,SAAS,2BAA2B;AACpC,SAAS,2BAA2B;AAE7B,MAAM,WAAW;AAAA,EACtB,MAAM;AAAA,EACN,KAAK,EAAE,aAAa,MAAM,iBAAiB,CAAC,wBAAwB,EAAE;AACxE;AAEA,eAAsB,IAAI,KAAc;AACtC,QAAM,OAAO,MAAM,mBAAmB,GAAG;AACzC,MAAI,CAAC,MAAM,YAAY,CAAC,KAAK,OAAO;AAClC,WAAO,aAAa,KAAK,EAAE,OAAO,eAAe,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACrE;AACA,QAAM,MAAM,IAAI,IAAI,IAAI,GAAG;AAC3B,QAAM,SAAS,oBAAoB,UAAU;AAAA,IAC3C,aAAa,IAAI,aAAa,IAAI,aAAa;AAAA,IAC/C,YAAY,IAAI,aAAa,IAAI,YAAY,KAAK;AAAA,IAClD,gBAAgB,IAAI,aAAa,IAAI,gBAAgB,KAAK;AAAA,EAC5D,CAAC;AACD,MAAI,CAAC,OAAO,SAAS;AACnB,WAAO,aAAa,KAAK,EAAE,OAAO,iBAAiB,SAAS,OAAO,MAAM,QAAQ,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAAA,EACvG;AACA,QAAM,YAAY,MAAM,uBAAuB;AAC/C,QAAM,UAAU,UAAU,QAAQ,wBAAwB;AAC1D,MAAI;AACF,UAAM,WAAW,MAAM,QAAQ,YAAY;AAAA,MACzC,GAAG,OAAO;AAAA,MACV,gBAAgB,KAAK;AAAA,MACrB,UAAU,KAAK;AAAA,IACjB,CAAC;AACD,WAAO,aAAa,KAAK,QAAQ;AAAA,EACnC,SAAS,OAAgB;AACvB,WAAO,qCAAqC,gBAAgB,KAAK;AAAA,EACnE;AACF;AAEO,MAAM,UAAU;AAAA,EACrB,MAAM,CAAC,mBAAmB;AAAA,EAC1B,SAAS;AAAA,EACT,SAAS;AAAA,IACP,KAAK;AAAA,MACH,SAAS;AAAA,MACT,MAAM,CAAC,mBAAmB;AAAA,MAC1B,WAAW;AAAA,QACT,EAAE,QAAQ,KAAK,aAAa,oBAAoB;AAAA,QAChD,EAAE,QAAQ,KAAK,aAAa,oBAAoB;AAAA,QAChD,EAAE,QAAQ,KAAK,aAAa,0BAA0B;AAAA,MACxD;AAAA,IACF;AAAA,EACF;AACF;",
   "names": []
 }

package/dist/modules/shipping_carriers/lib/upstream-error-response.js

@@ -0,0 +1,13 @@
+import { NextResponse } from "next/server";
+import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
+const upstreamFailedKey = "shipping_carriers.errors.upstreamFailed";
+const upstreamFailedFallback = "Carrier provider request failed. Try again later.";
+async function shippingCarrierUpstreamErrorResponse(routeId, error) {
+  console.error(`[shipping_carriers.${routeId}] provider upstream error`, error);
+  const { translate } = await resolveTranslations();
+  return NextResponse.json({ error: translate(upstreamFailedKey, upstreamFailedFallback) }, { status: 502 });
+}
+export {
+  shippingCarrierUpstreamErrorResponse
+};
+//# sourceMappingURL=upstream-error-response.js.map

package/dist/modules/shipping_carriers/lib/upstream-error-response.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/shipping_carriers/lib/upstream-error-response.ts"],
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\n\nconst upstreamFailedKey = 'shipping_carriers.errors.upstreamFailed'\nconst upstreamFailedFallback = 'Carrier provider request failed. Try again later.'\n\nexport async function shippingCarrierUpstreamErrorResponse(routeId: string, error: unknown) {\n  console.error(`[shipping_carriers.${routeId}] provider upstream error`, error)\n  const { translate } = await resolveTranslations()\n  return NextResponse.json({ error: translate(upstreamFailedKey, upstreamFailedFallback) }, { status: 502 })\n}\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,2BAA2B;AAEpC,MAAM,oBAAoB;AAC1B,MAAM,yBAAyB;AAE/B,eAAsB,qCAAqC,SAAiB,OAAgB;AAC1F,UAAQ,MAAM,sBAAsB,OAAO,6BAA6B,KAAK;AAC7E,QAAM,EAAE,UAAU,IAAI,MAAM,oBAAoB;AAChD,SAAO,aAAa,KAAK,EAAE,OAAO,UAAU,mBAAmB,sBAAsB,EAAE,GAAG,EAAE,QAAQ,IAAI,CAAC;AAC3G;",
+  "names": []
+}

package/dist/modules/staff/commands/activities.js

@@ -16,7 +16,16 @@ import {
   staffTeamMemberActivityUpdateSchema
 } from "../data/validators.js";
 import { staffTeamMemberActivityCrudEvents } from "../lib/crud.js";
-import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload, requireTeamMember } from "./shared.js";
+import {
+  applyScopeToWhere,
+  commandActorScope,
+  commandInputScope,
+  ensureOrganizationScope,
+  ensureTenantScope,
+  explicitStaffCommandScope,
+  extractUndoPayload,
+  requireTeamMember
+} from "./shared.js";
 import { resolveRedoSnapshot } from "@open-mercato/shared/lib/commands/redo";
 import { E } from "../../../generated/entities.ids.generated.js";
 import {
@@ -72,9 +81,15 @@ const createActivityCommand = {
     const { parsed, custom } = parseWithCustomFields(staffTeamMemberActivityCreateSchema, rawInput);
     ensureTenantScope(ctx, parsed.tenantId);
     ensureOrganizationScope(ctx, parsed.organizationId);
+    const scope = commandInputScope(ctx, parsed.tenantId, parsed.organizationId);
     const normalizedAuthor = normalizeAuthorUserId(parsed.authorUserId, ctx.auth);
     const em = ctx.container.resolve("em").fork();
-    const member = await requireTeamMember(em, parsed.entityId, "Team member not found");
+    const member = await requireTeamMember(
+      em,
+      parsed.entityId,
+      scope,
+      "Team member not found"
+    );
     ensureTenantScope(ctx, member.tenantId);
     ensureOrganizationScope(ctx, member.organizationId);
     const activity = em.create(StaffTeamMemberActivity, {
@@ -148,7 +163,12 @@ const createActivityCommand = {
       throw new CrudHttpError(400, { error: "[internal] redo snapshot unavailable for activity create" });
     }
     const em = ctx.container.resolve("em").fork();
-    const member = await requireTeamMember(em, after.activity.memberId, "Team member not found");
+    const member = await requireTeamMember(
+      em,
+      after.activity.memberId,
+      explicitStaffCommandScope(after.activity.tenantId, after.activity.organizationId),
+      "Team member not found"
+    );
     let activity = await em.findOne(StaffTeamMemberActivity, { id: after.activity.id });
     if (!activity) {
       activity = em.create(StaffTeamMemberActivity, {
@@ -206,12 +226,16 @@ const updateActivityCommand = {
   async execute(rawInput, ctx) {
     const { parsed, custom } = parseWithCustomFields(staffTeamMemberActivityUpdateSchema, rawInput);
     const em = ctx.container.resolve("em").fork();
-    const activity = await em.findOne(StaffTeamMemberActivity, { id: parsed.id });
+    const scope = commandActorScope(ctx);
+    const activity = await em.findOne(
+      StaffTeamMemberActivity,
+      applyScopeToWhere({ id: parsed.id }, scope)
+    );
     if (!activity) throw new CrudHttpError(404, { error: "Activity not found" });
     ensureTenantScope(ctx, activity.tenantId);
     ensureOrganizationScope(ctx, activity.organizationId);
     if (parsed.entityId !== void 0) {
-      const member = await requireTeamMember(em, parsed.entityId, "Team member not found");
+      const member = await requireTeamMember(em, parsed.entityId, scope, "Team member not found");
       ensureTenantScope(ctx, member.tenantId);
       ensureOrganizationScope(ctx, member.organizationId);
       activity.member = member;
@@ -291,7 +315,12 @@ const updateActivityCommand = {
     if (!before) return;
     const em = ctx.container.resolve("em").fork();
     let activity = await em.findOne(StaffTeamMemberActivity, { id: before.activity.id });
-    const member = await requireTeamMember(em, before.activity.memberId, "Team member not found");
+    const member = await requireTeamMember(
+      em,
+      before.activity.memberId,
+      explicitStaffCommandScope(before.activity.tenantId, before.activity.organizationId),
+      "Team member not found"
+    );
     if (!activity) {
       activity = em.create(StaffTeamMemberActivity, {
         id: before.activity.id,
@@ -358,7 +387,11 @@ const deleteActivityCommand = {
   async execute(input, ctx) {
     const id = requireId(input, "Activity id required");
     const em = ctx.container.resolve("em").fork();
-    const activity = await em.findOne(StaffTeamMemberActivity, { id });
+    const scope = commandActorScope(ctx);
+    const activity = await em.findOne(
+      StaffTeamMemberActivity,
+      applyScopeToWhere({ id }, scope)
+    );
     if (!activity) throw new CrudHttpError(404, { error: "Activity not found" });
     ensureTenantScope(ctx, activity.tenantId);
     ensureOrganizationScope(ctx, activity.organizationId);
@@ -404,7 +437,12 @@ const deleteActivityCommand = {
     const before = payload?.before;
     if (!before) return;
     const em = ctx.container.resolve("em").fork();
-    const member = await requireTeamMember(em, before.activity.memberId, "Team member not found");
+    const member = await requireTeamMember(
+      em,
+      before.activity.memberId,
+      explicitStaffCommandScope(before.activity.tenantId, before.activity.organizationId),
+      "Team member not found"
+    );
     let activity = await em.findOne(StaffTeamMemberActivity, { id: before.activity.id });
     if (!activity) {
       activity = em.create(StaffTeamMemberActivity, {