@open-mercato/core 0.10.1-develop.7709.1.046124599c → 0.10.1-develop.7714.1.9dbb8200d8

package/src/modules/wms/migrations/Migration20260812120000.ts

@@ -0,0 +1,43 @@
+import { Migration } from '@mikro-orm/migrations'
+
+export class Migration20260812120000_wms extends Migration {
+  override up(): void | Promise<void> {
+    this.addSql(
+      `create table "wms_asns" ("id" uuid not null default gen_random_uuid(), "organization_id" uuid not null, "tenant_id" uuid not null, "metadata" jsonb null, "created_at" timestamptz not null, "updated_at" timestamptz not null, "deleted_at" timestamptz null, "warehouse_id" uuid not null, "vendor_id" uuid null, "status" text not null default 'draft', "expected_at" timestamptz not null, "reference_number" text null, "notes" text null, primary key ("id"));`,
+    )
+    this.addSql(
+      `create index "wms_asns_org_warehouse_status_expected_idx" on "wms_asns" ("organization_id", "warehouse_id", "status", "expected_at");`,
+    )
+    this.addSql(
+      `create index "wms_asns_org_vendor_expected_idx" on "wms_asns" ("organization_id", "vendor_id", "expected_at" desc) where deleted_at is null;`,
+    )
+    this.addSql(`create index "wms_asns_org_tenant_idx" on "wms_asns" ("organization_id", "tenant_id");`)
+
+    this.addSql(
+      `create table "wms_receiving_lines" ("id" uuid not null default gen_random_uuid(), "organization_id" uuid not null, "tenant_id" uuid not null, "metadata" jsonb null, "created_at" timestamptz not null, "updated_at" timestamptz not null, "deleted_at" timestamptz null, "asn_id" uuid not null, "catalog_variant_id" uuid not null, "expected_qty" numeric(16,4) not null, "received_qty" numeric(16,4) not null default '0', "lot_number" text null, "serial_numbers" jsonb null, "qc_status" text not null default 'pending', "target_staging_location_id" uuid null, "rejection_reason" text null, primary key ("id"));`,
+    )
+    this.addSql(
+      `create index "wms_receiving_lines_org_variant_qc_idx" on "wms_receiving_lines" ("organization_id", "catalog_variant_id", "qc_status");`,
+    )
+    this.addSql(
+      `create index "wms_receiving_lines_org_asn_idx" on "wms_receiving_lines" ("organization_id", "asn_id");`,
+    )
+    this.addSql(
+      `create index "wms_receiving_lines_org_tenant_idx" on "wms_receiving_lines" ("organization_id", "tenant_id");`,
+    )
+
+    this.addSql(
+      `alter table "wms_asns" add constraint "wms_asns_warehouse_id_foreign" foreign key ("warehouse_id") references "wms_warehouses" ("id");`,
+    )
+    this.addSql(
+      `alter table "wms_receiving_lines" add constraint "wms_receiving_lines_asn_id_foreign" foreign key ("asn_id") references "wms_asns" ("id");`,
+    )
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`alter table "wms_receiving_lines" drop constraint if exists "wms_receiving_lines_asn_id_foreign";`)
+    this.addSql(`alter table "wms_asns" drop constraint if exists "wms_asns_warehouse_id_foreign";`)
+    this.addSql(`drop table if exists "wms_receiving_lines" cascade;`)
+    this.addSql(`drop table if exists "wms_asns" cascade;`)
+  }
+}

package/src/modules/wms/migrations/Migration20260812130000.ts

