@open-mercato/core 0.5.1-develop.2800.bfe2178a4f → 0.5.1-develop.2851.2854b4507f

package/dist/modules/messages/components/useMessagesInboxBulkActions.js

@@ -0,0 +1,235 @@
+"use client";
+import * as React from "react";
+import { useQueryClient } from "@tanstack/react-query";
+import { useT } from "@open-mercato/shared/lib/i18n/context";
+import { useConfirmDialog } from "@open-mercato/ui/backend/confirm-dialog";
+import { flash } from "@open-mercato/ui/backend/FlashMessages";
+import { useGuardedMutation } from "@open-mercato/ui/backend/injection/useGuardedMutation";
+import { apiCall } from "@open-mercato/ui/backend/utils/apiCall";
+import { toErrorMessage } from "./message-detail/utils.js";
+const MESSAGE_BULK_REQUESTS = {
+  markRead: {
+    method: "PUT",
+    buildUrl: (messageId) => `/api/messages/${encodeURIComponent(messageId)}/read`,
+    successKey: "messages.bulk.flash.markReadSuccess",
+    successFallback: "{count} messages marked as read.",
+    errorKey: "messages.errors.stateChangeFailed",
+    errorFallback: "Failed to update message state."
+  },
+  markUnread: {
+    method: "DELETE",
+    buildUrl: (messageId) => `/api/messages/${encodeURIComponent(messageId)}/read`,
+    successKey: "messages.bulk.flash.markUnreadSuccess",
+    successFallback: "{count} messages marked as unread.",
+    errorKey: "messages.errors.stateChangeFailed",
+    errorFallback: "Failed to update message state."
+  },
+  archive: {
+    method: "PUT",
+    buildUrl: (messageId) => `/api/messages/${encodeURIComponent(messageId)}/archive`,
+    successKey: "messages.bulk.flash.archiveSuccess",
+    successFallback: "{count} messages archived.",
+    errorKey: "messages.errors.stateChangeFailed",
+    errorFallback: "Failed to update message state."
+  },
+  delete: {
+    method: "DELETE",
+    buildUrl: (messageId) => `/api/messages/${encodeURIComponent(messageId)}`,
+    successKey: "messages.bulk.flash.deleteSuccess",
+    successFallback: "{count} messages deleted.",
+    errorKey: "messages.errors.deleteFailed",
+    errorFallback: "Failed to delete message."
+  }
+};
+function normalizeSelectionScopeValue(value) {
+  if (value == null) return void 0;
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : void 0;
+  }
+  if (Array.isArray(value)) {
+    const normalized = value.map((item) => normalizeSelectionScopeValue(item)).filter((item) => item !== void 0);
+    return normalized.length > 0 ? normalized : void 0;
+  }
+  if (typeof value === "object") {
+    const normalizedEntries = Object.entries(value).sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey)).map(([key, nestedValue]) => [key, normalizeSelectionScopeValue(nestedValue)]).filter(([, nestedValue]) => nestedValue !== void 0);
+    if (normalizedEntries.length === 0) return void 0;
+    return Object.fromEntries(normalizedEntries);
+  }
+  return value;
+}
+function buildMessageSelectionScopeKey(folder, page, search, filterValues) {
+  return JSON.stringify({
+    folder,
+    page,
+    search: search.trim(),
+    filters: normalizeSelectionScopeValue(filterValues) ?? {}
+  });
+}
+async function runWithConcurrency(items, limit, worker) {
+  if (items.length === 0) return [];
+  const results = new Array(items.length);
+  let nextIndex = 0;
+  const runWorker = async () => {
+    while (nextIndex < items.length) {
+      const currentIndex = nextIndex;
+      nextIndex += 1;
+      try {
+        await worker(items[currentIndex]);
+        results[currentIndex] = { status: "fulfilled", value: void 0 };
+      } catch (error) {
+        results[currentIndex] = { status: "rejected", reason: error };
+      }
+    }
+  };
+  await Promise.all(
+    Array.from({ length: Math.min(limit, items.length) }, () => runWorker())
+  );
+  return results;
+}
+function useMessagesInboxBulkActions({
+  folder,
+  page,
+  search,
+  filterValues
+}) {
+  const t = useT();
+  const queryClient = useQueryClient();
+  const { confirm, ConfirmDialogElement } = useConfirmDialog();
+  const { runMutation, retryLastMutation } = useGuardedMutation({
+    contextId: "messages-inbox-bulk-actions"
+  });
+  const selectionScopeKey = React.useMemo(
+    () => buildMessageSelectionScopeKey(folder, page, search, filterValues),
+    [filterValues, folder, page, search]
+  );
+  const injectionContext = React.useMemo(
+    () => ({
+      folder,
+      page,
+      search: search.trim(),
+      filters: filterValues,
+      retryLastMutation
+    }),
+    [filterValues, folder, page, retryLastMutation, search]
+  );
+  const executeBulkAction = React.useCallback(async (actionId, selectedRows) => {
+    const messageIds = selectedRows.map((row) => row.id).filter((id) => id.trim().length > 0);
+    if (messageIds.length === 0) return false;
+    if (actionId === "delete") {
+      const confirmed = await confirm({
+        title: t("messages.bulk.delete.title", "Delete {count} messages?", { count: messageIds.length }),
+        description: t("messages.bulk.delete.description", "This removes the selected messages from your view."),
+        confirmText: t("messages.actions.delete", "Delete"),
+        variant: "destructive"
+      });
+      if (!confirmed) return false;
+    }
+    const requestConfig = MESSAGE_BULK_REQUESTS[actionId];
+    try {
+      const summary = await runMutation({
+        operation: async () => {
+          const results = await runWithConcurrency(messageIds, 5, async (messageId) => {
+            const call = await apiCall(requestConfig.buildUrl(messageId), {
+              method: requestConfig.method
+            });
+            if (!call.ok) {
+              throw new Error(
+                toErrorMessage(call.result) ?? t(requestConfig.errorKey, requestConfig.errorFallback)
+              );
+            }
+          });
+          const failed = results.filter((result) => result.status === "rejected").length;
+          const succeeded = results.length - failed;
+          if (succeeded > 0) {
+            await queryClient.invalidateQueries({ queryKey: ["messages", "list"] });
+          }
+          return {
+            action: actionId,
+            total: messageIds.length,
+            succeeded,
+            failed
+          };
+        },
+        context: {
+          actionId,
+          messageIds,
+          folder,
+          page,
+          search: search.trim(),
+          filters: filterValues,
+          retryLastMutation
+        },
+        mutationPayload: {
+          actionId,
+          messageIds
+        }
+      });
+      if (summary.succeeded === 0) {
+        flash(
+          t("messages.bulk.flash.failed", "Failed to process {count} messages.", { count: summary.failed }),
+          "error"
+        );
+        return false;
+      }
+      if (summary.failed > 0) {
+        flash(
+          t("messages.bulk.flash.partial", "{succeeded} of {total} messages processed; {failed} failed.", {
+            succeeded: summary.succeeded,
+            total: summary.total,
+            failed: summary.failed
+          }),
+          "warning"
+        );
+        return true;
+      }
+      flash(
+        t(requestConfig.successKey, requestConfig.successFallback, { count: summary.succeeded }),
+        "success"
+      );
+      return true;
+    } catch (error) {
+      flash(
+        error instanceof Error ? error.message : t(requestConfig.errorKey, requestConfig.errorFallback),
+        "error"
+      );
+      return false;
+    }
+  }, [confirm, filterValues, folder, page, queryClient, retryLastMutation, runMutation, search, t]);
+  const bulkActions = React.useMemo(
+    () => folder === "inbox" ? [
+      {
+        id: "messages-mark-read",
+        label: t("messages.actions.markRead", "Mark read"),
+        onExecute: (selectedRows) => executeBulkAction("markRead", selectedRows)
+      },
+      {
+        id: "messages-mark-unread",
+        label: t("messages.actions.markUnread", "Mark unread"),
+        onExecute: (selectedRows) => executeBulkAction("markUnread", selectedRows)
+      },
+      {
+        id: "messages-archive",
+        label: t("messages.actions.archive", "Archive"),
+        onExecute: (selectedRows) => executeBulkAction("archive", selectedRows)
+      },
+      {
+        id: "messages-delete",
+        label: t("messages.actions.delete", "Delete"),
+        destructive: true,
+        onExecute: (selectedRows) => executeBulkAction("delete", selectedRows)
+      }
+    ] : void 0,
+    [executeBulkAction, folder, t]
+  );
+  return {
+    bulkActions,
+    selectionScopeKey,
+    injectionContext,
+    ConfirmDialogElement
+  };
+}
+export {
+  useMessagesInboxBulkActions
+};
+//# sourceMappingURL=useMessagesInboxBulkActions.js.map

