@open-mercato/core 0.6.6-develop.6286.1.d985c5c374 → 0.6.6-develop.6296.1.5e8bdfee17

package/src/modules/catalog/components/products/ProductComplianceSection.tsx

@@ -29,9 +29,26 @@ type ProductComplianceSectionProps = {
   embedded?: boolean;
 };
 
-function FieldError({ message }: { message?: string }) {
+function fieldErrorId(inputId: string) {
+  return `${inputId}-error`;
+}
+
+function describedByError(
+  inputId: string,
+  message?: string,
+): { "aria-invalid"?: true; "aria-describedby"?: string } {
+  return message
+    ? { "aria-invalid": true, "aria-describedby": fieldErrorId(inputId) }
+    : {};
+}
+
+function FieldError({ id, message }: { id: string; message?: string }) {
   if (!message) return null;
-  return <p className="text-xs text-destructive">{message}</p>;
+  return (
+    <p id={id} className="text-xs text-destructive">
+      {message}
+    </p>
+  );
 }
 
 export function ProductComplianceSection({
@@ -85,8 +102,12 @@ export function ProductComplianceSection({
               onChange={(event) =>
                 setValue("countryOfOriginCode", event.target.value.toUpperCase())
               }
+              {...describedByError("catalog-product-compliance-country", errors.countryOfOriginCode)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-country")}
+              message={errors.countryOfOriginCode}
             />
-            <FieldError message={errors.countryOfOriginCode} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-tax-classification">
@@ -96,8 +117,12 @@ export function ProductComplianceSection({
               id="catalog-product-compliance-tax-classification"
               value={values.taxClassificationCode ?? ""}
               onChange={(event) => setValue("taxClassificationCode", event.target.value)}
+              {...describedByError("catalog-product-compliance-tax-classification", errors.taxClassificationCode)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-tax-classification")}
+              message={errors.taxClassificationCode}
             />
-            <FieldError message={errors.taxClassificationCode} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-pkwiu">
@@ -107,8 +132,12 @@ export function ProductComplianceSection({
               id="catalog-product-compliance-pkwiu"
               value={values.pkwiuCode ?? ""}
               onChange={(event) => setValue("pkwiuCode", event.target.value)}
+              {...describedByError("catalog-product-compliance-pkwiu", errors.pkwiuCode)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-pkwiu")}
+              message={errors.pkwiuCode}
             />
-            <FieldError message={errors.pkwiuCode} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-cn">
@@ -118,8 +147,12 @@ export function ProductComplianceSection({
               id="catalog-product-compliance-cn"
               value={values.cnCode ?? ""}
               onChange={(event) => setValue("cnCode", event.target.value)}
+              {...describedByError("catalog-product-compliance-cn", errors.cnCode)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-cn")}
+              message={errors.cnCode}
             />
-            <FieldError message={errors.cnCode} />
           </div>
           <div className="space-y-2 md:col-span-2">
             <Label htmlFor="catalog-product-compliance-hs">
@@ -129,13 +162,24 @@ export function ProductComplianceSection({
               id="catalog-product-compliance-hs"
               value={values.hsCode ?? ""}
               onChange={(event) => setValue("hsCode", event.target.value)}
+              {...describedByError("catalog-product-compliance-hs", errors.hsCode)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-hs")}
+              message={errors.hsCode}
             />
-            <FieldError message={errors.hsCode} />
           </div>
         </div>
         <div className="space-y-2">
-          <Label>{t("catalog.products.compliance.fields.gtuCodes", "GTU codes (JPK_V7)")}</Label>
-          <div className="grid gap-2 sm:grid-cols-3 md:grid-cols-4">
+          <Label id="catalog-product-compliance-gtu-label">
+            {t("catalog.products.compliance.fields.gtuCodes", "GTU codes (JPK_V7)")}
+          </Label>
+          <div
+            role="group"
+            aria-labelledby="catalog-product-compliance-gtu-label"
+            className="grid gap-2 sm:grid-cols-3 md:grid-cols-4"
+            {...describedByError("catalog-product-compliance-gtu", errors.gtuCodes)}
+          >
             {CATALOG_GTU_CODES.map((code) => (
               <label
                 key={code}
@@ -151,7 +195,10 @@ export function ProductComplianceSection({
               </label>
             ))}
           </div>
-          <FieldError message={errors.gtuCodes} />
+          <FieldError
+            id={fieldErrorId("catalog-product-compliance-gtu")}
+            message={errors.gtuCodes}
+          />
         </div>
       </div>
 
@@ -179,8 +226,12 @@ export function ProductComplianceSection({
               max={120}
               value={values.ageMin ?? ""}
               onChange={(event) => setValue("ageMin", event.target.value)}
+              {...describedByError("catalog-product-compliance-age-min", errors.ageMin)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-age-min")}
+              message={errors.ageMin}
             />
-            <FieldError message={errors.ageMin} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-excise-category">
@@ -192,7 +243,10 @@ export function ProductComplianceSection({
                 setValue("exciseCategory", value === NONE_OPTION ? null : value)
               }
             >
-              <SelectTrigger id="catalog-product-compliance-excise-category">
+              <SelectTrigger
+                id="catalog-product-compliance-excise-category"
+                {...describedByError("catalog-product-compliance-excise-category", errors.exciseCategory)}
+              >
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
@@ -206,7 +260,10 @@ export function ProductComplianceSection({
                 ))}
               </SelectContent>
             </Select>
-            <FieldError message={errors.exciseCategory} />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-excise-category")}
+              message={errors.exciseCategory}
+            />
           </div>
         </div>
         <div className="grid gap-2 sm:grid-cols-2">
@@ -253,8 +310,12 @@ export function ProductComplianceSection({
               id="catalog-product-compliance-hazmat-class"
               value={values.hazmatClass ?? ""}
               onChange={(event) => setValue("hazmatClass", event.target.value)}
+              {...describedByError("catalog-product-compliance-hazmat-class", errors.hazmatClass)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-hazmat-class")}
+              message={errors.hazmatClass}
             />
-            <FieldError message={errors.hazmatClass} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-un-number">
@@ -265,8 +326,12 @@ export function ProductComplianceSection({
               placeholder={t("catalog.products.compliance.placeholders.unNumber", "UN1234")}
               value={values.unNumber ?? ""}
               onChange={(event) => setValue("unNumber", event.target.value)}
+              {...describedByError("catalog-product-compliance-un-number", errors.unNumber)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-un-number")}
+              message={errors.unNumber}
             />
-            <FieldError message={errors.unNumber} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-packing-group">
@@ -278,7 +343,10 @@ export function ProductComplianceSection({
                 setValue("hazmatPackingGroup", value === NONE_OPTION ? null : value)
               }
             >
-              <SelectTrigger id="catalog-product-compliance-packing-group">
+              <SelectTrigger
+                id="catalog-product-compliance-packing-group"
+                {...describedByError("catalog-product-compliance-packing-group", errors.hazmatPackingGroup)}
+              >
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
@@ -292,7 +360,10 @@ export function ProductComplianceSection({
                 ))}
               </SelectContent>
             </Select>
-            <FieldError message={errors.hazmatPackingGroup} />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-packing-group")}
+              message={errors.hazmatPackingGroup}
+            />
           </div>
         </div>
       </div>
@@ -319,8 +390,12 @@ export function ProductComplianceSection({
               type="date"
               value={values.launchAt ?? ""}
               onChange={(event) => setValue("launchAt", event.target.value)}
+              {...describedByError("catalog-product-compliance-launch-at", errors.launchAt)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-launch-at")}
+              message={errors.launchAt}
             />
-            <FieldError message={errors.launchAt} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-eol-at">
@@ -331,8 +406,12 @@ export function ProductComplianceSection({
               type="date"
               value={values.endOfLifeAt ?? ""}
               onChange={(event) => setValue("endOfLifeAt", event.target.value)}
+              {...describedByError("catalog-product-compliance-eol-at", errors.endOfLifeAt)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-eol-at")}
+              message={errors.endOfLifeAt}
             />
-            <FieldError message={errors.endOfLifeAt} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-available-from">
@@ -343,8 +422,12 @@ export function ProductComplianceSection({
               type="date"
               value={values.availableFrom ?? ""}
               onChange={(event) => setValue("availableFrom", event.target.value)}
+              {...describedByError("catalog-product-compliance-available-from", errors.availableFrom)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-available-from")}
+              message={errors.availableFrom}
             />
-            <FieldError message={errors.availableFrom} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-available-until">
@@ -355,8 +438,12 @@ export function ProductComplianceSection({
               type="date"
               value={values.availableUntil ?? ""}
               onChange={(event) => setValue("availableUntil", event.target.value)}
+              {...describedByError("catalog-product-compliance-available-until", errors.availableUntil)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-available-until")}
+              message={errors.availableUntil}
             />
-            <FieldError message={errors.availableUntil} />
           </div>
         </div>
         <label
@@ -395,8 +482,12 @@ export function ProductComplianceSection({
               min={1}
               value={values.minOrderQty ?? ""}
               onChange={(event) => setValue("minOrderQty", event.target.value)}
+              {...describedByError("catalog-product-compliance-min-qty", errors.minOrderQty)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-min-qty")}
+              message={errors.minOrderQty}
             />
-            <FieldError message={errors.minOrderQty} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-max-qty">
@@ -408,8 +499,12 @@ export function ProductComplianceSection({
               min={1}
               value={values.maxOrderQty ?? ""}
               onChange={(event) => setValue("maxOrderQty", event.target.value)}
+              {...describedByError("catalog-product-compliance-max-qty", errors.maxOrderQty)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-max-qty")}
+              message={errors.maxOrderQty}
             />
-            <FieldError message={errors.maxOrderQty} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-qty-increment">
@@ -421,8 +516,12 @@ export function ProductComplianceSection({
               min={1}
               value={values.orderQtyIncrement ?? ""}
               onChange={(event) => setValue("orderQtyIncrement", event.target.value)}
+              {...describedByError("catalog-product-compliance-qty-increment", errors.orderQtyIncrement)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-qty-increment")}
+              message={errors.orderQtyIncrement}
             />
-            <FieldError message={errors.orderQtyIncrement} />
           </div>
         </div>
         <label
@@ -460,8 +559,12 @@ export function ProductComplianceSection({
               maxLength={255}
               value={values.seoTitle ?? ""}
               onChange={(event) => setValue("seoTitle", event.target.value)}
+              {...describedByError("catalog-product-compliance-seo-title", errors.seoTitle)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-seo-title")}
+              message={errors.seoTitle}
             />
-            <FieldError message={errors.seoTitle} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-seo-description">
@@ -473,8 +576,12 @@ export function ProductComplianceSection({
               maxLength={1000}
               value={values.seoDescription ?? ""}
               onChange={(event) => setValue("seoDescription", event.target.value)}
+              {...describedByError("catalog-product-compliance-seo-description", errors.seoDescription)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-seo-description")}
+              message={errors.seoDescription}
             />
-            <FieldError message={errors.seoDescription} />
           </div>
           <div className="space-y-2">
             <Label htmlFor="catalog-product-compliance-canonical-url">
@@ -487,8 +594,12 @@ export function ProductComplianceSection({
               placeholder="https://"
               value={values.canonicalUrl ?? ""}
               onChange={(event) => setValue("canonicalUrl", event.target.value)}
+              {...describedByError("catalog-product-compliance-canonical-url", errors.canonicalUrl)}
+            />
+            <FieldError
+              id={fieldErrorId("catalog-product-compliance-canonical-url")}
+              message={errors.canonicalUrl}
             />
-            <FieldError message={errors.canonicalUrl} />
           </div>
         </div>
       </div>

package/src/modules/configs/components/CachePanel.tsx

@@ -4,6 +4,7 @@ import * as React from 'react'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { ErrorMessage } from '@open-mercato/ui/backend/detail'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -248,9 +249,7 @@ export function CachePanel() {
             {t('configs.cache.description', 'Inspect cached responses and clear segments when necessary.')}
           </p>
         </header>
-        <div className="rounded border border-red-200 bg-red-50 p-3 text-sm text-red-700">
-          {state.error}
-        </div>
+        <ErrorMessage label={state.error} />
         <div className="flex flex-wrap gap-2">
           <Button variant="outline" type="button" onClick={handleRefresh}>
             {t('configs.cache.retry', 'Retry')}

package/src/modules/configs/components/SystemStatusPanel.tsx

@@ -3,6 +3,8 @@
 import * as React from 'react'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
+import { StatusBadge, type StatusMap } from '@open-mercato/ui/primitives/status-badge'
+import { ErrorMessage } from '@open-mercato/ui/backend/detail'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import type {
@@ -23,12 +25,12 @@ const STATUS_LABEL_KEYS: Record<SystemStatusState, string> = {
   unknown: 'configs.systemStatus.state.unknown',
 }
 
-const STATUS_BADGE_CLASSES: Record<SystemStatusState, string> = {
-  enabled: 'border border-emerald-300 bg-emerald-50 text-emerald-700',
-  disabled: 'border border-slate-300 bg-slate-100 text-slate-700',
-  set: 'border border-blue-300 bg-blue-50 text-blue-700',
-  unset: 'border border-dashed border-slate-200 text-slate-500',
-  unknown: 'border border-amber-300 bg-amber-50 text-amber-700',
+const STATUS_BADGE_VARIANTS: StatusMap<SystemStatusState> = {
+  enabled: 'success',
+  disabled: 'neutral',
+  set: 'info',
+  unset: 'neutral',
+  unknown: 'warning',
 }
 
 const RUNTIME_MODE_LABEL_KEYS: Record<SystemStatusRuntimeMode, string> = {
@@ -84,15 +86,6 @@ function renderEnvAssignment(
   )
 }
 
-function StatusBadge({ state }: { state: SystemStatusState }) {
-  const t = useT()
-  return (
-    <span className={`inline-flex items-center rounded-full px-3 py-1 text-xs font-medium ${STATUS_BADGE_CLASSES[state]}`}>
-      {t(STATUS_LABEL_KEYS[state])}
-    </span>
-  )
-}
-
 type FetchState = {
   loading: boolean
   error: string | null
@@ -163,9 +156,7 @@ export function SystemStatusPanel() {
             )}
           </p>
         </header>
-        <div className="rounded border border-red-200 bg-red-50 p-3 text-sm text-red-700">
-          {state.error}
-        </div>
+        <ErrorMessage label={state.error} />
         <Button type="button" variant="outline" onClick={() => loadSnapshot().catch(() => {})}>
           {t('configs.systemStatus.retry', 'Retry')}
         </Button>
@@ -215,7 +206,9 @@ export function SystemStatusPanel() {
                       <h4 className="text-sm font-semibold">{t(item.labelKey)}</h4>
                       <p className="text-xs text-muted-foreground">{t(item.descriptionKey)}</p>
                     </div>
-                    <StatusBadge state={item.state} />
+                    <StatusBadge variant={STATUS_BADGE_VARIANTS[item.state]}>
+                      {t(STATUS_LABEL_KEYS[item.state])}
+                    </StatusBadge>
                   </div>
                   <dl className="grid gap-3 text-sm sm:grid-cols-2">
                     <div className="space-y-1">

package/src/modules/data_sync/workers/sync-scheduled.ts

@@ -2,9 +2,10 @@ import type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import type { IntegrationStateService } from '../../integrations/lib/state-service'
+import type { ProgressService } from '../../progress/lib/progressService'
 import type { SyncRunService } from '../lib/sync-run-service'
 import { SyncSchedule } from '../data/entities'
-import { getSyncQueue } from '../lib/queue'
+import { startDataSyncRun } from '../lib/start-run'
 
 type ScheduledSyncPayload = {
   scheduleId: string
@@ -27,6 +28,7 @@ type HandlerContext = JobContext & {
 export default async function handle(job: QueuedJob<ScheduledSyncPayload>, ctx: HandlerContext): Promise<void> {
   const em = ctx.resolve<EntityManager>('em')
   const syncRunService = ctx.resolve<SyncRunService>('dataSyncRunService')
+  const progressService = ctx.resolve<ProgressService>('progressService')
   const integrationStateService = ctx.resolve<IntegrationStateService>('integrationStateService')
 
   const schedule = await findOneWithDecryption(
@@ -70,22 +72,19 @@ export default async function handle(job: QueuedJob<ScheduledSyncPayload>, ctx:
         job.payload.scope,
       )
 
-  const run = await syncRunService.createRun({
-    integrationId: schedule.integrationId,
-    entityType: schedule.entityType,
-    direction: schedule.direction,
-    cursor,
-    triggeredBy: 'scheduler',
-  }, job.payload.scope)
-
   schedule.lastRunAt = new Date()
   await em.flush()
 
-  const queueName = schedule.direction === 'import' ? 'data-sync-import' : 'data-sync-export'
-  const queue = getSyncQueue(queueName)
-  await queue.enqueue({
-    runId: run.id,
-    batchSize: 100,
+  await startDataSyncRun({
+    syncRunService,
+    progressService,
     scope: job.payload.scope,
+    input: {
+      integrationId: schedule.integrationId,
+      entityType: schedule.entityType,
+      direction: schedule.direction,
+      cursor,
+      triggeredBy: 'scheduler',
+    },
   })
 }

package/src/modules/directory/components/TenantSelect.tsx

@@ -57,21 +57,11 @@ function filterTenantsByStatus(list: TenantRecord[], status: 'all' | 'active' |
   return list
 }
 
-async function fetchDirectoryTenants(status: 'all' | 'active' | 'inactive', errorMessage: string): Promise<TenantRecord[]> {
-  const search = new URLSearchParams()
-  search.set('page', '1')
-  search.set('pageSize', '100')
-  search.set('sortField', 'name')
-  search.set('sortDir', 'asc')
-  if (status === 'active') search.set('isActive', 'true')
-  if (status === 'inactive') search.set('isActive', 'false')
-  const json = await readApiResultOrThrow<{ items?: unknown[] }>(
-    `/api/directory/tenants?${search.toString()}`,
-    undefined,
-    { errorMessage, allowNullResult: true },
-  )
-  const items = Array.isArray(json?.items) ? json.items : []
-  const normalized = items
+const DIRECTORY_TENANTS_PAGE_SIZE = 100
+const DIRECTORY_TENANTS_MAX_PAGES = 200
+
+function normalizeTenantItems(items: unknown[]): TenantRecord[] {
+  return items
     .map((item: unknown): TenantRecord | null => {
       if (!item || typeof item !== 'object') return null
       const entry = item as Record<string, unknown>
@@ -84,7 +74,34 @@ async function fetchDirectoryTenants(status: 'all' | 'active' | 'inactive', erro
       return { id, name, isActive }
     })
     .filter((tenant: TenantRecord | null): tenant is TenantRecord => tenant !== null)
-  return mergeTenantLists(filterTenantsByStatus(normalized, status))
+}
+
+async function fetchDirectoryTenants(status: 'all' | 'active' | 'inactive', errorMessage: string): Promise<TenantRecord[]> {
+  const collected: TenantRecord[] = []
+  let page = 1
+  let totalPages = 1
+  do {
+    const search = new URLSearchParams()
+    search.set('page', String(page))
+    search.set('pageSize', String(DIRECTORY_TENANTS_PAGE_SIZE))
+    search.set('sortField', 'name')
+    search.set('sortDir', 'asc')
+    if (status === 'active') search.set('isActive', 'true')
+    if (status === 'inactive') search.set('isActive', 'false')
+    const json = await readApiResultOrThrow<{ items?: unknown[]; totalPages?: unknown }>(
+      `/api/directory/tenants?${search.toString()}`,
+      undefined,
+      { errorMessage, allowNullResult: true },
+    )
+    const items = Array.isArray(json?.items) ? json.items : []
+    collected.push(...normalizeTenantItems(items))
+    totalPages = typeof json?.totalPages === 'number' && Number.isFinite(json.totalPages)
+      ? Math.max(1, Math.floor(json.totalPages))
+      : 1
+    if (items.length < DIRECTORY_TENANTS_PAGE_SIZE) break
+    page += 1
+  } while (page <= totalPages && page <= DIRECTORY_TENANTS_MAX_PAGES)
+  return mergeTenantLists(filterTenantsByStatus(collected, status))
 }
 
 async function fetchTenantsFromOrganizationSwitcher(status: 'all' | 'active' | 'inactive', errorMessage: string): Promise<TenantRecord[]> {

package/src/modules/inbox_ops/api/proposals/[id]/replies/[replyId]/send/route.ts

@@ -1,4 +1,5 @@
 import { NextResponse } from 'next/server'
+import { raw } from '@mikro-orm/core'
 import { Resend } from 'resend'
 import { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'
 import { resolveDefaultEmailFromAddress } from '@open-mercato/shared/lib/email/config'
@@ -111,6 +112,57 @@ export async function POST(req: Request) {
       headers['References'] = references.join(' ')
     }
 
+    // Atomically claim the send right before calling the external email provider so
+    // two concurrent requests cannot both deliver the same reply. The claim only
+    // succeeds when neither replySentAt nor replySendClaimedAt is already set in the
+    // metadata; a losing request gets 0 rows back and is rejected with 409.
+    const sendClaimedAt = new Date().toISOString()
+    const claimed = await ctx.em.nativeUpdate(
+      InboxProposalAction,
+      {
+        id: action.id,
+        proposalId: proposal.id,
+        actionType: 'draft_reply',
+        organizationId: ctx.organizationId,
+        tenantId: ctx.tenantId,
+        deletedAt: null,
+        status: 'executed',
+        [raw(`coalesce("metadata"->>'replySentAt', '')`)]: '',
+        [raw(`coalesce("metadata"->>'replySendClaimedAt', '')`)]: '',
+      },
+      {
+        metadata: raw(
+          `coalesce("metadata", '{}'::jsonb) || jsonb_build_object('replySendClaimedAt', ?::text)`,
+          [sendClaimedAt],
+        ),
+      },
+    )
+
+    if (claimed === 0) {
+      return NextResponse.json(
+        { error: 'Reply send is already in progress or has been sent for this action' },
+        { status: 409 },
+      )
+    }
+
+    const releaseSendClaim = async () => {
+      try {
+        await ctx.em.nativeUpdate(
+          InboxProposalAction,
+          {
+            id: action.id,
+            organizationId: ctx.organizationId,
+            tenantId: ctx.tenantId,
+            [raw(`coalesce("metadata"->>'replySentAt', '')`)]: '',
+            [raw(`("metadata"->>'replySendClaimedAt')`)]: sendClaimedAt,
+          },
+          { metadata: raw(`"metadata" - 'replySendClaimedAt'`) },
+        )
+      } catch (releaseError) {
+        console.error('[inbox_ops:reply:send] Failed to release send claim:', releaseError)
+      }
+    }
+
     const resend = new Resend(apiKey)
     const { data: sendData, error: sendError } = await resend.emails.send({
       to: toAddress,
@@ -121,6 +173,7 @@ export async function POST(req: Request) {
     })
 
     if (sendError) {
+      await releaseSendClaim()
       const errorMessage = sendError.message || 'Unknown error'
       return NextResponse.json({ error: `Failed to send email: ${errorMessage}` }, { status: 502 })
     }
@@ -182,7 +235,7 @@ export const openApi: OpenApiRouteDoc = {
         { status: 200, description: 'Reply sent successfully' },
         { status: 400, description: 'Missing required payload fields' },
         { status: 404, description: 'Reply action not found' },
-        { status: 409, description: 'Action in invalid state for sending' },
+        { status: 409, description: 'Action in invalid state for sending, or a send is already in progress / completed for this reply' },
         { status: 502, description: 'Email delivery failed' },
         { status: 503, description: 'Email service not configured or disabled' },
       ],

package/src/modules/portal/frontend/[orgSlug]/portal/dashboard/hiddenWidgetsStorage.ts

@@ -0,0 +1,36 @@
+import {
+  readVersionedPreference,
+  writeVersionedPreference,
+  clearVersionedPreference,
+} from '@open-mercato/shared/lib/browser/versionedPreference'
+
+const LEGACY_HIDDEN_WIDGETS_KEY = 'om:portal:dashboard:hidden'
+const HIDDEN_WIDGETS_KEY_PREFIX = 'om:portal:dashboard:hidden:v1:'
+const HIDDEN_WIDGETS_VERSION = 1
+
+function buildHiddenWidgetsKey(orgSlug: string, userId: string): string {
+  return `${HIDDEN_WIDGETS_KEY_PREFIX}${orgSlug}:${userId}`
+}
+
+function isStringArray(value: unknown): value is string[] {
+  return Array.isArray(value) && value.every((id) => typeof id === 'string')
+}
+
+export function loadHiddenWidgets(orgSlug: string, userId: string): Set<string> {
+  const hidden = readVersionedPreference<string[]>(
+    buildHiddenWidgetsKey(orgSlug, userId),
+    HIDDEN_WIDGETS_VERSION,
+    isStringArray,
+    [],
+  )
+  return new Set(hidden)
+}
+
+export function saveHiddenWidgets(orgSlug: string, userId: string, hidden: Set<string>): void {
+  writeVersionedPreference(buildHiddenWidgetsKey(orgSlug, userId), HIDDEN_WIDGETS_VERSION, Array.from(hidden))
+}
+
+/** Drops the pre-scoping global key so stale preferences stop leaking across org/user contexts. */
+export function clearLegacyHiddenWidgetsKey(): void {
+  clearVersionedPreference(LEGACY_HIDDEN_WIDGETS_KEY)
+}