@@ -0,0 +1,28 @@
+import { Migration } from '@mikro-orm/migrations'
+
+export class Migration20260812130000_wms extends Migration {
+  override up(): void | Promise<void> {
+    this.addSql(
+      `create table "wms_putaway_tasks" ("id" uuid not null default gen_random_uuid(), "organization_id" uuid not null, "tenant_id" uuid not null, "metadata" jsonb null, "created_at" timestamptz not null, "updated_at" timestamptz not null, "deleted_at" timestamptz null, "warehouse_id" uuid not null, "source_location_id" uuid not null, "target_location_id" uuid null, "catalog_variant_id" uuid not null, "lot_id" uuid null, "quantity" numeric(16,4) not null, "status" text not null default 'open', "assigned_to" uuid null, "priority" int not null default 5, primary key ("id"));`,
+    )
+    this.addSql(
+      `create index "wms_putaway_tasks_org_warehouse_status_priority_idx" on "wms_putaway_tasks" ("organization_id", "warehouse_id", "status", "priority");`,
+    )
+    this.addSql(
+      `create index "wms_putaway_tasks_org_assigned_status_idx" on "wms_putaway_tasks" ("organization_id", "assigned_to", "status");`,
+    )
+    this.addSql(
+      `create index "wms_putaway_tasks_org_tenant_idx" on "wms_putaway_tasks" ("organization_id", "tenant_id");`,
+    )
+    this.addSql(
+      `alter table "wms_putaway_tasks" add constraint "wms_putaway_tasks_warehouse_id_foreign" foreign key ("warehouse_id") references "wms_warehouses" ("id");`,
+    )
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(
+      `alter table "wms_putaway_tasks" drop constraint if exists "wms_putaway_tasks_warehouse_id_foreign";`,
+    )
+    this.addSql(`drop table if exists "wms_putaway_tasks" cascade;`)
+  }
+}

package/src/modules/wms/migrations/Migration20260822120000.ts

@@ -0,0 +1,17 @@
+import { Migration } from '@mikro-orm/migrations'
+
+export class Migration20260822120000_wms extends Migration {
+  override up(): void | Promise<void> {
+    this.addSql(`alter table "wms_putaway_tasks" add column "putaway_key" text null;`)
+    // Exclude cancelled so cancel-without-clearing-key (legacy rows) cannot block
+    // ASN receive recreate; cancel also nulls putaway_key in the command path.
+    this.addSql(
+      `create unique index "wms_putaway_tasks_org_putaway_key_unique_idx" on "wms_putaway_tasks" ("organization_id", "putaway_key") where putaway_key is not null and deleted_at is null and status <> 'cancelled';`,
+    )
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`drop index if exists "wms_putaway_tasks_org_putaway_key_unique_idx";`)
+    this.addSql(`alter table "wms_putaway_tasks" drop column if exists "putaway_key";`)
+  }
+}

package/src/modules/wms/migrations/Migration20260822130000.ts

@@ -0,0 +1,15 @@
+import { Migration } from '@mikro-orm/migrations'
+
+export class Migration20260822130000_wms extends Migration {
+  override up(): void | Promise<void> {
+    this.addSql(`alter table "wms_asns" add column "source_key" text null;`)
+    this.addSql(
+      `create unique index "wms_asns_org_source_key_unique_idx" on "wms_asns" ("organization_id", "source_key") where source_key is not null and deleted_at is null;`,
+    )
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`drop index if exists "wms_asns_org_source_key_unique_idx";`)
+    this.addSql(`alter table "wms_asns" drop column if exists "source_key";`)
+  }
+}

package/src/modules/wms/migrations/Migration20261029120000.ts

@@ -0,0 +1,11 @@
+import { Migration } from '@mikro-orm/migrations'
+
+export class Migration20261029120000_wms extends Migration {
+  override up(): void | Promise<void> {
+    this.addSql(`alter table "wms_putaway_tasks" add column "serial_number" text null;`)
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`alter table "wms_putaway_tasks" drop column if exists "serial_number";`)
+  }
+}

package/src/modules/wms/search.ts

@@ -102,6 +102,37 @@ function buildLotPresenter(
   return { title, subtitle, icon: 'package-search' }
 }
 