package/dist/modules/messages/components/useMessagesInboxBulkActions.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/messages/components/useMessagesInboxBulkActions.ts"],
+  "sourcesContent": ["\"use client\"\n\nimport * as React from 'react'\nimport { useQueryClient } from '@tanstack/react-query'\nimport { useT } from '@open-mercato/shared/lib/i18n/context'\nimport type { BulkAction } from '@open-mercato/ui/backend/DataTable'\nimport type { FilterValues } from '@open-mercato/ui/backend/FilterBar'\nimport { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'\nimport { flash } from '@open-mercato/ui/backend/FlashMessages'\nimport { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'\nimport { apiCall } from '@open-mercato/ui/backend/utils/apiCall'\nimport { toErrorMessage } from './message-detail/utils'\n\nexport type MessageFolder = 'inbox' | 'sent' | 'drafts' | 'archived' | 'all'\n\ntype MessageBulkActionId = 'markRead' | 'markUnread' | 'archive' | 'delete'\n\ntype BulkExecutionSummary = {\n  action: MessageBulkActionId\n  total: number\n  succeeded: number\n  failed: number\n}\n\ntype MessageBulkRequestConfig = {\n  method: 'PUT' | 'DELETE'\n  buildUrl: (messageId: string) => string\n  successKey: string\n  successFallback: string\n  errorKey: string\n  errorFallback: string\n}\n\ntype MessageInboxBulkMutationContext = {\n  actionId: MessageBulkActionId\n  messageIds: string[]\n  folder: MessageFolder\n  page: number\n  search: string\n  filters: FilterValues\n  retryLastMutation: () => Promise<boolean>\n}\n\ntype UseMessagesInboxBulkActionsInput = {\n  folder: MessageFolder\n  page: number\n  search: string\n  filterValues: FilterValues\n}\n\ntype MessageInboxBulkRow = {\n  id: string\n}\n\nconst MESSAGE_BULK_REQUESTS: Record<MessageBulkActionId, MessageBulkRequestConfig> = {\n  markRead: {\n    method: 'PUT',\n    buildUrl: (messageId) => `/api/messages/${encodeURIComponent(messageId)}/read`,\n    successKey: 'messages.bulk.flash.markReadSuccess',\n    successFallback: '{count} messages marked as read.',\n    errorKey: 'messages.errors.stateChangeFailed',\n    errorFallback: 'Failed to update message state.',\n  },\n  markUnread: {\n    method: 'DELETE',\n    buildUrl: (messageId) => `/api/messages/${encodeURIComponent(messageId)}/read`,\n    successKey: 'messages.bulk.flash.markUnreadSuccess',\n    successFallback: '{count} messages marked as unread.',\n    errorKey: 'messages.errors.stateChangeFailed',\n    errorFallback: 'Failed to update message state.',\n  },\n  archive: {\n    method: 'PUT',\n    buildUrl: (messageId) => `/api/messages/${encodeURIComponent(messageId)}/archive`,\n    successKey: 'messages.bulk.flash.archiveSuccess',\n    successFallback: '{count} messages archived.',\n    errorKey: 'messages.errors.stateChangeFailed',\n    errorFallback: 'Failed to update message state.',\n  },\n  delete: {\n    method: 'DELETE',\n    buildUrl: (messageId) => `/api/messages/${encodeURIComponent(messageId)}`,\n    successKey: 'messages.bulk.flash.deleteSuccess',\n    successFallback: '{count} messages deleted.',\n    errorKey: 'messages.errors.deleteFailed',\n    errorFallback: 'Failed to delete message.',\n  },\n}\n\nfunction normalizeSelectionScopeValue(value: unknown): unknown {\n  if (value == null) return undefined\n  if (typeof value === 'string') {\n    const trimmed = value.trim()\n    return trimmed.length > 0 ? trimmed : undefined\n  }\n  if (Array.isArray(value)) {\n    const normalized = value\n      .map((item) => normalizeSelectionScopeValue(item))\n      .filter((item) => item !== undefined)\n    return normalized.length > 0 ? normalized : undefined\n  }\n  if (typeof value === 'object') {\n    const normalizedEntries = Object.entries(value)\n      .sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey))\n      .map(([key, nestedValue]) => [key, normalizeSelectionScopeValue(nestedValue)] as const)\n      .filter(([, nestedValue]) => nestedValue !== undefined)\n    if (normalizedEntries.length === 0) return undefined\n    return Object.fromEntries(normalizedEntries)\n  }\n  return value\n}\n\nfunction buildMessageSelectionScopeKey(\n  folder: MessageFolder,\n  page: number,\n  search: string,\n  filterValues: FilterValues,\n): string {\n  return JSON.stringify({\n    folder,\n    page,\n    search: search.trim(),\n    filters: normalizeSelectionScopeValue(filterValues) ?? {},\n  })\n}\n\nasync function runWithConcurrency<TItem>(\n  items: TItem[],\n  limit: number,\n  worker: (item: TItem) => Promise<void>,\n): Promise<PromiseSettledResult<void>[]> {\n  if (items.length === 0) return []\n\n  const results: PromiseSettledResult<void>[] = new Array(items.length)\n  let nextIndex = 0\n\n  const runWorker = async () => {\n    while (nextIndex < items.length) {\n      const currentIndex = nextIndex\n      nextIndex += 1\n      try {\n        await worker(items[currentIndex])\n        results[currentIndex] = { status: 'fulfilled', value: undefined }\n      } catch (error) {\n        results[currentIndex] = { status: 'rejected', reason: error }\n      }\n    }\n  }\n\n  await Promise.all(\n    Array.from({ length: Math.min(limit, items.length) }, () => runWorker()),\n  )\n\n  return results\n}\n\nexport function useMessagesInboxBulkActions<T extends MessageInboxBulkRow>({\n  folder,\n  page,\n  search,\n  filterValues,\n}: UseMessagesInboxBulkActionsInput): {\n  bulkActions: BulkAction<T>[] | undefined\n  selectionScopeKey: string\n  injectionContext: Record<string, unknown>\n  ConfirmDialogElement: React.ReactNode\n} {\n  const t = useT()\n  const queryClient = useQueryClient()\n  const { confirm, ConfirmDialogElement } = useConfirmDialog()\n  const { runMutation, retryLastMutation } = useGuardedMutation<MessageInboxBulkMutationContext>({\n    contextId: 'messages-inbox-bulk-actions',\n  })\n\n  const selectionScopeKey = React.useMemo(\n    () => buildMessageSelectionScopeKey(folder, page, search, filterValues),\n    [filterValues, folder, page, search],\n  )\n  const injectionContext = React.useMemo<Record<string, unknown>>(\n    () => ({\n      folder,\n      page,\n      search: search.trim(),\n      filters: filterValues,\n      retryLastMutation,\n    }),\n    [filterValues, folder, page, retryLastMutation, search],\n  )\n\n  const executeBulkAction = React.useCallback(async (\n    actionId: MessageBulkActionId,\n    selectedRows: T[],\n  ): Promise<boolean> => {\n    const messageIds = selectedRows.map((row) => row.id).filter((id) => id.trim().length > 0)\n    if (messageIds.length === 0) return false\n\n    if (actionId === 'delete') {\n      const confirmed = await confirm({\n        title: t('messages.bulk.delete.title', 'Delete {count} messages?', { count: messageIds.length }),\n        description: t('messages.bulk.delete.description', 'This removes the selected messages from your view.'),\n        confirmText: t('messages.actions.delete', 'Delete'),\n        variant: 'destructive',\n      })\n      if (!confirmed) return false\n    }\n\n    const requestConfig = MESSAGE_BULK_REQUESTS[actionId]\n\n    try {\n      const summary = await runMutation<BulkExecutionSummary>({\n        operation: async () => {\n          const results = await runWithConcurrency(messageIds, 5, async (messageId) => {\n            const call = await apiCall<{ ok?: boolean }>(requestConfig.buildUrl(messageId), {\n              method: requestConfig.method,\n            })\n            if (!call.ok) {\n              throw new Error(\n                toErrorMessage(call.result)\n                ?? t(requestConfig.errorKey, requestConfig.errorFallback),\n              )\n            }\n          })\n\n          const failed = results.filter((result) => result.status === 'rejected').length\n          const succeeded = results.length - failed\n\n          if (succeeded > 0) {\n            await queryClient.invalidateQueries({ queryKey: ['messages', 'list'] })\n          }\n\n          return {\n            action: actionId,\n            total: messageIds.length,\n            succeeded,\n            failed,\n          }\n        },\n        context: {\n          actionId,\n          messageIds,\n          folder,\n          page,\n          search: search.trim(),\n          filters: filterValues,\n          retryLastMutation,\n        },\n        mutationPayload: {\n          actionId,\n          messageIds,\n        },\n      })\n\n      if (summary.succeeded === 0) {\n        flash(\n          t('messages.bulk.flash.failed', 'Failed to process {count} messages.', { count: summary.failed }),\n          'error',\n        )\n        return false\n      }\n\n      if (summary.failed > 0) {\n        flash(\n          t('messages.bulk.flash.partial', '{succeeded} of {total} messages processed; {failed} failed.', {\n            succeeded: summary.succeeded,\n            total: summary.total,\n            failed: summary.failed,\n          }),\n          'warning',\n        )\n        return true\n      }\n\n      flash(\n        t(requestConfig.successKey, requestConfig.successFallback, { count: summary.succeeded }),\n        'success',\n      )\n      return true\n    } catch (error) {\n      flash(\n        error instanceof Error\n          ? error.message\n          : t(requestConfig.errorKey, requestConfig.errorFallback),\n        'error',\n      )\n      return false\n    }\n  }, [confirm, filterValues, folder, page, queryClient, retryLastMutation, runMutation, search, t])\n\n  const bulkActions = React.useMemo<BulkAction<T>[] | undefined>(\n    () => folder === 'inbox'\n      ? [\n          {\n            id: 'messages-mark-read',\n            label: t('messages.actions.markRead', 'Mark read'),\n            onExecute: (selectedRows: T[]) => executeBulkAction('markRead', selectedRows),\n          },\n          {\n            id: 'messages-mark-unread',\n            label: t('messages.actions.markUnread', 'Mark unread'),\n            onExecute: (selectedRows: T[]) => executeBulkAction('markUnread', selectedRows),\n          },\n          {\n            id: 'messages-archive',\n            label: t('messages.actions.archive', 'Archive'),\n            onExecute: (selectedRows: T[]) => executeBulkAction('archive', selectedRows),\n          },\n          {\n            id: 'messages-delete',\n            label: t('messages.actions.delete', 'Delete'),\n            destructive: true,\n            onExecute: (selectedRows: T[]) => executeBulkAction('delete', selectedRows),\n          },\n        ]\n      : undefined,\n    [executeBulkAction, folder, t],\n  )\n\n  return {\n    bulkActions,\n    selectionScopeKey,\n    injectionContext,\n    ConfirmDialogElement,\n  }\n}\n"],
+  "mappings": "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",
+  "names": []
+}

