@open-mercato/core 0.6.5-develop.5382.1.f542de69af → 0.6.6-develop.5412.1.e2a52b14f0

package/src/modules/entities/i18n/pl.json

@@ -82,6 +82,7 @@
   "entities.userEntities.records.errors.deleteFailed": "Nie udało się usunąć rekordu",
   "entities.userEntities.records.errors.entityIdRequired": "Wymagany jest identyfikator encji",
   "entities.userEntities.records.errors.recordIdRequired": "Wymagany jest identyfikator rekordu",
+  "entities.userEntities.records.errors.systemEntity": "Ta encja jest zarządzana systemowo. Rekordy są dostępne wyłącznie dla encji niestandardowych.",
   "entities.userEntities.records.form.createTitle": "Utwórz rekord",
   "entities.userEntities.records.form.editTitle": "Edytuj rekord",
   "entities.userEntities.records.form.submitCreate": "Utwórz",

package/src/modules/query_index/lib/engine.ts

@@ -2,7 +2,7 @@ import type { QueryEngine, QueryOptions, QueryResult, FilterOp, Filter, QueryCus
 import { SortDir } from '@open-mercato/shared/lib/query/types'
 import type { EntityId } from '@open-mercato/shared/modules/entities'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { BasicQueryEngine, resolveEntityTableName } from '@open-mercato/shared/lib/query/engine'
+import { BasicQueryEngine, resolveEntityTableName, resolveRegisteredEntityTableName } from '@open-mercato/shared/lib/query/engine'
 import { type Kysely, sql, type RawBuilder } from 'kysely'
 import type { EventBus } from '@open-mercato/events'
 import { readCoverageSnapshot, refreshCoverageSnapshot } from './coverage'
@@ -219,7 +219,7 @@ export class HybridQueryEngine implements QueryEngine {
       const debugEnabled = this.isDebugVerbosity()
       if (debugEnabled) this.debug('query:start', { entity })
 
-      const isCustom = await this.isCustomEntity(entity)
+      const isCustom = opts.forceCustomEntityStorage === true || await this.isCustomEntity(entity)
       if (isCustom) {
         if (debugEnabled) this.debug('query:custom-entity', { entity })
         const section = profiler.section('custom_entity')
@@ -1005,6 +1005,14 @@ export class HybridQueryEngine implements QueryEngine {
         .executeTakeFirst()
       if (row) {
         result = true
+      } else if (resolveRegisteredEntityTableName(this.em, entity) !== null) {
+        // An id backed by a registered ORM table is never doc-storage-backed by
+        // inference: stray `custom_entities_storage` rows for such an id (e.g. written
+        // through the generic entities data engine) must not hijack every list/detail
+        // read for the whole entity type away from its base table (#2939). Surfaces
+        // that intentionally read doc records for a dual-declared id pass
+        // `forceCustomEntityStorage` in QueryOptions instead.
+        result = false
       } else {
         // Read/write symmetry. Records written through the entities data engine
         // (`de.createCustomEntityRecord`) always land in `custom_entities_storage`,
@@ -1012,9 +1020,7 @@ export class HybridQueryEngine implements QueryEngine {
         // id — those are NEVER registered in `custom_entities` (install treats a
         // system id as non-registrable). Without this fallback the query routes to
         // the empty ORM/index path and those records are write-only (created with
-        // 200 but unreadable on the edit form). A real ORM entity never writes rows
-        // to `custom_entities_storage`, so this can only ever re-classify genuine
-        // doc-storage entities — it cannot misroute table-backed entities.
+        // 200 but unreadable on the edit form).
         result = await this.hasCustomEntityStorageRows(entity)
       }
     } catch {

package/src/modules/staff/api/team-members.ts

@@ -225,7 +225,12 @@ const crud = makeCrudRoute({
         const { translate } = await resolveTranslations()
         return parseScopedCommandInput(staffTeamMemberUpdateSchema, raw ?? {}, ctx, translate)
       },
-      response: () => ({ ok: true }),
+      // Surface the freshly-bumped updatedAt so inline (non-CrudForm) callers can
+      // refresh their optimistic-lock token between sequential edits (#2848).
+      response: (arg: { result?: { updatedAt?: string | null } | null }) => ({
+        ok: true,
+        updatedAt: arg?.result?.updatedAt ?? null,
+      }),
     },
     delete: {
       commandId: 'staff.team-members.delete',
@@ -287,7 +292,9 @@ export const openApi = createStaffCrudOpenApi({
   },
   update: {
     schema: staffTeamMemberUpdateSchema,
-    responseSchema: defaultOkResponseSchema,
+    responseSchema: defaultOkResponseSchema.extend({
+      updatedAt: z.string().nullable().optional(),
+    }),
     description: 'Updates a team member by id.',
   },
   del: {

package/src/modules/staff/api/timesheets/time-entries/[id]/timer-start/route.ts

@@ -120,6 +120,36 @@ export async function POST(req: Request) {
         })
       }
 
+      // Single-active-timer invariant (issue #2855): reject the start when the
+      // staff member already has another running entry (started_at set,
+      // ended_at null). Without this guard a second surface (dashboard widget,
+      // another tab) could create and start a parallel timer, leaving two
+      // concurrent running entries and the "stopped timer comes back running"
+      // symptom reported in #2456.
+      const otherRunningEntry = await findOneWithDecryption(
+        trx,
+        StaffTimeEntry,
+        {
+          tenantId,
+          organizationId,
+          staffMemberId: lockedEntry.staffMemberId,
+          id: { $ne: lockedEntry.id },
+          startedAt: { $ne: null },
+          endedAt: null,
+          deletedAt: null,
+        },
+        {},
+        scopeCtx,
+      )
+      if (otherRunningEntry) {
+        throw new CrudHttpError(409, {
+          error: translate(
+            'staff.timesheets.errors.timerAlreadyRunning',
+            'Another timer is already running. Stop it before starting a new one.',
+          ),
+        })
+      }
+
       const startedAt = new Date()
       lockedEntry.startedAt = startedAt
       lockedEntry.source = 'timer'
@@ -184,7 +214,7 @@ export const openApi: OpenApiRouteDoc = {
       responses: [
         { status: 200, description: 'Timer started', schema: z.object({ ok: z.literal(true) }) },
         { status: 404, description: 'Time entry not found', schema: z.object({ error: z.string() }) },
-        { status: 409, description: 'Timer already started', schema: z.object({ error: z.string() }) },
+        { status: 409, description: 'Timer already started, or another timer is already running for this staff member', schema: z.object({ error: z.string() }) },
         { status: 401, description: 'Unauthorized', schema: z.object({ error: z.string() }) },
       ],
     },

package/src/modules/staff/backend/staff/team-members/[id]/page.tsx

@@ -5,10 +5,10 @@ import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { readApiResultOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { extractCustomFieldEntries } from '@open-mercato/shared/lib/crud/custom-fields-client'
 import { updateCrud, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
-import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { switchTeamMemberSchedule } from '@open-mercato/core/modules/staff/lib/scheduleSwitch'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/translate'
@@ -276,6 +276,11 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
     }
   }, [memberId, router, searchParams, t])
 
+  // optimistic-lock-exempt: the inline updateCrud/deleteCrud below run inside the
+  // TeamMemberForm <CrudForm> host, which auto-derives the version header from
+  // initialValues.updatedAt and surfaces 409 conflicts for both submit and delete.
+  // The availability-schedule switch is version-locked separately via
+  // switchTeamMemberSchedule (see ../../../../lib/scheduleSwitch).
   const handleSubmit = React.useCallback(async (values: TeamMemberFormValues) => {
     if (!memberId) return
     const payload = buildTeamMemberPayload(values, { id: memberId })
@@ -297,12 +302,17 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
 
   const handleRulesetChange = React.useCallback(async (nextId: string | null) => {
     if (!memberId) return
-    const headers = buildOptimisticLockHeader(initialValues?.updatedAt)
-    await withScopedApiRequestHeaders(headers, () => (
-      updateCrud('staff/team-members', { id: memberId, availabilityRuleSetId: nextId }, {
-        errorMessage: t('staff.teamMembers.availability.ruleset.updateError', 'Failed to update schedule.'),
-      })
-    ))
+    const { updatedAt: nextUpdatedAt } = await switchTeamMemberSchedule({
+      memberId,
+      nextRuleSetId: nextId,
+      expectedUpdatedAt: initialValues?.updatedAt,
+      t,
+    })
+    // Advance the optimistic-lock token so the next sequential switch sends the
+    // fresh updatedAt instead of the stale one and does not falsely 409 (#2848).
+    if (nextUpdatedAt) {
+      setInitialValues((prev) => (prev ? { ...prev, updatedAt: nextUpdatedAt } : prev))
+    }
     setAvailabilityRuleSetId(nextId)
     flash(t('staff.teamMembers.availability.ruleset.updateSuccess', 'Schedule updated.'), 'success')
   }, [initialValues?.updatedAt, memberId, t])

package/src/modules/staff/commands/team-members.ts

@@ -292,7 +292,7 @@ const createTeamMemberCommand: CommandHandler<StaffTeamMemberCreateInput, { memb
   },
 }
 
-const updateTeamMemberCommand: CommandHandler<StaffTeamMemberUpdateInput, { memberId: string }> = {
+const updateTeamMemberCommand: CommandHandler<StaffTeamMemberUpdateInput, { memberId: string; updatedAt: string | null }> = {
   id: 'staff.team-members.update',
   async prepare(rawInput, ctx) {
     const { parsed } = parseWithCustomFields(staffTeamMemberUpdateSchema, rawInput)
@@ -368,7 +368,10 @@ const updateTeamMemberCommand: CommandHandler<StaffTeamMemberUpdateInput, { memb
       indexer: teamMemberCrudIndexer,
     })
 
-    return { memberId: member.id }
+    // Return the freshly-bumped updatedAt so non-CrudForm callers (e.g. the
+    // availability schedule switcher) can refresh their optimistic-lock token
+    // and not falsely 409 on the next sequential edit (#2848).
+    return { memberId: member.id, updatedAt: member.updatedAt ? member.updatedAt.toISOString() : null }
   },
   buildLog: async ({ snapshots, ctx }) => {
     const before = snapshots.before as TeamMemberSnapshot | undefined

package/src/modules/staff/components/TeamMemberForm.tsx

@@ -454,9 +454,12 @@ export function TeamMemberForm(props: TeamMemberFormProps) {
     ]
 
     if (!tagsSection) {
+      // The tags field lives in its own card whose group title already reads
+      // "Tags" (see groups below). Leave the field label empty so the heading
+      // is not rendered twice in the team member edit view.
       baseFields.splice(5, 0, {
         id: 'tags',
-        label: translate('staff.teamMembers.form.fields.tags', 'Tags'),
+        label: '',
         type: 'tags',
         placeholder: translate('staff.teamMembers.form.fields.tags.placeholder', 'Add tags'),
       })

package/src/modules/staff/i18n/de.json

@@ -950,6 +950,7 @@
   "staff.timesheets.errors.projectsKpis": "Failed to load project KPIs.",
   "staff.timesheets.errors.segmentCreate": "Zeiteintragssegment konnte nicht erstellt werden.",
   "staff.timesheets.errors.staffMemberNotFound": "Mitarbeiter nicht gefunden oder nicht zugänglich.",
+  "staff.timesheets.errors.timerAlreadyRunning": "Es läuft bereits ein anderer Timer. Stoppen Sie ihn, bevor Sie einen neuen starten.",
   "staff.timesheets.errors.timerAlreadyStarted": "Der Timer ist für diesen Eintrag bereits gestartet.",
   "staff.timesheets.errors.timerStart": "Timer konnte nicht gestartet werden.",
   "staff.timesheets.errors.timerStop": "Timer konnte nicht gestoppt werden.",

package/src/modules/staff/i18n/en.json

@@ -950,6 +950,7 @@
   "staff.timesheets.errors.projectsKpis": "Failed to load project KPIs.",
   "staff.timesheets.errors.segmentCreate": "Failed to create time entry segment.",
   "staff.timesheets.errors.staffMemberNotFound": "Staff member not found or not accessible.",
+  "staff.timesheets.errors.timerAlreadyRunning": "Another timer is already running. Stop it before starting a new one.",
   "staff.timesheets.errors.timerAlreadyStarted": "Timer is already started for this entry.",
   "staff.timesheets.errors.timerStart": "Failed to start timer.",
   "staff.timesheets.errors.timerStop": "Failed to stop timer.",

package/src/modules/staff/i18n/es.json

@@ -950,6 +950,7 @@
   "staff.timesheets.errors.projectsKpis": "Failed to load project KPIs.",
   "staff.timesheets.errors.segmentCreate": "No se pudo crear el segmento del registro de tiempo.",
   "staff.timesheets.errors.staffMemberNotFound": "Miembro del personal no encontrado o no accesible.",
+  "staff.timesheets.errors.timerAlreadyRunning": "Ya hay otro temporizador en marcha. Detenlo antes de iniciar uno nuevo.",
   "staff.timesheets.errors.timerAlreadyStarted": "El temporizador ya está iniciado para este registro.",
   "staff.timesheets.errors.timerStart": "No se pudo iniciar el temporizador.",
   "staff.timesheets.errors.timerStop": "No se pudo detener el temporizador.",

package/src/modules/staff/i18n/pl.json

@@ -950,6 +950,7 @@
   "staff.timesheets.errors.projectsKpis": "Failed to load project KPIs.",
   "staff.timesheets.errors.segmentCreate": "Nie udało się utworzyć segmentu wpisu czasu.",
   "staff.timesheets.errors.staffMemberNotFound": "Pracownik nie został znaleziony lub jest niedostępny.",
+  "staff.timesheets.errors.timerAlreadyRunning": "Inny licznik czasu jest już uruchomiony. Zatrzymaj go przed rozpoczęciem nowego.",
   "staff.timesheets.errors.timerAlreadyStarted": "Czasomierz jest już uruchomiony dla tego wpisu.",
   "staff.timesheets.errors.timerStart": "Nie udało się uruchomić czasomierza.",
   "staff.timesheets.errors.timerStop": "Nie udało się zatrzymać czasomierza.",

package/src/modules/staff/lib/scheduleSwitch.ts

@@ -0,0 +1,46 @@
+import { withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
+import { updateCrud } from '@open-mercato/ui/backend/utils/crud'
+
+type Translate = (key: string, fallback?: string) => string
+
+export type TeamMemberScheduleSwitchResult = {
+  /** The team member's freshly-bumped updatedAt, used to refresh the optimistic-lock token. */
+  updatedAt: string | null
+}
+
+/**
+ * Persist a team member's selected availability schedule.
+ *
+ * Sends the optimistic-lock header derived from the caller's current
+ * `expectedUpdatedAt` and returns the server's freshly-bumped `updatedAt` so the
+ * caller can advance its token before the next sequential switch — otherwise the
+ * second switch reuses a stale version and falsely 409s (#2848).
+ *
+ * On an optimistic-lock conflict the shared conflict bar is surfaced before the
+ * error is re-thrown, so the selection reverts AND the user sees visible feedback
+ * instead of a silent revert.
+ */
+export async function switchTeamMemberSchedule(args: {
+  memberId: string
+  nextRuleSetId: string | null
+  expectedUpdatedAt: string | null | undefined
+  t: Translate
+}): Promise<TeamMemberScheduleSwitchResult> {
+  const { memberId, nextRuleSetId, expectedUpdatedAt, t } = args
+  const headers = buildOptimisticLockHeader(expectedUpdatedAt)
+  try {
+    const call = await withScopedApiRequestHeaders(headers, () => (
+      updateCrud<{ ok?: boolean; updatedAt?: string | null }>(
+        'staff/team-members',
+        { id: memberId, availabilityRuleSetId: nextRuleSetId },
+        { errorMessage: t('staff.teamMembers.availability.ruleset.updateError', 'Failed to update schedule.') },
+      )
+    ))
+    return { updatedAt: call?.result?.updatedAt ?? null }
+  } catch (error) {
+    surfaceRecordConflict(error, t)
+    throw error
+  }
+}

package/src/modules/workflows/backend/definitions/create/page.tsx

@@ -53,8 +53,7 @@ export default function CreateWorkflowDefinitionPage() {
   return (
     <Page>
       <PageBody>
-        <Alert variant="info" className="mb-6">
-          <Zap className="w-4 h-4" />
+        <Alert variant="info" icon={<Zap aria-hidden="true" />} className="mb-6">
           <AlertTitle>{t('workflows.create.eventTriggersTitle')}</AlertTitle>
           <AlertDescription>
             {t('workflows.create.eventTriggersDescription')}

package/src/modules/workflows/backend/definitions/visual-editor/page.tsx

@@ -36,7 +36,7 @@ import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/u
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { CircleQuestionMark, Info, PanelTopClose, PanelTopOpen, Play, Save, Trash2 } from 'lucide-react'
+import { CircleQuestionMark, PanelTopClose, PanelTopOpen, Play, Save, Trash2 } from 'lucide-react'
 import { NODE_TYPE_ICONS, NODE_TYPE_COLORS, NODE_TYPE_LABELS } from '../../../lib/node-type-icons'
 import { DefinitionTriggersEditor } from '../../../components/DefinitionTriggersEditor'
 import { MobileVisualEditor } from '../../../components/mobile/MobileVisualEditor'
@@ -1139,7 +1139,6 @@ export default function VisualEditorPage() {
 
               {/* Instructions */}
               <Alert variant="info" className="mt-6">
-                <Info className="size-4" />
                 <AlertTitle className="text-xs">{t('workflows.visualEditor.howToUse', 'How to use:')}</AlertTitle>
                 <div className="mt-2">
                   <ul className="list-inside list-disc space-y-1 text-xs">

package/src/modules/workflows/components/DefinitionTriggersEditor.tsx

@@ -26,7 +26,7 @@ import {
 import { Alert, AlertDescription, AlertTitle } from '@open-mercato/ui/primitives/alert'
 import { EventPatternInput } from '@open-mercato/ui/backend/inputs/EventPatternInput'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-import { Plus, Trash2, Edit2, Zap, Info, X } from 'lucide-react'
+import { Plus, Trash2, Edit2, Zap, X } from 'lucide-react'
 import type { WorkflowDefinitionTrigger } from '../data/entities'
 
 interface DefinitionTriggersEditorProps {
@@ -302,7 +302,6 @@ export function DefinitionTriggersEditor({
 
         {value.length === 0 ? (
           <Alert variant="info">
-            <Info className="w-4 h-4" />
             <AlertTitle>{t('workflows.triggers.empty.title', 'No triggers configured')}</AlertTitle>
             <AlertDescription>
               {t('workflows.triggers.empty.description', 'Click "Add Trigger" to create an event trigger that automatically starts this workflow.')}

package/src/modules/workflows/components/NodeEditDialog.tsx

@@ -14,7 +14,7 @@ import {
   SelectValue,
 } from '@open-mercato/ui/primitives/select'
 import {Alert, AlertDescription} from '@open-mercato/ui/primitives/alert'
-import {ChevronDown, Info, Plus, Trash2} from 'lucide-react'
+import {ChevronDown, Plus, Trash2} from 'lucide-react'
 import {sanitizeId} from '../lib/graph-utils'
 import {WorkflowDefinition, WorkflowSelector} from './WorkflowSelector'
 import {JsonBuilder} from '@open-mercato/ui/backend/JsonBuilder'
@@ -539,7 +539,6 @@ export function NodeEditDialog({ node, isOpen, onClose, onSave, onDelete }: Node
         <div className="space-y-4">
           {!isEditable ? (
             <Alert variant="info">
-              <Info className="size-4" />
               <AlertDescription>
                 {t('workflows.nodeEditor.endStepsNotEditable')}
               </AlertDescription>
@@ -548,7 +547,6 @@ export function NodeEditDialog({ node, isOpen, onClose, onSave, onDelete }: Node
             <div className="space-y-4">
               {/* Info Alert for START nodes */}
               <Alert variant="info">
-                <Info className="size-4" />
                 <AlertDescription>
                   {t('workflows.nodeEditor.startStepsInfo')}
                 </AlertDescription>
@@ -693,7 +691,6 @@ export function NodeEditDialog({ node, isOpen, onClose, onSave, onDelete }: Node
                     {/* JSON Schema Format Notice */}
                     {isJsonSchemaFormat && (
                       <Alert variant="info" className="mb-3">
-                        <Info className="size-4" />
                         <AlertDescription>
                           {t('workflows.nodeEditor.jsonSchemaFormat')}
                         </AlertDescription>

package/src/modules/workflows/components/NodeEditDialogCrudForm.tsx

@@ -6,7 +6,7 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription } f
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Alert, AlertDescription } from '@open-mercato/ui/primitives/alert'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { Info, Trash2 } from 'lucide-react'
+import { Trash2 } from 'lucide-react'
 import { CrudForm, type CrudFormGroup, type CrudField, type CrudCustomFieldRenderProps } from '@open-mercato/ui/backend/CrudForm'
 import { JsonBuilder } from '@open-mercato/ui/backend/JsonBuilder'
 import { FormFieldArrayEditor } from './fields/FormFieldArrayEditor'
@@ -115,8 +115,7 @@ export function NodeEditDialogCrudForm({ node, isOpen, onClose, onSave, onDelete
           column: 1,
           bare: true,
           component: () => (
-            <Alert variant="default" className="border-blue-200 bg-blue-50">
-              <Info className="size-4" />
+            <Alert variant="info">
               <AlertDescription>
                 End nodes cannot be edited. They mark the completion of the workflow.
               </AlertDescription>
@@ -134,8 +133,7 @@ export function NodeEditDialogCrudForm({ node, isOpen, onClose, onSave, onDelete
           column: 1,
           bare: true,
           component: () => (
-            <Alert variant="default" className="border-blue-200 bg-blue-50 mb-4">
-              <Info className="size-4" />
+            <Alert variant="info" className="mb-4">
               <AlertDescription>
                 Start nodes mark the beginning of the workflow. You can define pre-conditions that must pass before the workflow can be started.
               </AlertDescription>
@@ -476,8 +474,7 @@ export function NodeEditDialogCrudForm({ node, isOpen, onClose, onSave, onDelete
         <div className="flex-1 overflow-y-auto min-h-0 px-6">
           {/* JSON Schema Conversion Warning */}
           {showJsonSchemaWarning && (
-            <Alert variant="default" className="border-blue-200 bg-blue-50 mb-4">
-              <Info className="size-4" />
+            <Alert variant="info" className="mb-4">
               <AlertDescription className="text-xs">
                 This form uses JSON Schema format. Fields have been converted for visual editing.
                 When you save, it will be converted to the simplified format. To preserve the original JSON Schema,

package/src/modules/workflows/components/WorkflowGraphImpl.tsx

@@ -221,8 +221,7 @@ export default function WorkflowGraphImpl({
 
         {editable && !isCompactViewport && (
           <Panel position="top-left" style={{ margin: 10 }}>
-            <Alert variant="info" className="max-w-sm">
-              <Edit3 className="size-4" />
+            <Alert variant="info" icon={<Edit3 aria-hidden="true" />} className="max-w-sm">
               <AlertDescription className="font-medium">
                 {t('workflows.graph.editModeInfo')}
               </AlertDescription>

package/src/modules/workflows/components/fields/FormFieldArrayEditor.tsx

@@ -15,7 +15,7 @@ import {
   SelectValue,
 } from '@open-mercato/ui/primitives/select'
 import { Alert, AlertDescription } from '@open-mercato/ui/primitives/alert'
-import { ChevronDown, Plus, Trash2, Info } from 'lucide-react'
+import { ChevronDown, Plus, Trash2 } from 'lucide-react'
 import type { CrudCustomFieldRenderProps } from '@open-mercato/ui/backend/CrudForm'
 
 /**
@@ -134,8 +134,7 @@ export function FormFieldArrayEditor({
 
       {/* JSON Schema Format Notice */}
       {isJsonSchemaFormat && (
-        <Alert variant="default" className="border-blue-200 bg-blue-50">
-          <Info className="size-4" />
+        <Alert variant="info">
           <AlertDescription className="text-xs">
             {t('workflows.fieldEditors.formFields.jsonSchemaNotice')}
           </AlertDescription>