+function buildAsnPresenter(
+  t: TranslateFn,
+  record: Record<string, unknown>,
+): SearchResultPresenter {
+  const label = t('wms.search.badge.asn', 'ASN')
+  const title =
+    pickString(record.reference_number, record.referenceNumber, record.id) ?? label
+  const subtitle = formatSubtitle(
+    record.status,
+    record.warehouse_id ?? record.warehouseId,
+    record.expected_at ?? record.expectedAt,
+  )
+  return { title, subtitle, icon: 'truck', badge: label }
+}
+
+function buildPutawayPresenter(
+  t: TranslateFn,
+  record: Record<string, unknown>,
+): SearchResultPresenter {
+  const label = t('wms.search.badge.putaway', 'Putaway task')
+  const title =
+    pickString(record.catalog_variant_id, record.catalogVariantId, record.id) ?? label
+  const subtitle = formatSubtitle(
+    record.status,
+    record.warehouse_id ?? record.warehouseId,
+    record.source_location_id ?? record.sourceLocationId,
+    record.target_location_id ?? record.targetLocationId,
+  )
+  return { title, subtitle, icon: 'package', badge: label }
+}
+
 export const searchConfig: SearchModuleConfig = {
   entities: [
     {
@@ -227,6 +258,70 @@ export const searchConfig: SearchModuleConfig = {
         searchable: ['lot_number', 'batch_number', 'sku', 'catalog_variant_id', 'status', 'expires_at'],
       },
     },
+    {
+      entityId: E.wms.asn,
+      aclFeatures: ['wms.view'],
+      enabled: true,
+      priority: 7,
+      buildSource: async (ctx) => {
+        const { t } = await resolveTranslations()
+        const record = ctx.record
+        const lines: string[] = []
+        appendLine(lines, 'Reference', record.reference_number ?? record.referenceNumber)
+        appendLine(lines, 'Status', record.status)
+        appendLine(lines, 'Warehouse', record.warehouse_id ?? record.warehouseId)
+        appendLine(lines, 'Vendor', record.vendor_id ?? record.vendorId)
+        appendLine(lines, 'Expected at', record.expected_at ?? record.expectedAt)
+        appendLine(lines, 'Notes', record.notes)
+        return buildIndexSource(ctx, buildAsnPresenter(t, record), lines)
+      },
+      formatResult: async (ctx) => {
+        const { t } = await resolveTranslations()
+        return buildAsnPresenter(t, ctx.record)
+      },
+      resolveUrl: async (ctx) => {
+        const id = pickString(ctx.record.id)
+        if (id) return `${WMS_ROOT_URL}/asns/${id}`
+        return WMS_ROOT_URL
+      },
+      fieldPolicy: {
+        searchable: ['reference_number', 'status', 'warehouse_id', 'vendor_id', 'notes'],
+      },
+    },
+    {
+      entityId: E.wms.putaway_task,
+      aclFeatures: ['wms.view'],
+      enabled: true,
+      priority: 6,
+      buildSource: async (ctx) => {
+        const { t } = await resolveTranslations()
+        const record = ctx.record
+        const lines: string[] = []
+        appendLine(lines, 'Status', record.status)
+        appendLine(lines, 'Warehouse', record.warehouse_id ?? record.warehouseId)
+        appendLine(lines, 'Source', record.source_location_id ?? record.sourceLocationId)
+        appendLine(lines, 'Target', record.target_location_id ?? record.targetLocationId)
+        appendLine(lines, 'Variant', record.catalog_variant_id ?? record.catalogVariantId)
+        appendLine(lines, 'Assigned to', record.assigned_to ?? record.assignedTo)
+        appendLine(lines, 'Quantity', record.quantity)
+        return buildIndexSource(ctx, buildPutawayPresenter(t, record), lines)
+      },
+      formatResult: async (ctx) => {
+        const { t } = await resolveTranslations()
+        return buildPutawayPresenter(t, ctx.record)
+      },
+      resolveUrl: async () => `${WMS_ROOT_URL}/putaway`,
+      fieldPolicy: {
+        searchable: [
+          'status',
+          'warehouse_id',
+          'source_location_id',
+          'target_location_id',
+          'catalog_variant_id',
+          'assigned_to',
+        ],
+      },
+    },
   ],
 }
 