package/generated/entities/action_log/index.ts

@@ -19,6 +19,8 @@ export const changed_fields = "changed_fields";
 export const primary_changed_field = "primary_changed_field";
 export const context_json = "context_json";
 export const source_key = "source_key";
+export const related_resource_kind = "related_resource_kind";
+export const related_resource_id = "related_resource_id";
 export const created_at = "created_at";
 export const updated_at = "updated_at";
 export const deleted_at = "deleted_at";

package/generated/entity-fields-registry.ts

@@ -36,6 +36,8 @@ export const entityFieldsRegistry: Record<string, Record<string, string>> = {
       "primary_changed_field": "primary_changed_field",
       "context_json": "context_json",
       "source_key": "source_key",
+      "related_resource_kind": "related_resource_kind",
+      "related_resource_id": "related_resource_id",
       "created_at": "created_at",
       "updated_at": "updated_at",
       "deleted_at": "deleted_at"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.5.1-develop.2800.bfe2178a4f",
+  "version": "0.5.1-develop.2851.2854b4507f",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -237,10 +237,10 @@
     "ts-pattern": "^5.0.0"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.5.1-develop.2800.bfe2178a4f"
+    "@open-mercato/shared": "0.5.1-develop.2851.2854b4507f"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.5.1-develop.2800.bfe2178a4f",
+    "@open-mercato/shared": "0.5.1-develop.2851.2854b4507f",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/modules/audit_logs/data/entities.ts

@@ -12,6 +12,7 @@ export type ActionLogExecutionState = 'done' | 'undone' | 'failed' | 'redone'
 @Index({ name: 'action_logs_source_key_idx', properties: ['tenantId', 'organizationId', 'sourceKey', 'createdAt'] })
 @Index({ name: 'action_logs_primary_changed_field_idx', properties: ['tenantId', 'organizationId', 'primaryChangedField', 'createdAt'] })
 @Index({ name: 'action_logs_changed_fields_idx', properties: ['changedFields'], type: 'gin' })
+@Index({ name: 'action_logs_related_resource_idx', properties: ['tenantId', 'relatedResourceKind', 'relatedResourceId', 'createdAt'] })
 export class ActionLog {
   @PrimaryKey({ type: 'uuid', defaultRaw: 'gen_random_uuid()' })
   id!: string
@@ -76,6 +77,12 @@ export class ActionLog {
   @Property({ name: 'source_key', type: 'text', nullable: true })
   sourceKey: ActionLogSourceKey | null = null
 
+  @Property({ name: 'related_resource_kind', type: 'text', nullable: true })
+  relatedResourceKind: string | null = null
+
+  @Property({ name: 'related_resource_id', type: 'text', nullable: true })
+  relatedResourceId: string | null = null
+
   @Property({ name: 'created_at', type: Date, onCreate: () => new Date() })
   createdAt: Date = new Date()
 

package/src/modules/audit_logs/data/validators.ts

@@ -26,6 +26,8 @@ export const actionLogCreateSchema = baseScopeSchema.extend({
   commandPayload: z.unknown().optional(),
   snapshotBefore: z.unknown().optional(),
   snapshotAfter: z.unknown().optional(),
+  relatedResourceKind: z.string().min(1).optional().nullable(),
+  relatedResourceId: z.string().min(1).optional().nullable(),
   changes: recordLike,
   context: recordLike,
 })

package/src/modules/audit_logs/migrations/.snapshot-open-mercato.json

@@ -1,10 +1,12 @@
 {
+  "name": "public",
   "namespaces": [
     "public"
   ],
-  "name": "public",
   "tables": [
     {
+      "name": "access_logs",
+      "schema": "public",
       "columns": {
         "id": {
           "name": "id",
@@ -183,8 +185,6 @@
           "mappedType": "datetime"
         }
       },
-      "name": "access_logs",
-      "schema": "public",
       "indexes": [
         {
           "keyName": "access_logs_actor_idx",
@@ -224,6 +224,8 @@
       "nativeEnums": {}
     },
     {
+      "name": "action_logs",
+      "schema": "public",
       "columns": {
         "id": {
           "name": "id",
@@ -561,6 +563,38 @@
           "enumItems": [],
           "mappedType": "text"
         },
+        "related_resource_kind": {
+          "name": "related_resource_kind",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
+        "related_resource_id": {
+          "name": "related_resource_id",
+          "type": "text",
+          "unsigned": false,
+          "autoincrement": false,
+          "primary": false,
+          "nullable": true,
+          "unique": false,
+          "length": null,
+          "precision": null,
+          "scale": null,
+          "default": null,
+          "comment": null,
+          "enumItems": [],
+          "mappedType": "text"
+        },
         "created_at": {
           "name": "created_at",
           "type": "timestamptz",
@@ -610,9 +644,20 @@
           "mappedType": "datetime"
         }
       },
-      "name": "action_logs",
-      "schema": "public",
       "indexes": [
+        {
+          "keyName": "action_logs_related_resource_idx",
+          "columnNames": [
+            "tenant_id",
+            "related_resource_kind",
+            "related_resource_id",
+            "created_at"
+          ],
+          "composite": true,
+          "constraint": false,
+          "primary": false,
+          "unique": false
+        },
         {
           "keyName": "action_logs_changed_fields_idx",
           "columnNames": [
@@ -727,5 +772,6 @@
       "nativeEnums": {}
     }
   ],
+  "views": [],
   "nativeEnums": {}
 }

package/src/modules/audit_logs/migrations/Migration20260423202109.ts

@@ -0,0 +1,15 @@
+import { Migration } from '@mikro-orm/migrations';
+
+export class Migration20260423202109 extends Migration {
+
+  override up(): void | Promise<void> {
+    this.addSql(`alter table "action_logs" add "related_resource_kind" text null, add "related_resource_id" text null;`);
+    this.addSql(`create index "action_logs_related_resource_idx" on "action_logs" ("tenant_id", "related_resource_kind", "related_resource_id", "created_at");`);
+  }
+
+  override down(): void | Promise<void> {
+    this.addSql(`drop index "action_logs_related_resource_idx";`);
+    this.addSql(`alter table "action_logs" drop column "related_resource_kind", drop column "related_resource_id";`);
+  }
+
+}

package/src/modules/audit_logs/services/accessLogService.ts

@@ -23,6 +23,7 @@ const CORE_RETENTION_DAYS = toPositiveNumber(process.env.AUDIT_LOGS_CORE_RETENTI
 const NON_CORE_RETENTION_HOURS = toPositiveNumber(process.env.AUDIT_LOGS_NON_CORE_RETENTION_HOURS, 8)
 const CORE_RETENTION_MS = CORE_RETENTION_DAYS * 24 * 60 * 60 * 1000
 const NON_CORE_RETENTION_MS = NON_CORE_RETENTION_HOURS * 60 * 60 * 1000
+const UUID_REGEX = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
 
 let validationWarningLogged = false
 let runtimeValidationAvailable: boolean | null = null
@@ -140,10 +141,7 @@ export class AccessLogService {
     const UUID_REGEX = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
     const toNullableUuid = (value: unknown) => {
       if (typeof value !== 'string' || value.length === 0) return null
-      // Extract UUID from "api_key:<uuid>" format (used by workflow authentication)
       const candidate = value.startsWith('api_key:') ? value.slice('api_key:'.length) : value
-      // System actors (sync workers, scheduler, etc.) use non-UUID subjects like
-      // "system:...". Reject those so the uuid column stays valid.
       return UUID_REGEX.test(candidate) ? candidate : null
     }
     const fields = Array.isArray(input.fields)

package/src/modules/audit_logs/services/actionLogService.ts

@@ -27,6 +27,7 @@ const isZodRuntimeMissing = (err: unknown) => err instanceof TypeError && typeof
 const SORT_FIELDS = {
   createdAt: 'action_logs.created_at',
 } as const
+const UUID_REGEX = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
 
 type ActionLogProjectionBackfillOptions = {
   batchSize?: number
@@ -236,6 +237,8 @@ export class ActionLogService {
       resourceId: data.resourceId ?? null,
       parentResourceKind: data.parentResourceKind ?? null,
       parentResourceId: data.parentResourceId ?? null,
+      relatedResourceKind: toOptionalString(data.relatedResourceKind) ?? null,
+      relatedResourceId: toOptionalString(data.relatedResourceId) ?? null,
       executionState: data.executionState ?? 'done',
       undoToken: data.undoToken ?? null,
       commandPayload: data.commandPayload ?? null,
@@ -261,6 +264,8 @@ export class ActionLogService {
         actionLabel: undefined,
         resourceKind: undefined,
         resourceId: undefined,
+        relatedResourceKind: null,
+        relatedResourceId: null,
         executionState: 'done',
         undoToken: undefined,
         commandPayload: undefined,
@@ -274,13 +279,7 @@ export class ActionLogService {
     const UUID_REGEX = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/
     const toNullableUuid = (value: unknown) => {
       if (typeof value !== 'string' || value.length === 0) return null
-      // Extract UUID from "api_key:<uuid>" format (used by workflow authentication).
       const candidate = value.startsWith('api_key:') ? value.slice('api_key:'.length) : value
-      // System actors (outbound sync workers, scheduler, etc.) carry subjects like
-      // "system:example_customers_sync:outbound" that are not UUIDs. Writing them into
-      // `actor_user_id` (uuid column) trips the Postgres driver with
-      // `invalid input syntax for type uuid`. Reject anything that isn't a UUID so the
-      // action log safely records a null actor for system-originated commands.
       return UUID_REGEX.test(candidate) ? candidate : null
     }
 
@@ -307,6 +306,8 @@ export class ActionLogService {
       resourceId: toOptionalString(input.resourceId) ?? undefined,
       parentResourceKind: toOptionalString(input.parentResourceKind) ?? null,
       parentResourceId: toOptionalString(input.parentResourceId) ?? null,
+      relatedResourceKind: toOptionalString(input.relatedResourceKind) ?? null,
+      relatedResourceId: toOptionalString(input.relatedResourceId) ?? null,
       executionState: input.executionState === 'undone' || input.executionState === 'failed' ? input.executionState : 'done',
       undoToken: toOptionalString(input.undoToken) ?? undefined,
       commandPayload: input.commandPayload,
@@ -408,6 +409,10 @@ export class ActionLogService {
             eb('action_logs.parent_resource_kind', '=', parsed.resourceKind),
             eb('action_logs.parent_resource_id', '=', parsed.resourceId),
           ]),
+          eb.and([
+            eb('action_logs.related_resource_kind', '=', parsed.resourceKind),
+            eb('action_logs.related_resource_id', '=', parsed.resourceId),
+          ]),
         ])
       )
     } else {

package/src/modules/auth/cli.ts

@@ -642,7 +642,6 @@ const setPassword: ModuleCli = {
   },
 }
 
-// Export the full CLI list
 const syncRoleAcls: ModuleCli = {
   command: 'sync-role-acls',
   async run(rest) {
@@ -705,4 +704,5 @@ const syncRoleAcls: ModuleCli = {
   },
 }
 
+// Export the full CLI list
 export default [addUser, seedRoles, syncRoleAcls, rotateEncryptionKey, addOrganization, setupApp, listOrganizations, listTenants, listUsers, setPassword]

package/src/modules/customers/api/entity-roles-factory.ts

@@ -2,7 +2,6 @@ import { NextResponse } from 'next/server'
 import { z } from 'zod'
 import type { CommandBus } from '@open-mercato/shared/lib/commands'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
-import { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/operationMetadata'
 import { readJsonSafe } from '@open-mercato/shared/lib/http/readJsonSafe'
 import { validateCrudMutationGuard, runCrudMutationGuardAfterSuccess } from '@open-mercato/shared/lib/crud/mutation-guard'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
@@ -14,6 +13,8 @@ import { CustomerEntity, CustomerEntityRole } from '../data/entities'
 import { entityRoleCreateSchema, entityRoleUpdateSchema, entityRoleDeleteSchema, type EntityRoleCreateInput, type EntityRoleUpdateInput, type EntityRoleDeleteInput } from '../data/validators'
 import { withScopedPayload } from './utils'
 import { resolveCustomersRequestContext, resolveAuthActorId } from '../lib/interactionRequestContext'
+import { deriveDisplayNameFromEmail } from '../lib/displayName'
+import { withOperationMetadata } from '../lib/operationMetadata'
 
 const paramsSchema = z.object({ id: z.string().uuid() })
 const roleIdQuerySchema = z.object({ roleId: z.string().uuid() })
@@ -60,27 +61,6 @@ function buildValidationErrorResponse(error: z.ZodError, translate: Translator)
   )
 }
 
-function withOperationMetadata(
-  response: NextResponse,
-  logEntry: { undoToken?: string | null; id?: string | null; commandId?: string | null; actionLabel?: string | null; resourceKind?: string | null; resourceId?: string | null; createdAt?: Date | null } | null | undefined,
-  fallback: { resourceKind: string; resourceId: string | null },
-) {
-  if (!logEntry?.undoToken || !logEntry.id || !logEntry.commandId) return response
-  response.headers.set(
-    'x-om-operation',
-    serializeOperationMetadata({
-      id: logEntry.id,
-      undoToken: logEntry.undoToken,
-      commandId: logEntry.commandId,
-      actionLabel: logEntry.actionLabel ?? null,
-      resourceKind: logEntry.resourceKind ?? fallback.resourceKind,
-      resourceId: logEntry.resourceId ?? fallback.resourceId,
-      executedAt: logEntry.createdAt instanceof Date ? logEntry.createdAt.toISOString() : new Date().toISOString(),
-    }),
-  )
-  return response
-}
-
 async function buildContext(request: Request) {
   const context = await resolveCustomersRequestContext(request)
   return {
@@ -314,7 +294,7 @@ export function createEntityRolesHandlers(entityType: EntityType) {
           )
         : []
       const userMap = new Map(users.map((user) => [user.id, {
-        name: user.name ?? null,
+        name: user.name ?? deriveDisplayNameFromEmail(user.email) ?? null,
         email: user.email ?? null,
         phone: null,
       }]))

package/src/modules/customers/api/interactions/cancel/route.ts

@@ -14,6 +14,7 @@ import {
   validateCrudMutationGuard,
 } from '@open-mercato/shared/lib/crud/mutation-guard'
 import { resolveAuthActorId } from '../../../lib/interactionRequestContext'
+import { withOperationMetadata } from '../../../lib/operationMetadata'
 
 export const metadata = {
   POST: { requireAuth: true, requireFeatures: ['customers.interactions.manage'] },
@@ -56,7 +57,7 @@ export async function POST(req: Request) {
     }
 
     const commandBus = ctx.container.resolve('commandBus') as CommandBus
-    await commandBus.execute<InteractionCancelInput, { interactionId: string }>(
+    const { logEntry } = await commandBus.execute<InteractionCancelInput, { interactionId: string }>(
       'customers.interactions.cancel',
       { input: parsed, ctx },
     )
@@ -73,7 +74,11 @@ export async function POST(req: Request) {
         metadata: guardResult.metadata ?? null,
       })
     }
-    return NextResponse.json({ ok: true })
+    return withOperationMetadata(
+      NextResponse.json({ ok: true }),
+      logEntry,
+      { resourceKind: 'customers.interaction', resourceId: parsed.id },
+    )
   } catch (err) {
     if (err instanceof CrudHttpError) {
       return NextResponse.json(err.body, { status: err.status })