@open-mercato/core 0.6.6-develop.6088.1.e6193c2018 → 0.6.6-develop.6094.1.28b081ea16

package/src/modules/customers/backend/customers/deals/pipeline/page.tsx

@@ -32,7 +32,7 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { IconButton } from '@open-mercato/ui/primitives/icon-button'
 import { SearchInput } from '@open-mercato/ui/primitives/search-input'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
-import { ErrorNotice } from '@open-mercato/ui/primitives/ErrorNotice'
+import { Alert, AlertDescription, AlertTitle } from '@open-mercato/ui/primitives/alert'
 import { EmptyState } from '@open-mercato/ui/primitives/empty-state'
 import {
   Select,
@@ -2734,17 +2734,18 @@ export default function DealsKanbanPage(): React.ReactElement {
           </div>
         ) : firstError ? (
           <div className="max-w-xl">
-            <ErrorNotice
-              message={
-                firstError instanceof Error
+            <Alert variant="destructive">
+              <AlertTitle>{translateWithFallback(t, 'ui.errors.defaultTitle', 'Something went wrong')}</AlertTitle>
+              <AlertDescription>
+                {firstError instanceof Error
                   ? firstError.message
                   : translateWithFallback(
                       t,
                       'customers.deals.pipeline.loadError',
                       'Failed to load deals.',
-                    )
-              }
-            />
+                    )}
+              </AlertDescription>
+            </Alert>
           </div>
         ) : (
           <DndContext

package/src/modules/entities/backend/entities/user/[entityId]/page.tsx

@@ -9,7 +9,7 @@ import { invalidateCustomFieldDefs } from '@open-mercato/ui/backend/utils/custom
 import { upsertCustomEntitySchema, upsertCustomFieldDefSchema } from '@open-mercato/core/modules/entities/data/validators'
 import { z } from 'zod'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
-import { ErrorNotice } from '@open-mercato/ui/primitives/ErrorNotice'
+import { Alert, AlertDescription, AlertTitle } from '@open-mercato/ui/primitives/alert'
 import Link from 'next/link'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { loadGeneratedFieldRegistrations } from '@open-mercato/ui/backend/fields/registry'
@@ -522,7 +522,10 @@ export default function EditDefinitionsPage({ params }: { params?: { entityId?:
       <Page>
         <PageBody>
           <div className="p-6">
-            <ErrorNotice title="Invalid entity" message="The requested entity ID is missing or invalid." />
+            <Alert variant="destructive">
+              <AlertTitle>Invalid entity</AlertTitle>
+              <AlertDescription>The requested entity ID is missing or invalid.</AlertDescription>
+            </Alert>
           </div>
         </PageBody>
       </Page>

package/src/modules/feature_toggles/components/FeatureToggleOverrideCard.tsx

@@ -1,6 +1,7 @@
 "use client"
 import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '@open-mercato/ui/primitives/card'
-import { DataLoader, ErrorNotice } from "@open-mercato/ui";
+import { DataLoader } from "@open-mercato/ui";
+import { Alert, AlertDescription, AlertTitle } from "@open-mercato/ui/primitives/alert";
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import { apiCall, withScopedApiRequestHeaders } from "@open-mercato/ui/backend/utils/apiCall";
 import { buildOptimisticLockHeader } from "@open-mercato/ui/backend/utils/optimisticLock";
@@ -68,7 +69,10 @@ export function FeatureToggleOverrideCard({ toggleId }: { toggleId: string }) {
                     <CardTitle>{t('feature_toggles.override.title', 'Override')}</CardTitle>
                 </CardHeader>
                 <CardContent>
-                    <ErrorNotice message={error.message} />
+                    <Alert variant="destructive">
+                        <AlertTitle>{t('ui.errors.defaultTitle', 'Something went wrong')}</AlertTitle>
+                        <AlertDescription>{error.message}</AlertDescription>
+                    </Alert>
                 </CardContent>
             </Card>
         )

package/src/modules/messages/commands/actions.ts

@@ -15,6 +15,13 @@ import {
 import { getMessageType } from '../lib/message-types-registry'
 import { assertOrganizationAccess, type MessageScopeInput } from './shared'
 
+const actionStateSnapshotSchema = z.object({
+  actionTaken: z.string().nullable(),
+  actionTakenByUserId: z.string().nullable(),
+  actionTakenAt: z.string().nullable(),
+  actionResult: z.record(z.string(), z.unknown()).nullable(),
+})
+
 const recordTerminalActionSchema = z.object({
   messageId: z.string().uuid(),
   actionId: z.string().min(1),
@@ -22,6 +29,10 @@ const recordTerminalActionSchema = z.object({
   tenantId: z.string().uuid(),
   organizationId: z.string().uuid().nullable(),
   userId: z.string().uuid(),
+  // Optional pre-claim snapshot supplied by `messages.actions.execute` so the
+  // undo log records the true (un-taken) state even though the terminal action
+  // was atomically claimed before this finalizer runs.
+  previousState: actionStateSnapshotSchema.optional(),
 })
 
 type RecordTerminalActionInput = z.infer<typeof recordTerminalActionSchema>
@@ -121,12 +132,35 @@ const recordTerminalActionCommand: CommandHandler<unknown, { ok: true }> = {
     const input = recordTerminalActionSchema.parse(rawInput)
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const message = await requireActionTarget(em, input)
-    if (message.actionTaken) {
-      throw new Error('Action already taken')
+    const claimedByCaller =
+      message.actionTaken === input.actionId && message.actionTakenByUserId === input.userId
+    if (!claimedByCaller) {
+      if (message.actionTaken) {
+        throw new Error('Action already taken')
+      }
+      // Atomic compare-and-set: only one concurrent request transitions the
+      // message out of the un-taken state. nativeUpdate runs as a single
+      // `UPDATE ... WHERE action_taken IS NULL` so the loser matches 0 rows.
+      const claimedRows = await em.nativeUpdate(
+        Message,
+        { id: input.messageId, tenantId: input.tenantId, actionTaken: null, deletedAt: null },
+        {
+          actionTaken: input.actionId,
+          actionTakenByUserId: input.userId,
+          actionTakenAt: new Date(),
+        },
+      )
+      if (claimedRows === 0) {
+        throw new Error('Action already taken')
+      }
+      message.actionTaken = input.actionId
+      message.actionTakenByUserId = input.userId
+    }
+    if (!message.actionTakenAt) {
+      message.actionTakenAt = new Date()
     }
-    message.actionTaken = input.actionId
-    message.actionTakenByUserId = input.userId
-    message.actionTakenAt = new Date()
+    // action_result is an encrypted column, so it must be written through the
+    // flush path (the encryption subscriber) rather than nativeUpdate.
     message.actionResult = input.result
     await em.flush()
     return { ok: true }
@@ -139,6 +173,13 @@ const recordTerminalActionCommand: CommandHandler<unknown, { ok: true }> = {
   },
   buildLog: async ({ input, snapshots }) => {
     const parsed = recordTerminalActionSchema.parse(input)
+    // When the action was pre-claimed by `messages.actions.execute`, the
+    // prepare-captured snapshot already reflects the claimed state, so prefer
+    // the explicit pre-claim snapshot for the undo baseline.
+    const before =
+      (parsed.previousState as ActionStateSnapshot | undefined) ??
+      (snapshots.before as ActionStateSnapshot | undefined) ??
+      null
     return {
       actionLabel: 'Execute message terminal action',
       resourceKind: 'messages.message',
@@ -147,11 +188,11 @@ const recordTerminalActionCommand: CommandHandler<unknown, { ok: true }> = {
       organizationId: parsed.organizationId,
       payload: {
         undo: {
-          before: (snapshots.before as ActionStateSnapshot | undefined) ?? null,
+          before,
           after: (snapshots.after as ActionStateSnapshot | undefined) ?? null,
         } satisfies UndoPayload<ActionStateSnapshot>,
       },
-      snapshotBefore: snapshots.before ?? null,
+      snapshotBefore: before,
       snapshotAfter: snapshots.after ?? null,
     }
   },
@@ -209,6 +250,52 @@ const executeActionCommand: CommandHandler<
       }
     }
 
+    // Capture the un-taken state for the undo log before reserving the action.
+    const previousState = snapshotActionState(message)
+    let claimedTerminal = false
+    const releaseTerminalClaim = async () => {
+      if (!claimedTerminal) return
+      claimedTerminal = false
+      await em.nativeUpdate(
+        Message,
+        {
+          id: message.id,
+          tenantId: input.tenantId,
+          actionTaken: action.id,
+          actionTakenByUserId: input.userId,
+        },
+        { actionTaken: null, actionTakenByUserId: null, actionTakenAt: null },
+      )
+    }
+
+    if (shouldRecordActionTaken) {
+      // Atomically reserve the terminal action BEFORE running the target
+      // command so concurrent requests cannot both execute it. The losing
+      // request matches 0 rows and surfaces the existing 409 response.
+      const claimedRows = await em.nativeUpdate(
+        Message,
+        { id: message.id, tenantId: input.tenantId, actionTaken: null, deletedAt: null },
+        {
+          actionTaken: action.id,
+          actionTakenByUserId: input.userId,
+          actionTakenAt: new Date(),
+        },
+      )
+      if (claimedRows === 0) {
+        const current = await findOneWithDecryption(
+          em,
+          Message,
+          { id: message.id, tenantId: input.tenantId, deletedAt: null },
+          undefined,
+          { tenantId: input.tenantId, organizationId: input.organizationId },
+        )
+        throw Object.assign(new Error('Action already taken'), {
+          actionTaken: current?.actionTaken ?? message.actionTaken ?? action.id,
+        })
+      }
+      claimedTerminal = true
+    }
+
     const commandBus = ctx.container.resolve('commandBus') as {
       execute: (
         commandId: string,
@@ -263,6 +350,9 @@ const executeActionCommand: CommandHandler<
         operationLogEntry = commandResult.logEntry ?? null
       } catch (err) {
         console.error('[messages] executeActionCommand sub-command failed', err)
+        // The target command never completed — release the reservation so the
+        // action stays retryable, matching the pre-claim failure semantics.
+        await releaseTerminalClaim()
         throw new Error('Action failed')
       }
     } else if (action.href) {
@@ -272,10 +362,12 @@ const executeActionCommand: CommandHandler<
         userId: input.userId,
       })
       if (!safeRedirect) {
+        await releaseTerminalClaim()
         throw new Error('Action has an unsafe redirect target')
       }
       result = { redirect: safeRedirect }
     } else {
+      await releaseTerminalClaim()
       throw new Error('Action has no executable target')
     }
 
@@ -288,6 +380,7 @@ const executeActionCommand: CommandHandler<
           tenantId: input.tenantId,
           organizationId: input.organizationId,
           userId: input.userId,
+          previousState,
         },
         ctx: {
           container: ctx.container,