package/src/modules/wms/subscribers/asn-line-received-reevaluate-reservations.ts

@@ -0,0 +1,21 @@
+import { reevaluateReservationsAfterStockIncrease } from '../lib/salesOrderInventoryAutomation'
+
+export const metadata = {
+  event: 'wms.asn.line_received',
+  persistent: true,
+  id: 'wms:asn-line-received-reevaluate-reservations',
+}
+
+type SubscriberContext = {
+  resolve: <T = unknown>(name: string) => T
+}
+
+type AsnLineReceivedPayload = {
+  catalogVariantId?: string | null
+  tenantId?: string | null
+  organizationId?: string | null
+}
+
+export default async function handle(payload: AsnLineReceivedPayload, ctx: SubscriberContext) {
+  await reevaluateReservationsAfterStockIncrease(payload, ctx)
+}

package/src/modules/wms/subscribers/invalidate-enricher-cache-asn.ts

@@ -0,0 +1,12 @@
+import { createInventoryEnricherCacheHandler } from '../lib/inventoryEnricherCacheSubscriber'
+
+// Sales-order enricher `inboundSummary` aggregates open ASN rows (`draft` /
+// `in_transit`). ASN lifecycle writes change that projection without always
+// touching balances, so they need their own invalidation family.
+export const metadata = {
+  event: 'wms.asn.*',
+  persistent: false,
+  id: 'wms:invalidate-enricher-cache-asn',
+}
+
+export default createInventoryEnricherCacheHandler('inventory')

package/src/modules/wms/subscribers/procurement-goods-receipt-created.ts

