@open-mercato/core 0.6.7 → 0.6.8-develop.6875.1.871a4afc94

package/src/modules/business_rules/lib/action-executor.ts

@@ -1,5 +1,12 @@
+import type { EntityManager as PostgreSqlEntityManager } from '@mikro-orm/postgresql'
 import type { EvaluationContext } from './expression-evaluator'
 import { getNestedValue, resolveSpecialValue } from './value-resolver'
+import {
+  findOpenMercatoEndpointOption,
+  getCurrentOpenMercatoEndpointOptions,
+  resolveOpenMercatoApiKeyProfile,
+} from './openmercato-call-options'
+import type { OpenMercatoEndpointOption } from './openmercato-call-options-types'
 
 /**
  * Action definition
@@ -19,6 +26,11 @@ export interface ActionContext extends EvaluationContext {
   data?: any
   ruleId?: string
   ruleName?: string
+  tenantId?: string
+  organizationId?: string
+  executedBy?: string | null
+  em?: PostgreSqlEntityManager
+  openMercatoEndpointOptions?: OpenMercatoEndpointOption[]
   [key: string]: any
 }
 
@@ -85,6 +97,19 @@ export interface CallWebhookResult {
   status: 'pending'
 }
 
+export interface CallOpenMercatoResult {
+  type: 'CALL_OPEN_MERCATO'
+  endpoint: string
+  method: string
+  apiKeyId: string
+  status: number
+  statusText: string
+  body: any
+  authenticated: true
+  tenantId: string
+  organizationId: string
+}
+
 export interface EmitEventResult {
   type: 'EMIT_EVENT'
   event: string
@@ -104,6 +129,7 @@ export type ActionHandlerResult =
   | NotifyResult
   | SetFieldResult
   | CallWebhookResult
+  | CallOpenMercatoResult
   | EmitEventResult
 
 /**
@@ -219,6 +245,7 @@ function getActionHandler(actionType: string): ActionHandler {
     NOTIFY: handleNotify,
     SET_FIELD: handleSetField,
     CALL_WEBHOOK: handleCallWebhook,
+    CALL_OPEN_MERCATO: handleCallOpenMercato,
     EMIT_EVENT: handleEmitEvent,
   }
 
@@ -397,6 +424,119 @@ async function handleCallWebhook(
   }
 }
 
+/**
+ * CALL_OPEN_MERCATO action handler
+ */
+async function handleCallOpenMercato(
+  action: Action,
+  context: ActionContext
+): Promise<CallOpenMercatoResult> {
+  const endpoint = String(action.config?.endpoint ?? '').trim()
+  const method = String(action.config?.method ?? '').trim().toUpperCase()
+  const apiKeyId = String(action.config?.apiKeyId ?? '').trim()
+
+  if (!endpoint) {
+    throw new Error('CALL_OPEN_MERCATO action requires an endpoint')
+  }
+  if (!method) {
+    throw new Error('CALL_OPEN_MERCATO action requires an HTTP method')
+  }
+  if (!apiKeyId) {
+    throw new Error('CALL_OPEN_MERCATO action requires an API key profile')
+  }
+
+  const endpointOptions = context.openMercatoEndpointOptions ?? await getCurrentOpenMercatoEndpointOptions()
+  const endpointOption = findOpenMercatoEndpointOption(
+    endpoint,
+    method,
+    endpointOptions,
+  )
+  if (!endpointOption) {
+    throw new Error('CALL_OPEN_MERCATO action requires a currently available /api/* endpoint')
+  }
+
+  const em = context.em
+  if (!em) {
+    throw new Error('CALL_OPEN_MERCATO action requires an EntityManager in action context')
+  }
+
+  const tenantId = context.tenantId ?? context.tenant?.id
+  const organizationId = context.organizationId ?? context.organization?.id
+  if (!tenantId || !organizationId) {
+    throw new Error('CALL_OPEN_MERCATO action requires tenant and organization context')
+  }
+
+  const apiKeyProfile = await resolveOpenMercatoApiKeyProfile(em, apiKeyId, {
+    tenantId,
+    organizationId,
+  })
+  if (!apiKeyProfile) {
+    throw new Error('CALL_OPEN_MERCATO action requires an active API key profile in scope')
+  }
+
+  const roleIds = Array.isArray(apiKeyProfile.rolesJson)
+    ? apiKeyProfile.rolesJson.filter((roleId): roleId is string => typeof roleId === 'string' && roleId.length > 0)
+    : []
+  if (roleIds.length === 0) {
+    throw new Error('CALL_OPEN_MERCATO action requires an API key profile with at least one role')
+  }
+
+  const { withOnetimeApiKey } = await import('../../api_keys/services/apiKeyService')
+  const fullUrl = buildOpenMercatoApiUrl(endpointOption.path)
+  const requestBody = method === 'GET'
+    ? undefined
+    : normalizeOpenMercatoRequestBody(action.config?.body, context)
+
+  return await withOnetimeApiKey(
+    em,
+    {
+      name: `__business_rule_${context.ruleId || 'unknown'}__`,
+      description: `One-time key for business rule ${context.ruleId || 'unknown'}`,
+      tenantId,
+      organizationId,
+      roles: roleIds,
+      createdBy: null,
+      expiresAt: null,
+    },
+    async (apiKeySecret) => {
+      const headers: Record<string, string> = {
+        'Content-Type': 'application/json',
+        'Authorization': `apikey ${apiKeySecret}`,
+        'X-Tenant-Id': tenantId,
+        'X-Organization-Id': organizationId,
+      }
+      if (context.ruleId) headers['X-Business-Rule-Id'] = context.ruleId
+      if (context.ruleName) headers['X-Business-Rule-Name'] = context.ruleName
+      if (context.entityType) headers['X-Business-Rule-Entity-Type'] = context.entityType
+      if (context.entityId) headers['X-Business-Rule-Entity-Id'] = context.entityId
+
+      const response = await fetch(fullUrl, {
+        method,
+        headers,
+        body: requestBody === undefined ? undefined : JSON.stringify(requestBody),
+      })
+
+      const responseBody = await parseOpenMercatoResponseBody(response)
+      if (!response.ok) {
+        throwOpenMercatoResponseError(response.status)
+      }
+
+      return {
+        type: 'CALL_OPEN_MERCATO',
+        endpoint: endpointOption.path,
+        method,
+        apiKeyId,
+        status: response.status,
+        statusText: response.statusText,
+        body: responseBody,
+        authenticated: true,
+        tenantId,
+        organizationId,
+      }
+    },
+  )
+}
+
 /**
  * EMIT_EVENT action handler
  */
