@open-mercato/core 0.6.6-develop.6290.1.4bb5a8ba3f → 0.6.6-develop.6299.1.29224e2d86

package/dist/modules/inbox_ops/api/proposals/[id]/replies/[replyId]/send/route.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../../../src/modules/inbox_ops/api/proposals/%5Bid%5D/replies/%5BreplyId%5D/send/route.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { Resend } from 'resend'\nimport { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'\nimport { resolveDefaultEmailFromAddress } from '@open-mercato/shared/lib/email/config'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { InboxProposalAction, InboxEmail } from '../../../../../../data/entities'\nimport { draftReplyPayloadSchema } from '../../../../../../data/validators'\nimport { emitInboxOpsEvent } from '../../../../../../events'\nimport { createMessageRecordForReply } from '../../../../../../lib/messagesIntegration'\nimport {\n  resolveRequestContext,\n  resolveProposal,\n  extractPathSegment,\n  handleRouteError,\n  isErrorResponse,\n} from '../../../../../routeHelpers'\n\nexport const metadata = {\n  POST: { requireAuth: true, requireFeatures: ['inbox_ops.replies.send'] },\n}\n\nexport async function POST(req: Request) {\n  try {\n    const ctx = await resolveRequestContext(req)\n    const url = new URL(req.url)\n    const proposal = await resolveProposal(url, ctx)\n    if (isErrorResponse(proposal)) return proposal\n\n    const replyId = extractPathSegment(url, 'replies')\n    if (!replyId) {\n      return NextResponse.json({ error: 'Missing reply ID' }, { status: 400 })\n    }\n\n    const action = await findOneWithDecryption(\n      ctx.em,\n      InboxProposalAction,\n      {\n        id: replyId,\n        proposalId: proposal.id,\n        actionType: 'draft_reply',\n        organizationId: ctx.organizationId,\n        tenantId: ctx.tenantId,\n        deletedAt: null,\n      },\n      undefined,\n      ctx.scope,\n    )\n\n    if (!action) {\n      return NextResponse.json({ error: 'Reply action not found' }, { status: 404 })\n    }\n\n    if (action.status !== 'executed') {\n      return NextResponse.json(\n        { error: `Cannot send reply \u2014 action must be accepted first (current status: \"${action.status}\")` },\n        { status: 409 },\n      )\n    }\n\n    const existingMetadata =\n      action.metadata && typeof action.metadata === 'object' ? action.metadata : {}\n    if ((existingMetadata as Record<string, unknown>).replySentAt) {\n      return NextResponse.json(\n        { error: 'Reply has already been sent for this action' },\n        { status: 409 },\n      )\n    }\n\n    const email = await findOneWithDecryption(\n      ctx.em,\n      InboxEmail,\n      { id: proposal.inboxEmailId, deletedAt: null },\n      undefined,\n      ctx.scope,\n    )\n\n    const payloadResult = draftReplyPayloadSchema.safeParse(action.payload)\n    if (!payloadResult.success) {\n      return NextResponse.json({ error: 'Reply payload missing required fields (to, subject, body)' }, { status: 400 })\n    }\n    const { to: toAddress, toName, subject, body } = payloadResult.data\n\n    const apiKey = process.env.RESEND_API_KEY\n    if (!apiKey) {\n      return NextResponse.json({ error: 'Email service not configured' }, { status: 503 })\n    }\n\n    const emailDisabled =\n      parseBooleanWithDefault(process.env.OM_DISABLE_EMAIL_DELIVERY, false) ||\n      parseBooleanWithDefault(process.env.OM_TEST_MODE, false)\n    if (emailDisabled) {\n      return NextResponse.json({ error: 'Email delivery is disabled' }, { status: 503 })\n    }\n\n    const { inReplyToMessageId, references: payloadReferences } = payloadResult.data\n    const fromAddress = resolveDefaultEmailFromAddress()\n    if (!fromAddress) {\n      return NextResponse.json({\n        error: 'Email sender is not configured. Set NOTIFICATIONS_EMAIL_FROM, EMAIL_FROM, or ADMIN_EMAIL.',\n      }, { status: 503 })\n    }\n\n    const headers: Record<string, string> = {}\n    const inReplyTo = inReplyToMessageId || email?.messageId\n    if (inReplyTo) {\n      headers['In-Reply-To'] = inReplyTo\n    }\n    const references = payloadReferences || (email?.emailReferences as string[])\n    if (references && references.length > 0) {\n      headers['References'] = references.join(' ')\n    }\n\n    const resend = new Resend(apiKey)\n    const { data: sendData, error: sendError } = await resend.emails.send({\n      to: toAddress,\n      from: fromAddress,\n      subject,\n      text: body,\n      ...(Object.keys(headers).length > 0 ? { headers } : {}),\n    })\n\n    if (sendError) {\n      const errorMessage = sendError.message || 'Unknown error'\n      return NextResponse.json({ error: `Failed to send email: ${errorMessage}` }, { status: 502 })\n    }\n\n    const sentMessageId = sendData?.id || null\n    const messagesResult = await createMessageRecordForReply(\n      { to: toAddress, toName, subject, body },\n      proposal.inboxEmailId,\n      {\n        container: ctx.container,\n        scope: {\n          tenantId: ctx.tenantId,\n          organizationId: ctx.organizationId,\n          userId: ctx.userId,\n        },\n      },\n    )\n\n    action.metadata = {\n      ...existingMetadata,\n      replySentAt: new Date().toISOString(),\n      sentMessageId,\n      ...(messagesResult ? { messageRecordId: messagesResult.messageId } : {}),\n    }\n    await ctx.em.flush()\n\n    try {\n      await emitInboxOpsEvent('inbox_ops.reply.sent', {\n        proposalId: proposal.id,\n        actionId: replyId,\n        tenantId: ctx.tenantId,\n        organizationId: ctx.organizationId,\n        toAddress,\n        sentMessageId,\n        messageRecordId: messagesResult?.messageId ?? null,\n      })\n    } catch (eventError) {\n      console.error('[inbox_ops:reply:send] Failed to emit event:', eventError)\n    }\n\n    return NextResponse.json({\n      ok: true,\n      sentMessageId,\n      ...(messagesResult ? { messageRecordId: messagesResult.messageId } : {}),\n    })\n  } catch (err) {\n    return handleRouteError(err, 'send reply')\n  }\n}\n\nexport const openApi: OpenApiRouteDoc = {\n  tag: 'InboxOps',\n  summary: 'Send draft reply',\n  methods: {\n    POST: {\n      summary: 'Send a draft reply email and register it in messages when available',\n      description: 'Sends the draft_reply action payload via the configured email provider. When the messages module is available, also records the sent reply as an internal message record. Sets In-Reply-To and References headers for threading.',\n      responses: [\n        { status: 200, description: 'Reply sent successfully' },\n        { status: 400, description: 'Missing required payload fields' },\n        { status: 404, description: 'Reply action not found' },\n        { status: 409, description: 'Action in invalid state for sending' },\n        { status: 502, description: 'Email delivery failed' },\n        { status: 503, description: 'Email service not configured or disabled' },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { raw } from '@mikro-orm/core'\nimport { Resend } from 'resend'\nimport { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'\nimport { resolveDefaultEmailFromAddress } from '@open-mercato/shared/lib/email/config'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { InboxProposalAction, InboxEmail } from '../../../../../../data/entities'\nimport { draftReplyPayloadSchema } from '../../../../../../data/validators'\nimport { emitInboxOpsEvent } from '../../../../../../events'\nimport { createMessageRecordForReply } from '../../../../../../lib/messagesIntegration'\nimport {\n  resolveRequestContext,\n  resolveProposal,\n  extractPathSegment,\n  handleRouteError,\n  isErrorResponse,\n} from '../../../../../routeHelpers'\n\nexport const metadata = {\n  POST: { requireAuth: true, requireFeatures: ['inbox_ops.replies.send'] },\n}\n\nexport async function POST(req: Request) {\n  try {\n    const ctx = await resolveRequestContext(req)\n    const url = new URL(req.url)\n    const proposal = await resolveProposal(url, ctx)\n    if (isErrorResponse(proposal)) return proposal\n\n    const replyId = extractPathSegment(url, 'replies')\n    if (!replyId) {\n      return NextResponse.json({ error: 'Missing reply ID' }, { status: 400 })\n    }\n\n    const action = await findOneWithDecryption(\n      ctx.em,\n      InboxProposalAction,\n      {\n        id: replyId,\n        proposalId: proposal.id,\n        actionType: 'draft_reply',\n        organizationId: ctx.organizationId,\n        tenantId: ctx.tenantId,\n        deletedAt: null,\n      },\n      undefined,\n      ctx.scope,\n    )\n\n    if (!action) {\n      return NextResponse.json({ error: 'Reply action not found' }, { status: 404 })\n    }\n\n    if (action.status !== 'executed') {\n      return NextResponse.json(\n        { error: `Cannot send reply \u2014 action must be accepted first (current status: \"${action.status}\")` },\n        { status: 409 },\n      )\n    }\n\n    const existingMetadata =\n      action.metadata && typeof action.metadata === 'object' ? action.metadata : {}\n    if ((existingMetadata as Record<string, unknown>).replySentAt) {\n      return NextResponse.json(\n        { error: 'Reply has already been sent for this action' },\n        { status: 409 },\n      )\n    }\n\n    const email = await findOneWithDecryption(\n      ctx.em,\n      InboxEmail,\n      { id: proposal.inboxEmailId, deletedAt: null },\n      undefined,\n      ctx.scope,\n    )\n\n    const payloadResult = draftReplyPayloadSchema.safeParse(action.payload)\n    if (!payloadResult.success) {\n      return NextResponse.json({ error: 'Reply payload missing required fields (to, subject, body)' }, { status: 400 })\n    }\n    const { to: toAddress, toName, subject, body } = payloadResult.data\n\n    const apiKey = process.env.RESEND_API_KEY\n    if (!apiKey) {\n      return NextResponse.json({ error: 'Email service not configured' }, { status: 503 })\n    }\n\n    const emailDisabled =\n      parseBooleanWithDefault(process.env.OM_DISABLE_EMAIL_DELIVERY, false) ||\n      parseBooleanWithDefault(process.env.OM_TEST_MODE, false)\n    if (emailDisabled) {\n      return NextResponse.json({ error: 'Email delivery is disabled' }, { status: 503 })\n    }\n\n    const { inReplyToMessageId, references: payloadReferences } = payloadResult.data\n    const fromAddress = resolveDefaultEmailFromAddress()\n    if (!fromAddress) {\n      return NextResponse.json({\n        error: 'Email sender is not configured. Set NOTIFICATIONS_EMAIL_FROM, EMAIL_FROM, or ADMIN_EMAIL.',\n      }, { status: 503 })\n    }\n\n    const headers: Record<string, string> = {}\n    const inReplyTo = inReplyToMessageId || email?.messageId\n    if (inReplyTo) {\n      headers['In-Reply-To'] = inReplyTo\n    }\n    const references = payloadReferences || (email?.emailReferences as string[])\n    if (references && references.length > 0) {\n      headers['References'] = references.join(' ')\n    }\n\n    // Atomically claim the send right before calling the external email provider so\n    // two concurrent requests cannot both deliver the same reply. The claim only\n    // succeeds when neither replySentAt nor replySendClaimedAt is already set in the\n    // metadata; a losing request gets 0 rows back and is rejected with 409.\n    const sendClaimedAt = new Date().toISOString()\n    const claimed = await ctx.em.nativeUpdate(\n      InboxProposalAction,\n      {\n        id: action.id,\n        proposalId: proposal.id,\n        actionType: 'draft_reply',\n        organizationId: ctx.organizationId,\n        tenantId: ctx.tenantId,\n        deletedAt: null,\n        status: 'executed',\n        [raw(`coalesce(\"metadata\"->>'replySentAt', '')`)]: '',\n        [raw(`coalesce(\"metadata\"->>'replySendClaimedAt', '')`)]: '',\n      },\n      {\n        metadata: raw(\n          `coalesce(\"metadata\", '{}'::jsonb) || jsonb_build_object('replySendClaimedAt', ?::text)`,\n          [sendClaimedAt],\n        ),\n      },\n    )\n\n    if (claimed === 0) {\n      return NextResponse.json(\n        { error: 'Reply send is already in progress or has been sent for this action' },\n        { status: 409 },\n      )\n    }\n\n    const releaseSendClaim = async () => {\n      try {\n        await ctx.em.nativeUpdate(\n          InboxProposalAction,\n          {\n            id: action.id,\n            organizationId: ctx.organizationId,\n            tenantId: ctx.tenantId,\n            [raw(`coalesce(\"metadata\"->>'replySentAt', '')`)]: '',\n            [raw(`(\"metadata\"->>'replySendClaimedAt')`)]: sendClaimedAt,\n          },\n          { metadata: raw(`\"metadata\" - 'replySendClaimedAt'`) },\n        )\n      } catch (releaseError) {\n        console.error('[inbox_ops:reply:send] Failed to release send claim:', releaseError)\n      }\n    }\n\n    const resend = new Resend(apiKey)\n    const { data: sendData, error: sendError } = await resend.emails.send({\n      to: toAddress,\n      from: fromAddress,\n      subject,\n      text: body,\n      ...(Object.keys(headers).length > 0 ? { headers } : {}),\n    })\n\n    if (sendError) {\n      await releaseSendClaim()\n      const errorMessage = sendError.message || 'Unknown error'\n      return NextResponse.json({ error: `Failed to send email: ${errorMessage}` }, { status: 502 })\n    }\n\n    const sentMessageId = sendData?.id || null\n    const messagesResult = await createMessageRecordForReply(\n      { to: toAddress, toName, subject, body },\n      proposal.inboxEmailId,\n      {\n        container: ctx.container,\n        scope: {\n          tenantId: ctx.tenantId,\n          organizationId: ctx.organizationId,\n          userId: ctx.userId,\n        },\n      },\n    )\n\n    action.metadata = {\n      ...existingMetadata,\n      replySentAt: new Date().toISOString(),\n      sentMessageId,\n      ...(messagesResult ? { messageRecordId: messagesResult.messageId } : {}),\n    }\n    await ctx.em.flush()\n\n    try {\n      await emitInboxOpsEvent('inbox_ops.reply.sent', {\n        proposalId: proposal.id,\n        actionId: replyId,\n        tenantId: ctx.tenantId,\n        organizationId: ctx.organizationId,\n        toAddress,\n        sentMessageId,\n        messageRecordId: messagesResult?.messageId ?? null,\n      })\n    } catch (eventError) {\n      console.error('[inbox_ops:reply:send] Failed to emit event:', eventError)\n    }\n\n    return NextResponse.json({\n      ok: true,\n      sentMessageId,\n      ...(messagesResult ? { messageRecordId: messagesResult.messageId } : {}),\n    })\n  } catch (err) {\n    return handleRouteError(err, 'send reply')\n  }\n}\n\nexport const openApi: OpenApiRouteDoc = {\n  tag: 'InboxOps',\n  summary: 'Send draft reply',\n  methods: {\n    POST: {\n      summary: 'Send a draft reply email and register it in messages when available',\n      description: 'Sends the draft_reply action payload via the configured email provider. When the messages module is available, also records the sent reply as an internal message record. Sets In-Reply-To and References headers for threading.',\n      responses: [\n        { status: 200, description: 'Reply sent successfully' },\n        { status: 400, description: 'Missing required payload fields' },\n        { status: 404, description: 'Reply action not found' },\n        { status: 409, description: 'Action in invalid state for sending, or a send is already in progress / completed for this reply' },\n        { status: 502, description: 'Email delivery failed' },\n        { status: 503, description: 'Email service not configured or disabled' },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/generated/entities/module_config/index.ts

@@ -2,5 +2,7 @@ export const id = "id";
 export const module_id = "module_id";
 export const name = "name";
 export const value_json = "value_json";
+export const organization_id = "organization_id";
+export const tenant_id = "tenant_id";
 export const created_at = "created_at";
 export const updated_at = "updated_at";

package/generated/entity-fields-registry.ts

@@ -1541,6 +1541,8 @@ export const entityFieldsRegistry: Record<string, Record<string, string>> = {
       "module_id": "module_id",
       "name": "name",
       "value_json": "value_json",
+      "organization_id": "organization_id",
+      "tenant_id": "tenant_id",
       "created_at": "created_at",
       "updated_at": "updated_at"
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.6-develop.6290.1.4bb5a8ba3f",
+  "version": "0.6.6-develop.6299.1.29224e2d86",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -246,16 +246,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6290.1.4bb5a8ba3f",
-    "@open-mercato/shared": "0.6.6-develop.6290.1.4bb5a8ba3f",
-    "@open-mercato/ui": "0.6.6-develop.6290.1.4bb5a8ba3f",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6299.1.29224e2d86",
+    "@open-mercato/shared": "0.6.6-develop.6299.1.29224e2d86",
+    "@open-mercato/ui": "0.6.6-develop.6299.1.29224e2d86",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6290.1.4bb5a8ba3f",
-    "@open-mercato/shared": "0.6.6-develop.6290.1.4bb5a8ba3f",
-    "@open-mercato/ui": "0.6.6-develop.6290.1.4bb5a8ba3f",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6299.1.29224e2d86",
+    "@open-mercato/shared": "0.6.6-develop.6299.1.29224e2d86",
+    "@open-mercato/ui": "0.6.6-develop.6299.1.29224e2d86",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/modules/auth/lib/setup-app.ts

@@ -300,7 +300,7 @@ export async function setupInitialTenant(
 
     await em.transactional(async (tem) => {
       const tenant = tem.create(Tenant, {
-        name: `${options.orgName} Tenant`,
+        name: options.orgName,
         isActive: true,
         createdAt: new Date(),
         updatedAt: new Date(),

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/configs/data/entities.ts

@@ -2,7 +2,17 @@ import { OptionalProps } from '@mikro-orm/core'
 import { Entity, Index, PrimaryKey, Property, Unique } from '@mikro-orm/decorators/legacy'
 
 @Entity({ tableName: 'module_configs' })
-@Unique({ name: 'module_configs_module_name_unique', properties: ['moduleId', 'name'] })
+@Index({
+  name: 'module_configs_global_unique',
+  expression:
+    'create unique index "module_configs_global_unique" on "module_configs" ("module_id", "name") where "tenant_id" is null',
+})
+@Index({
+  name: 'module_configs_scoped_unique',
+  expression:
+    'create unique index "module_configs_scoped_unique" on "module_configs" ("module_id", "name", "tenant_id") where "tenant_id" is not null',
+})
+@Index({ name: 'module_configs_module_name_tenant_idx', properties: ['moduleId', 'name', 'tenantId'] })
 export class ModuleConfig {
   [OptionalProps]?: 'createdAt' | 'updatedAt'
 
@@ -18,6 +28,12 @@ export class ModuleConfig {
   @Property({ name: 'value_json', type: 'json', nullable: true })
   valueJson!: unknown
 
+  @Property({ name: 'organization_id', type: 'uuid', nullable: true })
+  organizationId?: string | null
+
+  @Property({ name: 'tenant_id', type: 'uuid', nullable: true })
+  tenantId?: string | null
+
   @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
   createdAt: Date = new Date()