@@ -0,0 +1,238 @@
+import type { EntityManager } from '@mikro-orm/postgresql'
+import type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
+import type { FeatureTogglesService } from '@open-mercato/core/modules/feature_toggles/lib/feature-flag-check'
+import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
+import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+import { getTelemetryRuntime } from '@open-mercato/shared/lib/telemetry/runtime'
+import { Asn } from '../data/entities'
+import { resolveWmsIntegrationToggleEnabled } from '../lib/wmsIntegrationToggles'
+
+const logger = createLogger('wms')
+
+export const metadata = {
+  event: 'procurement.goods_receipt.created',
+  persistent: true,
+  id: 'wms:procurement-goods-receipt-created',
+}
+
+type SubscriberContext = {
+  resolve: <T = unknown>(name: string) => T
+}
+
+/**
+ * Assumed procurement.goods_receipt.created payload (procurement module is
+ * optional / thin today). Fields beyond id + scope are best-effort:
+ *
+ * - id / goodsReceiptId: required for idempotent create via Asn.sourceKey
+ * - warehouseId (required to create): destination warehouse UUID
+ * - vendorId?: customers UUID
+ * - expectedAt?: ISO date (defaults to now)
+ * - referenceNumber?: external PO/GRN display reference (falls back to goods receipt id;
+ *   not used as the uniqueness key — free-form refs may legitimately collide)
+ * - tenantId / organizationId: required scope
+ * - lines?: [{ catalogVariantId, expectedQty, lotNumber? }]
+ *
+ * When the toggle is off, required fields are missing, or peers are absent,
+ * this subscriber no-ops.
+ */
+type GoodsReceiptCreatedPayload = {
+  id?: string | null
+  goodsReceiptId?: string | null
+  warehouseId?: string | null
+  vendorId?: string | null
+  expectedAt?: string | Date | null
+  referenceNumber?: string | null
+  tenantId?: string | null
+  organizationId?: string | null
+  lines?: Array<{
+    catalogVariantId?: string | null
+    expectedQty?: string | number | null
+    lotNumber?: string | null
+  }> | null
+}
+
+export function buildProcurementGoodsReceiptSourceKey(goodsReceiptId: string): string {
+  return `procurement.goods_receipt:${goodsReceiptId}`
+}
+
+function tryResolve<T>(ctx: SubscriberContext, name: string): T | undefined {
+  try {
+    return ctx.resolve<T>(name)
+  } catch {
+    return undefined
+  }
+}
+
+function asUuid(value: unknown): string | null {
+  return typeof value === 'string' && value.trim().length > 0 ? value.trim() : null
+}
+
+function toPositiveQuantity(value: unknown): number | null {
+  const numeric = typeof value === 'number' ? value : typeof value === 'string' ? Number(value) : NaN
+  if (!Number.isFinite(numeric) || numeric <= 0) return null
+  return numeric
+}
+
+function isUniqueConstraintError(error: unknown): boolean {
+  if (!error || typeof error !== 'object') return false
+  const code = (error as { code?: string }).code
+  if (code === '23505') return true
+  const name = (error as { name?: string }).name
+  if (name === 'UniqueConstraintViolationException') return true
+  const cause = (error as { cause?: unknown }).cause
+  if (cause && cause !== error) return isUniqueConstraintError(cause)
+  const driverError = (error as { driverError?: unknown }).driverError
+  if (driverError && driverError !== error) return isUniqueConstraintError(driverError)
+  return false
+}
+
+async function findExistingAsnForGoodsReceipt(
+  em: EntityManager,
+  scope: { organizationId: string; tenantId: string },
+  goodsReceiptId: string,
+  sourceKey: string,
+): Promise<Asn | null> {
+  const bySourceKey = await findOneWithDecryption(
+    em,
+    Asn,
+    {
+      organizationId: scope.organizationId,
+      tenantId: scope.tenantId,
+      sourceKey,
+      deletedAt: null,
+    },
+    undefined,
+    scope,
+  )
+  if (bySourceKey) return bySourceKey
+
+  // Legacy Story-4 ASNs keyed only by referenceNumber = goodsReceiptId (no source_key).
+  return findOneWithDecryption(
+    em,
+    Asn,
+    {
+      organizationId: scope.organizationId,
+      tenantId: scope.tenantId,
+      referenceNumber: goodsReceiptId,
+      deletedAt: null,
+    },
+    undefined,
+    scope,
+  )
+}
+
+export default async function handle(payload: GoodsReceiptCreatedPayload, ctx: SubscriberContext) {
+  const tenantId = asUuid(payload.tenantId)
+  const organizationId = asUuid(payload.organizationId)
+  if (!tenantId || !organizationId) return
+
+  const featureTogglesService = tryResolve<FeatureTogglesService>(ctx, 'featureTogglesService')
+  const emRoot = tryResolve<EntityManager>(ctx, 'em')
+  const commandBus = tryResolve<CommandBus>(ctx, 'commandBus')
+  if (!featureTogglesService || !emRoot || !commandBus) return
+
+  const enabled = await resolveWmsIntegrationToggleEnabled(
+    featureTogglesService,
+    emRoot,
+    'wms_integration_procurement_goods_receipt',
+    tenantId,
+  )
+  if (!enabled) return
+
+  const warehouseId = asUuid(payload.warehouseId)
+  if (!warehouseId) {
+    logger.debug('procurement goods receipt skipped: missing warehouseId', {
+      goodsReceiptId: payload.id ?? payload.goodsReceiptId ?? null,
+    })
+    return
+  }
+
+  const goodsReceiptId = asUuid(payload.goodsReceiptId) ?? asUuid(payload.id)
+  if (!goodsReceiptId) {
+    logger.debug('procurement goods receipt skipped: missing goodsReceiptId')
+    return
+  }
+
+  const sourceKey = buildProcurementGoodsReceiptSourceKey(goodsReceiptId)
+  const referenceNumber =
+    (typeof payload.referenceNumber === 'string' && payload.referenceNumber.trim().length > 0
+      ? payload.referenceNumber.trim()
+      : null) ?? goodsReceiptId
+
+  const em = emRoot.fork()
+  const scope = { organizationId, tenantId }
+  // Match by sourceKey (any status) so retries never create a second ASN.
+  const existing = await findExistingAsnForGoodsReceipt(em, scope, goodsReceiptId, sourceKey)
+  if (existing) return
+
+  const expectedAt =
+    payload.expectedAt instanceof Date
+      ? payload.expectedAt
+      : typeof payload.expectedAt === 'string' && payload.expectedAt.trim().length > 0
+        ? new Date(payload.expectedAt)
+        : new Date()
+
+  const lines = (payload.lines ?? [])
+    .map((line) => {
+      const catalogVariantId = asUuid(line.catalogVariantId)
+      const expectedQty = toPositiveQuantity(line.expectedQty)
+      if (!catalogVariantId || expectedQty == null) return null
+      return {
+        catalogVariantId,
+        expectedQty,
+        lotNumber:
+          typeof line.lotNumber === 'string' && line.lotNumber.trim().length > 0
+            ? line.lotNumber.trim()
+            : null,
+      }
+    })
+    .filter((line): line is NonNullable<typeof line> => line !== null)
+
+  const commandCtx: CommandRuntimeContext = {
+    container: { resolve: ctx.resolve } as CommandRuntimeContext['container'],
+    auth: null,
+    organizationScope: null,
+    selectedOrganizationId: organizationId,
+    organizationIds: [organizationId],
+  }
+
+  const { translate } = await resolveTranslations()
+  const notes = translate(
+    'wms.subscribers.procurementGoodsReceipt.asnNotes',
+    'Created from procurement goods receipt {goodsReceiptId}',
+    { goodsReceiptId },
+  )
+
+  try {
+    await commandBus.execute('wms.asns.create', {
+      input: {
+        organizationId,
+        tenantId,
+        warehouseId,
+        vendorId: asUuid(payload.vendorId),
+        status: 'draft',
+        expectedAt,
+        referenceNumber,
+        sourceKey,
+        notes,
+        lines,
+        metadata: {
+          source: 'procurement.goods_receipt.created',
+          goodsReceiptId,
+        },
+      },
+      ctx: commandCtx,
+    })
+  } catch (err) {
+    // Concurrent duplicate events: unique (organization_id, source_key) wins; loser is idempotent.
+    if (isUniqueConstraintError(err)) return
+    logger.error('procurement goods receipt ASN create failed', { err, goodsReceiptId })
+    getTelemetryRuntime()?.reportError(err, {
+      module: 'wms',
+      code: 'wms.procurement_goods_receipt_asn_create_failed',
+      attributes: { goodsReceiptId },
+    })
+    throw err
+  }
+}