@@ -454,3 +594,61 @@ function resolveValue(value: any, context: ActionContext): any {
 
   return value
 }
+
+function buildOpenMercatoApiUrl(endpoint: string): string {
+  if (!endpoint.startsWith('/api/')) {
+    throw new Error(`CALL_OPEN_MERCATO only supports /api/* paths, got: ${endpoint}`)
+  }
+  const appUrl = (process.env.APP_URL || 'http://localhost:3000').replace(/\/$/, '')
+  return `${appUrl}${endpoint}`
+}
+
+function normalizeOpenMercatoRequestBody(value: any, context: ActionContext): any {
+  if (value === undefined || value === null || value === '') return undefined
+  const interpolated = interpolateActionValue(value, context)
+  if (typeof interpolated !== 'string') return interpolated
+
+  const trimmed = interpolated.trim()
+  if (!trimmed) return undefined
+
+  try {
+    return JSON.parse(trimmed)
+  } catch {
+    return interpolated
+  }
+}
+
+function interpolateActionValue(value: any, context: ActionContext): any {
+  if (typeof value === 'string') {
+    return interpolateMessage(value, context)
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => interpolateActionValue(item, context))
+  }
+  if (value && typeof value === 'object') {
+    return Object.fromEntries(
+      Object.entries(value).map(([key, entry]) => [key, interpolateActionValue(entry, context)]),
+    )
+  }
+  return value
+}
+
+async function parseOpenMercatoResponseBody(response: Response): Promise<any> {
+  const contentType = response.headers.get('content-type')
+  try {
+    if (contentType && contentType.includes('application/json')) {
+      return await response.json()
+    }
+    return await response.text()
+  } catch {
+    return null
+  }
+}
+
+function throwOpenMercatoResponseError(status: number): never {
+  const error: Error & { retriable?: boolean } = new Error(`CALL_OPEN_MERCATO request failed with status ${status}`)
+  if (status >= 500) {
+    error.retriable = true
+  }
+  throw error
+}

package/src/modules/business_rules/lib/openmercato-call-options-types.ts