package/src/modules/wms/subscribers/putaway-completed-reevaluate-reservations.ts

@@ -0,0 +1,21 @@
+import { reevaluateReservationsAfterStockIncrease } from '../lib/salesOrderInventoryAutomation'
+
+export const metadata = {
+  event: 'wms.putaway.completed',
+  persistent: true,
+  id: 'wms:putaway-completed-reevaluate-reservations',
+}
+
+type SubscriberContext = {
+  resolve: <T = unknown>(name: string) => T
+}
+
+type PutawayCompletedPayload = {
+  catalogVariantId?: string | null
+  tenantId?: string | null
+  organizationId?: string | null
+}
+
+export default async function handle(payload: PutawayCompletedPayload, ctx: SubscriberContext) {
+  await reevaluateReservationsAfterStockIncrease(payload, ctx)
+}

package/src/modules/wms/widgets/injection/sales-order-stock-context/widget.client.tsx

@@ -42,6 +42,16 @@ type SalesOrderWmsPayload = {
   reservationSummary?: {
     status?: ReservationStatus
     reservationIds?: string[]
+    reservations?: Array<{
+      id?: string
+      reservationLabel?: string
+      catalogVariantId?: string
+      warehouseId?: string | null
+      warehouseName?: string | null
+      quantity?: string
+      variantName?: string | null
+      variantSku?: string | null
+    }>
   }
 }
 
@@ -113,6 +123,51 @@ export default function SalesOrderStockContextWidget(
     [wms?.stockSummary],
   )
 