@@ -0,0 +1,31 @@
+export const OPENMERCATO_CALL_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'] as const
+
+export type OpenMercatoCallMethod = (typeof OPENMERCATO_CALL_METHODS)[number]
+
+export type OpenMercatoEndpointOption = {
+  id: string
+  path: string
+  method: OpenMercatoCallMethod
+  label: string
+  summary: string | null
+  operationId: string | null
+}
+
+export type OpenMercatoApiKeyRoleOption = {
+  id: string
+  name: string | null
+}
+
+export type OpenMercatoApiKeyOption = {
+  id: string
+  name: string
+  keyPrefix: string
+  organizationId: string | null
+  organizationName: string | null
+  roles: OpenMercatoApiKeyRoleOption[]
+}
+
+export type OpenMercatoCallOptionsResponse = {
+  endpoints: OpenMercatoEndpointOption[]
+  apiKeys: OpenMercatoApiKeyOption[]
+}

package/src/modules/business_rules/lib/openmercato-call-options.ts

@@ -0,0 +1,297 @@
+import type { EntityManager } from '@mikro-orm/postgresql'
+import {
+  getApiRouteManifests,
+  type ApiRouteManifestEntry,
+  type Module,
+} from '@open-mercato/shared/modules/registry'
+import { getModules } from '@open-mercato/shared/lib/modules/registry'
+import { buildOpenApiDocument } from '@open-mercato/shared/lib/openapi'
+import type { OpenApiMethodDoc, OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
+import { ApiKey } from '../../api_keys/data/entities'
+import { Role } from '../../auth/data/entities'
+import { Organization } from '../../directory/data/entities'
+import {
+  OPENMERCATO_CALL_METHODS,
+  type OpenMercatoApiKeyOption,
+  type OpenMercatoCallMethod,
+  type OpenMercatoEndpointOption,
+} from './openmercato-call-options-types'
+
+export type OpenMercatoCallScope = {
+  tenantId: string
+  organizationId?: string | null
+}
+
+const METHOD_ORDER = new Map<string, number>(
+  OPENMERCATO_CALL_METHODS.map((method, index) => [method, index]),
+)
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
+
+function isOpenMercatoCallMethod(value: string): value is OpenMercatoCallMethod {
+  return OPENMERCATO_CALL_METHODS.includes(value as OpenMercatoCallMethod)
+}
+
+function hasPathSegment(path: string, segment: string): boolean {
+  return path.split('/').some((part) => part === segment)
+}
+
+function shouldExposeEndpoint(path: string, method: string, operation: Record<string, any>): boolean {
+  if (!isOpenMercatoCallMethod(method.toUpperCase())) return false
+  if (!path.startsWith('/api/')) return false
+  if (path.includes('{')) return false
+  if (path.includes('[')) return false
+  if (path.startsWith('/api/docs')) return false
+  if (hasPathSegment(path, 'options')) return false
+  if (path === '/api/business_rules/openmercato-call-options') return false
+  if (operation.deprecated === true) return false
+  return true
+}
+
+export function dedupeOpenMercatoEndpointOptions(
+  options: OpenMercatoEndpointOption[],
+): OpenMercatoEndpointOption[] {
+  const deduped = new Map<string, OpenMercatoEndpointOption>()
+
+  for (const option of options) {
+    const existing = deduped.get(option.id)
+    if (!existing) {
+      deduped.set(option.id, option)
+      continue
+    }
+
+    if ((!existing.summary && option.summary) || (!existing.operationId && option.operationId)) {
+      deduped.set(option.id, {
+        ...existing,
+        label: option.label,
+        summary: option.summary ?? existing.summary,
+        operationId: option.operationId ?? existing.operationId,
+      })
+    }
+  }
+
+  return Array.from(deduped.values())
+}
+
+function sortEndpointOptions(options: OpenMercatoEndpointOption[]): OpenMercatoEndpointOption[] {
+  return dedupeOpenMercatoEndpointOptions(options).sort((a, b) => {
+    const pathCompare = a.path.localeCompare(b.path)
+    if (pathCompare !== 0) return pathCompare
+    return (METHOD_ORDER.get(a.method) ?? 99) - (METHOD_ORDER.get(b.method) ?? 99)
+  })
+}
+
+export function collectOpenMercatoEndpointOptionsFromDocument(doc: { paths?: Record<string, any> }): OpenMercatoEndpointOption[] {
+  const options: OpenMercatoEndpointOption[] = []
+
+  for (const [path, methods] of Object.entries(doc.paths ?? {})) {
+    for (const [rawMethod, operation] of Object.entries(methods ?? {})) {
+      const method = rawMethod.toUpperCase()
+      if (!operation || typeof operation !== 'object') continue
+      if (!shouldExposeEndpoint(path, method, operation as Record<string, any>)) continue
+
+      const typedMethod = method as OpenMercatoCallMethod
+      const summary = typeof (operation as any).summary === 'string' ? (operation as any).summary : null
+      const operationId = typeof (operation as any).operationId === 'string' ? (operation as any).operationId : null
+
+      options.push({
+        id: `${typedMethod} ${path}`,
+        path,
+        method: typedMethod,
+        label: summary ? `${typedMethod} ${path} - ${summary}` : `${typedMethod} ${path}`,
+        summary,
+        operationId,
+      })
+    }
+  }
+
+  return sortEndpointOptions(options)
+}
+
+export function collectOpenMercatoEndpointOptions(modules: Module[]): OpenMercatoEndpointOption[] {
+  return collectOpenMercatoEndpointOptionsFromDocument(buildOpenApiDocument(modules))
+}
+
+function normalizeManifestPath(path: string): string {
+  const prefixed = path.startsWith('/api/') ? path : `/api${path.startsWith('/') ? path : `/${path}`}`
+  return prefixed.replace(/\/+$/, '') || '/api'
+}
+
+function getRouteMethodDoc(routeDoc: OpenApiRouteDoc | undefined, method: OpenMercatoCallMethod): OpenApiMethodDoc | undefined {
+  return routeDoc?.methods?.[method]
+}
+
+async function collectOpenMercatoEndpointOptionsFromApiRouteManifests(
+  routes: ApiRouteManifestEntry[],
+): Promise<OpenMercatoEndpointOption[]> {
+  const options: OpenMercatoEndpointOption[] = []
+
+  for (const route of routes) {
+    const path = normalizeManifestPath(route.path)
+    const candidateMethods = route.methods
+      .map((method) => method.toUpperCase())
+      .filter(isOpenMercatoCallMethod)
+    if (candidateMethods.length === 0) continue
+    if (!path.startsWith('/api/')) continue
+    if (path.includes('[')) continue
+    if (path.startsWith('/api/docs')) continue
+    if (hasPathSegment(path, 'options')) continue
+    if (path === '/api/business_rules/openmercato-call-options') continue
+
+    let routeDoc: OpenApiRouteDoc | undefined
+    try {
+      const routeModule = await route.load()
+      routeDoc = routeModule.openApi as OpenApiRouteDoc | undefined
+    } catch {
+      routeDoc = undefined
+    }
+
+    for (const typedMethod of candidateMethods) {
+      const methodDoc = getRouteMethodDoc(routeDoc, typedMethod)
+      const operation = methodDoc ?? {}
+      if (!shouldExposeEndpoint(path, typedMethod, operation as Record<string, any>)) continue
+
+      const summary = typeof methodDoc?.summary === 'string' ? methodDoc.summary : null
+      const operationId = typeof methodDoc?.operationId === 'string' ? methodDoc.operationId : null
+      options.push({
+        id: `${typedMethod} ${path}`,
+        path,
+        method: typedMethod,
+        label: summary ? `${typedMethod} ${path} - ${summary}` : `${typedMethod} ${path}`,
+        summary,
+        operationId,
+      })
+    }
+  }
+
+  return sortEndpointOptions(options)
+}
+
+export async function getCurrentOpenMercatoEndpointOptions(): Promise<OpenMercatoEndpointOption[]> {
+  try {
+    const moduleOptions = collectOpenMercatoEndpointOptions(getModules())
+    if (moduleOptions.length > 0) return moduleOptions
+  } catch {
+    // The runtime app route registry is the source of truth when modules were not
+    // registered in this package instance.
+  }
+
+  const apiRoutes = getApiRouteManifests()
+  if (apiRoutes.length === 0) return []
+  return collectOpenMercatoEndpointOptionsFromApiRouteManifests(apiRoutes)
+}
+
+export function findOpenMercatoEndpointOption(
+  endpoint: string,
+  method: string,
+  options: OpenMercatoEndpointOption[],
+): OpenMercatoEndpointOption | null {
+  const normalizedMethod = method.trim().toUpperCase()
+  if (!endpoint.startsWith('/api/')) return null
+  if (!isOpenMercatoCallMethod(normalizedMethod)) return null
+  return options.find((option) => option.path === endpoint && option.method === normalizedMethod) ?? null
+}
+
+export async function listOpenMercatoApiKeyOptions(
+  em: EntityManager,
+  scope: OpenMercatoCallScope,
+): Promise<OpenMercatoApiKeyOption[]> {
+  const filters: Record<string, any> = {
+    tenantId: scope.tenantId,
+    deletedAt: null,
+  }
+  if (scope.organizationId) {
+    filters.organizationId = scope.organizationId
+  }
+
+  const keys = (await em.find(ApiKey, filters, { orderBy: { name: 'asc' } })) as ApiKey[]
+  const now = Date.now()
+  const activeKeys = keys.filter((key) => !key.expiresAt || key.expiresAt.getTime() > now)
+
+  const roleIds = new Set<string>()
+  const organizationIds = new Set<string>()
+  for (const key of activeKeys) {
+    if (key.organizationId) organizationIds.add(String(key.organizationId))
+    if (Array.isArray(key.rolesJson)) {
+      for (const roleId of key.rolesJson) roleIds.add(String(roleId))
+    }
+  }
+
+  const [roles, organizations] = await Promise.all([
+    roleIds.size > 0 ? em.find(Role, { id: { $in: Array.from(roleIds) }, deletedAt: null }) : [],
+    organizationIds.size > 0 ? em.find(Organization, { id: { $in: Array.from(organizationIds) } }) : [],
+  ])
+  const roleMap = new Map((roles as Role[]).map((role) => [String(role.id), role.name ?? null]))
+  const orgMap = new Map((organizations as Organization[]).map((org) => [String(org.id), org.name ?? null]))
+
+  return activeKeys.map((key) => ({
+    id: key.id,
+    name: key.name,
+    keyPrefix: key.keyPrefix,
+    organizationId: key.organizationId ?? null,
+    organizationName: key.organizationId ? orgMap.get(String(key.organizationId)) ?? null : null,
+    roles: Array.isArray(key.rolesJson)
+      ? key.rolesJson.map((roleId) => ({
+          id: String(roleId),
+          name: roleMap.get(String(roleId)) ?? null,
+        }))
+      : [],
+  }))
+}
+
+export async function resolveOpenMercatoApiKeyProfile(
+  em: EntityManager,
+  apiKeyId: string,
+  scope: OpenMercatoCallScope,
+): Promise<ApiKey | null> {
+  if (!apiKeyId || typeof apiKeyId !== 'string') return null
+  if (!UUID_RE.test(apiKeyId)) return null
+  const filters: Record<string, any> = {
+    id: apiKeyId,
+    tenantId: scope.tenantId,
+    deletedAt: null,
+  }
+  if (scope.organizationId) {
+    filters.organizationId = scope.organizationId
+  }
+
+  const key = await em.findOne(ApiKey, filters)
+  if (!key) return null
+  if (key.expiresAt && key.expiresAt.getTime() <= Date.now()) return null
+  return key
+}
+
+export async function validateOpenMercatoCallActions(
+  em: EntityManager,
+  actions: unknown,
+  scope: OpenMercatoCallScope,
+  endpointOptions?: OpenMercatoEndpointOption[],
+): Promise<string[]> {
+  if (!Array.isArray(actions) || actions.length === 0) return []
+
+  const errors: string[] = []
+  let availableEndpointOptions = endpointOptions
+  for (const [index, action] of actions.entries()) {
+    if (!action || typeof action !== 'object') continue
+    const typedAction = action as { type?: string; config?: Record<string, any> }
+    if (typedAction.type !== 'CALL_OPEN_MERCATO') continue
+    availableEndpointOptions ??= await getCurrentOpenMercatoEndpointOptions()
+
+    const config = typedAction.config ?? {}
+    const endpoint = typeof config.endpoint === 'string' ? config.endpoint : ''
+    const method = typeof config.method === 'string' ? config.method : ''
+    const apiKeyId = typeof config.apiKeyId === 'string' ? config.apiKeyId : ''
+
+    if (!findOpenMercatoEndpointOption(endpoint, method, availableEndpointOptions)) {
+      errors.push(`Action ${index + 1}: selected OpenMercato endpoint is not available`)
+    }
+
+    const apiKey = await resolveOpenMercatoApiKeyProfile(em, apiKeyId, scope)
+    if (!apiKey) {
+      errors.push(`Action ${index + 1}: selected API key profile is not available`)
+    } else if (!Array.isArray(apiKey.rolesJson) || apiKey.rolesJson.length === 0) {
+      errors.push(`Action ${index + 1}: selected API key profile has no roles`)
+    }
+  }
+
+  return errors
+}

package/src/modules/business_rules/lib/rule-engine.ts

@@ -523,6 +523,10 @@ export async function executeSingleRule(
           data: context.data,
           ruleId: rule.ruleId,
           ruleName: rule.ruleName,
+          tenantId: context.tenantId,
+          organizationId: context.organizationId,
+          executedBy: context.executedBy ?? context.user?.id ?? null,
+          em: em as any,
         }
 
         // Execute actions

package/src/modules/catalog/backend/catalog/products/[id]/page.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import * as React from "react";
+import { extensionPoints } from "@open-mercato/core/modules/catalog/extension-points";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { Page, PageBody } from "@open-mercato/ui/backend/Page";
@@ -1525,7 +1526,7 @@ export default function EditCatalogProductPage({
           ) : undefined}
           fields={[]}
           groups={groups}
-          injectionSpotId="crud-form:catalog.product"
+          injectionSpotId={extensionPoints.hosts.productForm.spotId}
           entityId={E.catalog.catalog_product}
           customFieldsetBindings={{
             [E.catalog.catalog_product]: { valueKey: "customFieldsetCode" },
@@ -2607,7 +2608,7 @@ function ProductMetaSection({
           )}
         />
         {errors.subtitle ? (
-          <p className="text-xs text-red-600">{errors.subtitle}</p>
+          <p className="text-xs text-status-error-text">{errors.subtitle}</p>
         ) : null}
       </div>
 
@@ -2640,7 +2641,7 @@ function ProductMetaSection({
           )}
         </p>
         {errors.handle ? (
-          <p className="text-xs text-red-600">{errors.handle}</p>
+          <p className="text-xs text-status-error-text">{errors.handle}</p>
         ) : null}
       </div>
 
@@ -2662,7 +2663,7 @@ function ProductMetaSection({
           )}
         </p>
         {errors.sku ? (
-          <p className="text-xs text-red-600">{errors.sku}</p>
+          <p className="text-xs text-status-error-text">{errors.sku}</p>
         ) : null}
       </div>
 
@@ -2699,7 +2700,7 @@ function ProductMetaSection({
           </SelectContent>
         </Select>
         {errors.productType ? (
-          <p className="text-xs text-red-600">
+          <p className="text-xs text-status-error-text">
             {errors.productType}
           </p>
         ) : null}

package/src/modules/catalog/backend/catalog/products/create/page.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import * as React from "react";
+import { extensionPoints } from "@open-mercato/core/modules/catalog/extension-points";
 import { useRouter, useSearchParams } from "next/navigation";
 import type { ZodType } from "zod";
 import { Page, PageBody } from "@open-mercato/ui/backend/Page";
@@ -381,7 +382,7 @@ export default function CreateCatalogProductPage() {
           backHref="/backend/catalog/products"
           fields={[]}
           groups={groups}
-          injectionSpotId="crud-form:catalog.product"
+          injectionSpotId={extensionPoints.hosts.productForm.spotId}
           initialValues={
             initialValuesRef.current ?? createInitialProductFormValues()
           }
@@ -1941,7 +1942,7 @@ function ProductMetaSection({
           )}
         />
         {errors.subtitle ? (
-          <p className="text-xs text-red-600">{errors.subtitle}</p>
+          <p className="text-xs text-status-error-text">{errors.subtitle}</p>
         ) : null}
       </div>
 
@@ -1972,7 +1973,7 @@ function ProductMetaSection({
           )}
         </p>
         {errors.handle ? (
-          <p className="text-xs text-red-600">{errors.handle}</p>
+          <p className="text-xs text-status-error-text">{errors.handle}</p>
         ) : null}
       </div>
 
@@ -1994,7 +1995,7 @@ function ProductMetaSection({
           )}
         </p>
         {errors.sku ? (
-          <p className="text-xs text-red-600">{errors.sku}</p>
+          <p className="text-xs text-status-error-text">{errors.sku}</p>
         ) : null}
       </div>
 
@@ -2031,7 +2032,7 @@ function ProductMetaSection({
           </SelectContent>
         </Select>
         {errors.productType ? (
-          <p className="text-xs text-red-600">
+          <p className="text-xs text-status-error-text">
             {errors.productType}
           </p>
         ) : null}
@@ -2104,7 +2105,7 @@ function ProductMetaSection({
               )}
         </p>
         {errors.taxRateId ? (
-          <p className="text-xs text-red-600">{errors.taxRateId}</p>
+          <p className="text-xs text-status-error-text">{errors.taxRateId}</p>
         ) : null}
       </div>
     </div>