+  const activeReservations = React.useMemo(() => {
+    const enriched = Array.isArray(wms?.reservationSummary?.reservations)
+      ? (wms.reservationSummary?.reservations ?? [])
+      : []
+    const fromEnriched = enriched
+      .map((item) => {
+        const id = typeof item?.id === 'string' ? item.id : null
+        if (!id) return null
+        const reservationLabel =
+          typeof item.reservationLabel === 'string' && item.reservationLabel.trim().length > 0
+            ? item.reservationLabel.trim()
+            : id
+        return {
+          id,
+          reservationLabel,
+          warehouse_name: item.warehouseName ?? null,
+          variant_name: item.variantName ?? null,
+          variant_sku: item.variantSku ?? null,
+          quantity: item.quantity ?? null,
+        }
+      })
+      .filter((item): item is NonNullable<typeof item> => item !== null)
+    if (fromEnriched.length > 0) return fromEnriched
+
+    const ids = Array.isArray(wms?.reservationSummary?.reservationIds)
+      ? (wms.reservationSummary?.reservationIds ?? [])
+      : []
+    return ids
+      .filter((id): id is string => typeof id === 'string' && id.length > 0)
+      .map((id) => ({
+        id,
+        reservationLabel: id,
+        warehouse_name: null,
+        variant_name: null,
+        variant_sku: null,
+        quantity: null,
+      }))
+  }, [wms?.reservationSummary?.reservationIds, wms?.reservationSummary?.reservations])
+
+  const releaseReservation = React.useMemo(() => {
+    if (!releaseReservationId) return null
+    const match = activeReservations.find((item) => item.id === releaseReservationId)
+    return match ?? { id: releaseReservationId }
+  }, [activeReservations, releaseReservationId])
+
   React.useEffect(() => {
     const variantIds = stockSummary
       .map((item) => item.catalogVariantId)
@@ -255,13 +310,6 @@ export default function SalesOrderStockContextWidget(
   if (!wms) return null
 
   const reservationStatus = wms.reservationSummary?.status ?? 'unreserved'
-  const reservationIds = Array.isArray(wms.reservationSummary?.reservationIds)
-    ? (wms.reservationSummary?.reservationIds ?? [])
-    : []
-
-  const releaseReservation = releaseReservationId
-    ? { id: releaseReservationId }
-    : null
 
   return (
     <div className="rounded-lg border bg-card px-4 py-3 space-y-4">
@@ -344,7 +392,7 @@ export default function SalesOrderStockContextWidget(
               'Reservation records',
             )}
           </dt>
-          <dd className="font-medium">{reservationIds.length}</dd>
+          <dd className="font-medium">{activeReservations.length}</dd>
         </div>
       </dl>
 
@@ -398,7 +446,7 @@ export default function SalesOrderStockContextWidget(
         </p>
       )}
 
-      {access.canRelease && reservationIds.length > 0 ? (
+      {access.canRelease && activeReservations.length > 0 ? (
         <div className="space-y-2">
           <p className="text-xs font-semibold uppercase tracking-wide text-muted-foreground">
             {t(
@@ -407,18 +455,20 @@ export default function SalesOrderStockContextWidget(
             )}
           </p>
           <div className="space-y-1">
-            {reservationIds.map((rid) => (
+            {activeReservations.map((reservation) => (
               <div
-                key={rid}
+                key={reservation.id}
                 className="flex items-center justify-between gap-2 rounded-md border border-border/70 bg-background px-3 py-1.5"
               >
-                <span className="font-mono text-xs text-muted-foreground truncate">{rid}</span>
+                <span className="text-xs text-foreground truncate" title={reservation.reservationLabel}>
+                  {reservation.reservationLabel}
+                </span>
                 <Button
                   type="button"
                   variant="ghost"
                   size="sm"
                   className="h-6 shrink-0 px-2 text-xs text-status-error-fg hover:text-status-error-fg"
-                  onClick={() => setReleaseReservationId(rid)}
+                  onClick={() => setReleaseReservationId(reservation.id)}
                 >
                   <ShieldOff className="size-3 mr-1" />
                   {t('wms.widgets.sales.stockContext.releaseBtn', 'Release')}