@open-mercato/core 0.6.4-develop.4217.1.c9aa050183 → 0.6.4-develop.4236.1.9fa6806b34

package/dist/modules/translations/commands/translations.js

@@ -30,31 +30,34 @@ const saveTranslationCommand = {
   },
   async execute(input, ctx) {
     const db = resolveDb(ctx);
-    const existing = await db.selectFrom("entity_translations").select(["id"]).where("entity_type", "=", input.entityType).where("entity_id", "=", input.entityId).where(sql`tenant_id is not distinct from ${input.tenantId}`).where(sql`organization_id is not distinct from ${input.organizationId}`).executeTakeFirst();
-    if (existing) {
-      await db.updateTable("entity_translations").set({
-        translations: sql`${JSON.stringify(input.translations)}::jsonb`,
-        updated_at: sql`now()`
-      }).where("id", "=", existing.id).execute();
-    } else {
-      await db.insertInto("entity_translations").values({
-        entity_type: input.entityType,
-        entity_id: input.entityId,
-        organization_id: input.organizationId,
-        tenant_id: input.tenantId,
-        translations: sql`${JSON.stringify(input.translations)}::jsonb`,
-        created_at: sql`now()`,
-        updated_at: sql`now()`
-      }).execute();
-    }
+    const rowId = await db.transaction().execute(async (trx) => {
+      const existing = await trx.selectFrom("entity_translations").select(["id"]).where("entity_type", "=", input.entityType).where("entity_id", "=", input.entityId).where(sql`tenant_id is not distinct from ${input.tenantId}`).where(sql`organization_id is not distinct from ${input.organizationId}`).executeTakeFirst();
+      if (existing) {
+        await trx.updateTable("entity_translations").set({
+          translations: sql`${JSON.stringify(input.translations)}::jsonb`,
+          updated_at: sql`now()`
+        }).where("id", "=", existing.id).execute();
+      } else {
+        await trx.insertInto("entity_translations").values({
+          entity_type: input.entityType,
+          entity_id: input.entityId,
+          organization_id: input.organizationId,
+          tenant_id: input.tenantId,
+          translations: sql`${JSON.stringify(input.translations)}::jsonb`,
+          created_at: sql`now()`,
+          updated_at: sql`now()`
+        }).execute();
+      }
+      const saved = await trx.selectFrom("entity_translations").select(["id"]).where("entity_type", "=", input.entityType).where("entity_id", "=", input.entityId).where(sql`tenant_id is not distinct from ${input.tenantId}`).where(sql`organization_id is not distinct from ${input.organizationId}`).executeTakeFirst();
+      return saved?.id ?? "";
+    });
     await emitTranslationsEvent("translations.translation.updated", {
       entityType: input.entityType,
       entityId: input.entityId,
       organizationId: input.organizationId,
       tenantId: input.tenantId
     }, { persistent: true }).catch(() => void 0);
-    const saved = await db.selectFrom("entity_translations").select(["id"]).where("entity_type", "=", input.entityType).where("entity_id", "=", input.entityId).where(sql`tenant_id is not distinct from ${input.tenantId}`).where(sql`organization_id is not distinct from ${input.organizationId}`).executeTakeFirst();
-    return { rowId: saved?.id ?? "" };
+    return { rowId };
   },
   async captureAfter(input, _result, ctx) {
     const db = resolveDb(ctx);

package/dist/modules/translations/commands/translations.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/translations/commands/translations.ts"],
-  "sourcesContent": ["import { registerCommand } from '@open-mercato/shared/lib/commands'\nimport type { CommandHandler, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'\nimport { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { type Kysely, sql } from 'kysely'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { emitTranslationsEvent } from '../events'\n\ntype TranslationSnapshot = {\n  id: string | null\n  entityType: string\n  entityId: string\n  translations: Record<string, Record<string, string | null>> | null\n  organizationId: string | null\n  tenantId: string\n}\n\ntype TranslationUndoPayload = {\n  before?: TranslationSnapshot | null\n  after?: TranslationSnapshot | null\n}\n\ntype SaveInput = {\n  entityType: string\n  entityId: string\n  translations: Record<string, Record<string, string | null>>\n  organizationId: string | null\n  tenantId: string\n}\n\ntype DeleteInput = {\n  entityType: string\n  entityId: string\n  organizationId: string | null\n  tenantId: string\n}\n\nfunction resolveDb(ctx: CommandRuntimeContext): Kysely<any> {\n  const em = ctx.container.resolve('em') as EntityManager\n  return em.getKysely<any>()\n}\n\nasync function loadTranslationSnapshot(\n  db: Kysely<any>,\n  entityType: string,\n  entityId: string,\n  tenantId: string,\n  organizationId: string | null,\n): Promise<TranslationSnapshot | null> {\n  const row = await (db as any)\n    .selectFrom('entity_translations')\n    .selectAll()\n    .where('entity_type', '=', entityType)\n    .where('entity_id', '=', entityId)\n    .where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)\n    .where(sql<boolean>`organization_id is not distinct from ${organizationId}`)\n    .executeTakeFirst() as Record<string, any> | undefined\n\n  if (!row) return null\n  return {\n    id: row.id,\n    entityType: row.entity_type,\n    entityId: row.entity_id,\n    translations: row.translations ?? null,\n    organizationId: row.organization_id ?? null,\n    tenantId: row.tenant_id,\n  }\n}\n\nconst saveTranslationCommand: CommandHandler<SaveInput, { rowId: string }> = {\n  id: 'translations.translation.save',\n\n  async prepare(input, ctx) {\n    ensureTenantScope(ctx, input.tenantId)\n    const db = resolveDb(ctx)\n    const snapshot = await loadTranslationSnapshot(db, input.entityType, input.entityId, input.tenantId, input.organizationId)\n    return { before: snapshot }\n  },\n\n  async execute(input, ctx) {\n    const db = resolveDb(ctx) as any\n    const existing = await db\n      .selectFrom('entity_translations')\n      .select(['id'])\n      .where('entity_type', '=', input.entityType)\n      .where('entity_id', '=', input.entityId)\n      .where(sql<boolean>`tenant_id is not distinct from ${input.tenantId}`)\n      .where(sql<boolean>`organization_id is not distinct from ${input.organizationId}`)\n      .executeTakeFirst() as { id: string } | undefined\n\n    if (existing) {\n      await db\n        .updateTable('entity_translations')\n        .set({\n          translations: sql`${JSON.stringify(input.translations)}::jsonb`,\n          updated_at: sql`now()`,\n        } as any)\n        .where('id', '=', existing.id)\n        .execute()\n    } else {\n      await db\n        .insertInto('entity_translations')\n        .values({\n          entity_type: input.entityType,\n          entity_id: input.entityId,\n          organization_id: input.organizationId,\n          tenant_id: input.tenantId,\n          translations: sql`${JSON.stringify(input.translations)}::jsonb`,\n          created_at: sql`now()`,\n          updated_at: sql`now()`,\n        } as any)\n        .execute()\n    }\n\n    await emitTranslationsEvent('translations.translation.updated', {\n      entityType: input.entityType,\n      entityId: input.entityId,\n      organizationId: input.organizationId,\n      tenantId: input.tenantId,\n    }, { persistent: true }).catch(() => undefined)\n\n    const saved = await db\n      .selectFrom('entity_translations')\n      .select(['id'])\n      .where('entity_type', '=', input.entityType)\n      .where('entity_id', '=', input.entityId)\n      .where(sql<boolean>`tenant_id is not distinct from ${input.tenantId}`)\n      .where(sql<boolean>`organization_id is not distinct from ${input.organizationId}`)\n      .executeTakeFirst() as { id: string } | undefined\n\n    return { rowId: saved?.id ?? '' }\n  },\n\n  async captureAfter(input, _result, ctx) {\n    const db = resolveDb(ctx)\n    return await loadTranslationSnapshot(db, input.entityType, input.entityId, input.tenantId, input.organizationId)\n  },\n\n  async buildLog({ snapshots, result }) {\n    const { translate } = await resolveTranslations()\n    const before = snapshots.before as TranslationSnapshot | null | undefined\n    const after = snapshots.after as TranslationSnapshot | null | undefined\n    return {\n      actionLabel: translate('translations.audit.save', 'Save translation'),\n      resourceKind: 'translations.translation',\n      resourceId: result.rowId,\n      tenantId: after?.tenantId ?? before?.tenantId ?? null,\n      organizationId: after?.organizationId ?? before?.organizationId ?? null,\n      snapshotBefore: before ?? null,\n      snapshotAfter: after ?? null,\n      payload: {\n        undo: { before: before ?? null, after: after ?? null } satisfies TranslationUndoPayload,\n      },\n    }\n  },\n\n  async undo({ logEntry, ctx }) {\n    const payload = extractUndoPayload<TranslationUndoPayload>(logEntry)\n    const before = payload?.before ?? null\n    const db = resolveDb(ctx) as any\n\n    if (!before || !before.translations) {\n      // Was a create \u2014 delete the record\n      const resourceId = logEntry?.resourceId\n      if (resourceId) {\n        await db.deleteFrom('entity_translations').where('id', '=', resourceId).execute()\n      }\n    } else {\n      // Was an update \u2014 restore previous translations\n      const existing = await db\n        .selectFrom('entity_translations')\n        .select(['id'])\n        .where('entity_type', '=', before.entityType)\n        .where('entity_id', '=', before.entityId)\n        .where(sql<boolean>`tenant_id is not distinct from ${before.tenantId}`)\n        .where(sql<boolean>`organization_id is not distinct from ${before.organizationId}`)\n        .executeTakeFirst() as { id: string } | undefined\n\n      if (existing) {\n        await db\n          .updateTable('entity_translations')\n          .set({\n            translations: sql`${JSON.stringify(before.translations)}::jsonb`,\n            updated_at: sql`now()`,\n          } as any)\n          .where('id', '=', existing.id)\n          .execute()\n      } else {\n        await db\n          .insertInto('entity_translations')\n          .values({\n            entity_type: before.entityType,\n            entity_id: before.entityId,\n            organization_id: before.organizationId,\n            tenant_id: before.tenantId,\n            translations: sql`${JSON.stringify(before.translations)}::jsonb`,\n            created_at: sql`now()`,\n            updated_at: sql`now()`,\n          } as any)\n          .execute()\n      }\n    }\n  },\n}\n\nconst deleteTranslationCommand: CommandHandler<DeleteInput, { deleted: boolean }> = {\n  id: 'translations.translation.delete',\n\n  async prepare(input, ctx) {\n    ensureTenantScope(ctx, input.tenantId)\n    const db = resolveDb(ctx)\n    const snapshot = await loadTranslationSnapshot(db, input.entityType, input.entityId, input.tenantId, input.organizationId)\n    return { before: snapshot }\n  },\n\n  async execute(input, ctx) {\n    const db = resolveDb(ctx) as any\n    const result = await db\n      .deleteFrom('entity_translations')\n      .where('entity_type', '=', input.entityType)\n      .where('entity_id', '=', input.entityId)\n      .where(sql<boolean>`tenant_id is not distinct from ${input.tenantId}`)\n      .where(sql<boolean>`organization_id is not distinct from ${input.organizationId}`)\n      .executeTakeFirst() as { numDeletedRows?: bigint | number } | undefined\n    const count = Number(result?.numDeletedRows ?? 0)\n\n    await emitTranslationsEvent('translations.translation.deleted', {\n      entityType: input.entityType,\n      entityId: input.entityId,\n      organizationId: input.organizationId,\n      tenantId: input.tenantId,\n    }, { persistent: true }).catch(() => undefined)\n\n    return { deleted: count > 0 }\n  },\n\n  async buildLog({ snapshots }) {\n    const before = snapshots.before as TranslationSnapshot | null | undefined\n    if (!before) return null\n    const { translate } = await resolveTranslations()\n    return {\n      actionLabel: translate('translations.audit.delete', 'Delete translation'),\n      resourceKind: 'translations.translation',\n      resourceId: before.id ?? undefined,\n      tenantId: before.tenantId,\n      organizationId: before.organizationId,\n      snapshotBefore: before,\n      payload: {\n        undo: { before } satisfies TranslationUndoPayload,\n      },\n    }\n  },\n\n  async undo({ logEntry, ctx }) {\n    const payload = extractUndoPayload<TranslationUndoPayload>(logEntry)\n    const before = payload?.before\n    if (!before || !before.translations) return\n    const db = resolveDb(ctx) as any\n\n    const existing = await db\n      .selectFrom('entity_translations')\n      .select(['id'])\n      .where('entity_type', '=', before.entityType)\n      .where('entity_id', '=', before.entityId)\n      .where(sql<boolean>`tenant_id is not distinct from ${before.tenantId}`)\n      .where(sql<boolean>`organization_id is not distinct from ${before.organizationId}`)\n      .executeTakeFirst() as { id: string } | undefined\n\n    if (!existing) {\n      await db\n        .insertInto('entity_translations')\n        .values({\n          entity_type: before.entityType,\n          entity_id: before.entityId,\n          organization_id: before.organizationId,\n          tenant_id: before.tenantId,\n          translations: sql`${JSON.stringify(before.translations)}::jsonb`,\n          created_at: sql`now()`,\n          updated_at: sql`now()`,\n        } as any)\n        .execute()\n    }\n  },\n}\n\nregisterCommand(saveTranslationCommand)\nregisterCommand(deleteTranslationCommand)\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { registerCommand } from '@open-mercato/shared/lib/commands'\nimport type { CommandHandler, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { ensureTenantScope } from '@open-mercato/shared/lib/commands/scope'\nimport { extractUndoPayload } from '@open-mercato/shared/lib/commands/undo'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { type Kysely, sql } from 'kysely'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { emitTranslationsEvent } from '../events'\n\ntype TranslationSnapshot = {\n  id: string | null\n  entityType: string\n  entityId: string\n  translations: Record<string, Record<string, string | null>> | null\n  organizationId: string | null\n  tenantId: string\n}\n\ntype TranslationUndoPayload = {\n  before?: TranslationSnapshot | null\n  after?: TranslationSnapshot | null\n}\n\ntype SaveInput = {\n  entityType: string\n  entityId: string\n  translations: Record<string, Record<string, string | null>>\n  organizationId: string | null\n  tenantId: string\n}\n\ntype DeleteInput = {\n  entityType: string\n  entityId: string\n  organizationId: string | null\n  tenantId: string\n}\n\nfunction resolveDb(ctx: CommandRuntimeContext): Kysely<any> {\n  const em = ctx.container.resolve('em') as EntityManager\n  return em.getKysely<any>()\n}\n\nasync function loadTranslationSnapshot(\n  db: Kysely<any>,\n  entityType: string,\n  entityId: string,\n  tenantId: string,\n  organizationId: string | null,\n): Promise<TranslationSnapshot | null> {\n  const row = await (db as any)\n    .selectFrom('entity_translations')\n    .selectAll()\n    .where('entity_type', '=', entityType)\n    .where('entity_id', '=', entityId)\n    .where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)\n    .where(sql<boolean>`organization_id is not distinct from ${organizationId}`)\n    .executeTakeFirst() as Record<string, any> | undefined\n\n  if (!row) return null\n  return {\n    id: row.id,\n    entityType: row.entity_type,\n    entityId: row.entity_id,\n    translations: row.translations ?? null,\n    organizationId: row.organization_id ?? null,\n    tenantId: row.tenant_id,\n  }\n}\n\nconst saveTranslationCommand: CommandHandler<SaveInput, { rowId: string }> = {\n  id: 'translations.translation.save',\n\n  async prepare(input, ctx) {\n    ensureTenantScope(ctx, input.tenantId)\n    const db = resolveDb(ctx)\n    const snapshot = await loadTranslationSnapshot(db, input.entityType, input.entityId, input.tenantId, input.organizationId)\n    return { before: snapshot }\n  },\n\n  async execute(input, ctx) {\n    const db = resolveDb(ctx) as any\n\n    // Run the lookup + upsert + id read in one transaction so a concurrent\n    // writer cannot slip between the existence check and the insert/update.\n    const rowId = await db.transaction().execute(async (trx: any) => {\n      const existing = await trx\n        .selectFrom('entity_translations')\n        .select(['id'])\n        .where('entity_type', '=', input.entityType)\n        .where('entity_id', '=', input.entityId)\n        .where(sql<boolean>`tenant_id is not distinct from ${input.tenantId}`)\n        .where(sql<boolean>`organization_id is not distinct from ${input.organizationId}`)\n        .executeTakeFirst() as { id: string } | undefined\n\n      if (existing) {\n        await trx\n          .updateTable('entity_translations')\n          .set({\n            translations: sql`${JSON.stringify(input.translations)}::jsonb`,\n            updated_at: sql`now()`,\n          } as any)\n          .where('id', '=', existing.id)\n          .execute()\n      } else {\n        await trx\n          .insertInto('entity_translations')\n          .values({\n            entity_type: input.entityType,\n            entity_id: input.entityId,\n            organization_id: input.organizationId,\n            tenant_id: input.tenantId,\n            translations: sql`${JSON.stringify(input.translations)}::jsonb`,\n            created_at: sql`now()`,\n            updated_at: sql`now()`,\n          } as any)\n          .execute()\n      }\n\n      const saved = await trx\n        .selectFrom('entity_translations')\n        .select(['id'])\n        .where('entity_type', '=', input.entityType)\n        .where('entity_id', '=', input.entityId)\n        .where(sql<boolean>`tenant_id is not distinct from ${input.tenantId}`)\n        .where(sql<boolean>`organization_id is not distinct from ${input.organizationId}`)\n        .executeTakeFirst() as { id: string } | undefined\n\n      return saved?.id ?? ''\n    })\n\n    // Emit AFTER the write commits \u2014 never announce a change that rolled back.\n    await emitTranslationsEvent('translations.translation.updated', {\n      entityType: input.entityType,\n      entityId: input.entityId,\n      organizationId: input.organizationId,\n      tenantId: input.tenantId,\n    }, { persistent: true }).catch(() => undefined)\n\n    return { rowId }\n  },\n\n  async captureAfter(input, _result, ctx) {\n    const db = resolveDb(ctx)\n    return await loadTranslationSnapshot(db, input.entityType, input.entityId, input.tenantId, input.organizationId)\n  },\n\n  async buildLog({ snapshots, result }) {\n    const { translate } = await resolveTranslations()\n    const before = snapshots.before as TranslationSnapshot | null | undefined\n    const after = snapshots.after as TranslationSnapshot | null | undefined\n    return {\n      actionLabel: translate('translations.audit.save', 'Save translation'),\n      resourceKind: 'translations.translation',\n      resourceId: result.rowId,\n      tenantId: after?.tenantId ?? before?.tenantId ?? null,\n      organizationId: after?.organizationId ?? before?.organizationId ?? null,\n      snapshotBefore: before ?? null,\n      snapshotAfter: after ?? null,\n      payload: {\n        undo: { before: before ?? null, after: after ?? null } satisfies TranslationUndoPayload,\n      },\n    }\n  },\n\n  async undo({ logEntry, ctx }) {\n    const payload = extractUndoPayload<TranslationUndoPayload>(logEntry)\n    const before = payload?.before ?? null\n    const db = resolveDb(ctx) as any\n\n    if (!before || !before.translations) {\n      // Was a create \u2014 delete the record\n      const resourceId = logEntry?.resourceId\n      if (resourceId) {\n        await db.deleteFrom('entity_translations').where('id', '=', resourceId).execute()\n      }\n    } else {\n      // Was an update \u2014 restore previous translations\n      const existing = await db\n        .selectFrom('entity_translations')\n        .select(['id'])\n        .where('entity_type', '=', before.entityType)\n        .where('entity_id', '=', before.entityId)\n        .where(sql<boolean>`tenant_id is not distinct from ${before.tenantId}`)\n        .where(sql<boolean>`organization_id is not distinct from ${before.organizationId}`)\n        .executeTakeFirst() as { id: string } | undefined\n\n      if (existing) {\n        await db\n          .updateTable('entity_translations')\n          .set({\n            translations: sql`${JSON.stringify(before.translations)}::jsonb`,\n            updated_at: sql`now()`,\n          } as any)\n          .where('id', '=', existing.id)\n          .execute()\n      } else {\n        await db\n          .insertInto('entity_translations')\n          .values({\n            entity_type: before.entityType,\n            entity_id: before.entityId,\n            organization_id: before.organizationId,\n            tenant_id: before.tenantId,\n            translations: sql`${JSON.stringify(before.translations)}::jsonb`,\n            created_at: sql`now()`,\n            updated_at: sql`now()`,\n          } as any)\n          .execute()\n      }\n    }\n  },\n}\n\nconst deleteTranslationCommand: CommandHandler<DeleteInput, { deleted: boolean }> = {\n  id: 'translations.translation.delete',\n\n  async prepare(input, ctx) {\n    ensureTenantScope(ctx, input.tenantId)\n    const db = resolveDb(ctx)\n    const snapshot = await loadTranslationSnapshot(db, input.entityType, input.entityId, input.tenantId, input.organizationId)\n    return { before: snapshot }\n  },\n\n  async execute(input, ctx) {\n    const db = resolveDb(ctx) as any\n    const result = await db\n      .deleteFrom('entity_translations')\n      .where('entity_type', '=', input.entityType)\n      .where('entity_id', '=', input.entityId)\n      .where(sql<boolean>`tenant_id is not distinct from ${input.tenantId}`)\n      .where(sql<boolean>`organization_id is not distinct from ${input.organizationId}`)\n      .executeTakeFirst() as { numDeletedRows?: bigint | number } | undefined\n    const count = Number(result?.numDeletedRows ?? 0)\n\n    await emitTranslationsEvent('translations.translation.deleted', {\n      entityType: input.entityType,\n      entityId: input.entityId,\n      organizationId: input.organizationId,\n      tenantId: input.tenantId,\n    }, { persistent: true }).catch(() => undefined)\n\n    return { deleted: count > 0 }\n  },\n\n  async buildLog({ snapshots }) {\n    const before = snapshots.before as TranslationSnapshot | null | undefined\n    if (!before) return null\n    const { translate } = await resolveTranslations()\n    return {\n      actionLabel: translate('translations.audit.delete', 'Delete translation'),\n      resourceKind: 'translations.translation',\n      resourceId: before.id ?? undefined,\n      tenantId: before.tenantId,\n      organizationId: before.organizationId,\n      snapshotBefore: before,\n      payload: {\n        undo: { before } satisfies TranslationUndoPayload,\n      },\n    }\n  },\n\n  async undo({ logEntry, ctx }) {\n    const payload = extractUndoPayload<TranslationUndoPayload>(logEntry)\n    const before = payload?.before\n    if (!before || !before.translations) return\n    const db = resolveDb(ctx) as any\n\n    const existing = await db\n      .selectFrom('entity_translations')\n      .select(['id'])\n      .where('entity_type', '=', before.entityType)\n      .where('entity_id', '=', before.entityId)\n      .where(sql<boolean>`tenant_id is not distinct from ${before.tenantId}`)\n      .where(sql<boolean>`organization_id is not distinct from ${before.organizationId}`)\n      .executeTakeFirst() as { id: string } | undefined\n\n    if (!existing) {\n      await db\n        .insertInto('entity_translations')\n        .values({\n          entity_type: before.entityType,\n          entity_id: before.entityId,\n          organization_id: before.organizationId,\n          tenant_id: before.tenantId,\n          translations: sql`${JSON.stringify(before.translations)}::jsonb`,\n          created_at: sql`now()`,\n          updated_at: sql`now()`,\n        } as any)\n        .execute()\n    }\n  },\n}\n\nregisterCommand(saveTranslationCommand)\nregisterCommand(deleteTranslationCommand)\n"],
+  "mappings": "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",
   "names": []
 }

package/generated/entities/staff_time_entry/index.ts

@@ -0,0 +1,17 @@
+export const id = "id";
+export const tenant_id = "tenant_id";
+export const organization_id = "organization_id";
+export const staff_member_id = "staff_member_id";
+export const date = "date";
+export const duration_minutes = "duration_minutes";
+export const started_at = "started_at";
+export const ended_at = "ended_at";
+export const notes = "notes";
+export const time_project_id = "time_project_id";
+export const customer_id = "customer_id";
+export const deal_id = "deal_id";
+export const order_id = "order_id";
+export const source = "source";
+export const created_at = "created_at";
+export const updated_at = "updated_at";
+export const deleted_at = "deleted_at";

package/generated/entities/staff_time_entry_segment/index.ts

@@ -0,0 +1,10 @@
+export const id = "id";
+export const tenant_id = "tenant_id";
+export const organization_id = "organization_id";
+export const time_entry_id = "time_entry_id";
+export const started_at = "started_at";
+export const ended_at = "ended_at";
+export const segment_type = "segment_type";
+export const created_at = "created_at";
+export const updated_at = "updated_at";
+export const deleted_at = "deleted_at";

package/generated/entities/staff_time_project/index.ts

@@ -0,0 +1,16 @@
+export const id = "id";
+export const tenant_id = "tenant_id";
+export const organization_id = "organization_id";
+export const name = "name";
+export const customer_id = "customer_id";
+export const code = "code";
+export const description = "description";
+export const project_type = "project_type";
+export const color = "color";
+export const status = "status";
+export const owner_user_id = "owner_user_id";
+export const cost_center = "cost_center";
+export const start_date = "start_date";
+export const created_at = "created_at";
+export const updated_at = "updated_at";
+export const deleted_at = "deleted_at";

package/generated/entities/staff_time_project_member/index.ts

@@ -0,0 +1,13 @@
+export const id = "id";
+export const tenant_id = "tenant_id";
+export const organization_id = "organization_id";
+export const time_project_id = "time_project_id";
+export const staff_member_id = "staff_member_id";
+export const role = "role";
+export const status = "status";
+export const show_in_grid = "show_in_grid";
+export const assigned_start_date = "assigned_start_date";
+export const assigned_end_date = "assigned_end_date";
+export const created_at = "created_at";
+export const updated_at = "updated_at";
+export const deleted_at = "deleted_at";

package/generated/entities.ids.generated.ts

@@ -209,7 +209,11 @@ export const M = {
       "staff_team_member_comment": "staff:staff_team_member_comment",
       "staff_team_member_activity": "staff:staff_team_member_activity",
       "staff_team_member_job_history": "staff:staff_team_member_job_history",
-      "staff_team_member_address": "staff:staff_team_member_address"
+      "staff_team_member_address": "staff:staff_team_member_address",
+      "staff_time_entry": "staff:staff_time_entry",
+      "staff_time_entry_segment": "staff:staff_time_entry_segment",
+      "staff_time_project": "staff:staff_time_project",
+      "staff_time_project_member": "staff:staff_time_project_member"
     },
     "notifications": {
       "notification": "notifications:notification"

package/generated/entity-fields-registry.ts

@@ -2480,6 +2480,70 @@ export const entityFieldsRegistry: Record<string, Record<string, string>> = {
       "updated_at": "updated_at",
       "deleted_at": "deleted_at"
     },
+    "staff_time_entry": {
+      "id": "id",
+      "tenant_id": "tenant_id",
+      "organization_id": "organization_id",
+      "staff_member_id": "staff_member_id",
+      "date": "date",
+      "duration_minutes": "duration_minutes",
+      "started_at": "started_at",
+      "ended_at": "ended_at",
+      "notes": "notes",
+      "time_project_id": "time_project_id",
+      "customer_id": "customer_id",
+      "deal_id": "deal_id",
+      "order_id": "order_id",
+      "source": "source",
+      "created_at": "created_at",
+      "updated_at": "updated_at",
+      "deleted_at": "deleted_at"
+    },
+    "staff_time_entry_segment": {
+      "id": "id",
+      "tenant_id": "tenant_id",
+      "organization_id": "organization_id",
+      "time_entry_id": "time_entry_id",
+      "started_at": "started_at",
+      "ended_at": "ended_at",
+      "segment_type": "segment_type",
+      "created_at": "created_at",
+      "updated_at": "updated_at",
+      "deleted_at": "deleted_at"
+    },
+    "staff_time_project": {
+      "id": "id",
+      "tenant_id": "tenant_id",
+      "organization_id": "organization_id",
+      "name": "name",
+      "customer_id": "customer_id",
+      "code": "code",
+      "description": "description",
+      "project_type": "project_type",
+      "color": "color",
+      "status": "status",
+      "owner_user_id": "owner_user_id",
+      "cost_center": "cost_center",
+      "start_date": "start_date",
+      "created_at": "created_at",
+      "updated_at": "updated_at",
+      "deleted_at": "deleted_at"
+    },
+    "staff_time_project_member": {
+      "id": "id",
+      "tenant_id": "tenant_id",
+      "organization_id": "organization_id",
+      "time_project_id": "time_project_id",
+      "staff_member_id": "staff_member_id",
+      "role": "role",
+      "status": "status",
+      "show_in_grid": "show_in_grid",
+      "assigned_start_date": "assigned_start_date",
+      "assigned_end_date": "assigned_end_date",
+      "created_at": "created_at",
+      "updated_at": "updated_at",
+      "deleted_at": "deleted_at"
+    },
     "step_instance": {
       "id": "id",
       "workflow_instance_id": "workflow_instance_id",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.4-develop.4217.1.c9aa050183",
+  "version": "0.6.4-develop.4236.1.9fa6806b34",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -243,16 +243,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.4-develop.4217.1.c9aa050183",
-    "@open-mercato/shared": "0.6.4-develop.4217.1.c9aa050183",
-    "@open-mercato/ui": "0.6.4-develop.4217.1.c9aa050183",
+    "@open-mercato/ai-assistant": "0.6.4-develop.4236.1.9fa6806b34",
+    "@open-mercato/shared": "0.6.4-develop.4236.1.9fa6806b34",
+    "@open-mercato/ui": "0.6.4-develop.4236.1.9fa6806b34",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.4-develop.4217.1.c9aa050183",
-    "@open-mercato/shared": "0.6.4-develop.4217.1.c9aa050183",
-    "@open-mercato/ui": "0.6.4-develop.4217.1.c9aa050183",
+    "@open-mercato/ai-assistant": "0.6.4-develop.4236.1.9fa6806b34",
+    "@open-mercato/shared": "0.6.4-develop.4236.1.9fa6806b34",
+    "@open-mercato/ui": "0.6.4-develop.4236.1.9fa6806b34",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

package/src/helpers/integration/timesheetFixtures.ts

@@ -0,0 +1,61 @@
+import { expect, type APIRequestContext } from '@playwright/test'
+import { apiRequest } from './api'
+import { deleteStaffEntityIfExists } from './staffFixtures'
+
+export async function createTimeProjectFixture(
+  request: APIRequestContext,
+  token: string,
+  input?: { name?: string; code?: string },
+): Promise<string> {
+  const response = await apiRequest(request, 'POST', '/api/staff/timesheets/time-projects', {
+    token,
+    data: {
+      name: input?.name ?? `QA Project ${Date.now()}`,
+      code: input?.code ?? `QA-${Date.now()}`,
+      projectType: 'internal',
+      status: 'active',
+    },
+  })
+  expect(response.ok(), `Failed to create time project fixture: ${response.status()}`).toBeTruthy()
+  const body = (await response.json()) as { id?: string }
+  expect(typeof body.id === 'string' && body.id.length > 0).toBeTruthy()
+  return body.id as string
+}
+
+export async function assignEmployeeToProjectFixture(
+  request: APIRequestContext,
+  token: string,
+  projectId: string,
+  staffMemberId: string,
+): Promise<string> {
+  const response = await apiRequest(request, 'POST', `/api/staff/timesheets/time-projects/${projectId}/employees`, {
+    token,
+    data: { staffMemberId, status: 'active', assignedStartDate: new Date().toISOString().slice(0, 10) },
+  })
+  expect(response.ok(), `Failed to assign employee to project: ${response.status()}`).toBeTruthy()
+  const body = (await response.json()) as { id?: string }
+  return body.id ?? ''
+}
+
+export async function createTimeEntryFixture(
+  request: APIRequestContext,
+  token: string,
+  input: { staffMemberId: string; timeProjectId: string; date: string; durationMinutes: number },
+): Promise<string> {
+  const response = await apiRequest(request, 'POST', '/api/staff/timesheets/time-entries', {
+    token,
+    data: {
+      staffMemberId: input.staffMemberId,
+      timeProjectId: input.timeProjectId,
+      date: input.date,
+      durationMinutes: input.durationMinutes,
+      source: 'manual',
+    },
+  })
+  expect(response.ok(), `Failed to create time entry fixture: ${response.status()}`).toBeTruthy()
+  const body = (await response.json()) as { id?: string }
+  expect(typeof body.id === 'string' && body.id.length > 0).toBeTruthy()
+  return body.id as string
+}
+
+export { deleteStaffEntityIfExists }

package/src/modules/attachments/api/library/[id]/route.ts

@@ -163,22 +163,25 @@ export async function PATCH(req: NextRequest, ctx: RouteContext) {
   if (parsed.data.tags) patch.tags = normalizeAttachmentTags(parsed.data.tags)
   if (parsed.data.assignments) patch.assignments = normalizeAttachmentAssignments(parsed.data.assignments)
   record.storageMetadata = mergeAttachmentMetadata(record.storageMetadata, patch)
-  await em.flush()
-
-  if (dataEngine && custom && Object.keys(custom).length) {
-    try {
-      await setCustomFieldsIfAny({
-        dataEngine,
-        entityId: E.attachments.attachment,
-        recordId: record.id,
-        tenantId: record.tenantId ?? auth.tenantId ?? null,
-        organizationId: record.organizationId ?? auth.orgId ?? null,
-        values: custom,
-      })
-    } catch (error) {
-      console.error('[attachments] failed to persist custom attributes', error)
-      return NextResponse.json({ error: 'Failed to save attachment attributes.' }, { status: 500 })
-    }
+  // Commit the metadata mutation and the custom-field write atomically so a
+  // custom-field failure cannot leave the attachment metadata partially updated.
+  try {
+    await em.transactional(async (tx) => {
+      await tx.flush()
+      if (dataEngine && custom && Object.keys(custom).length) {
+        await setCustomFieldsIfAny({
+          dataEngine,
+          entityId: E.attachments.attachment,
+          recordId: record.id,
+          tenantId: record.tenantId ?? auth.tenantId ?? null,
+          organizationId: record.organizationId ?? auth.orgId ?? null,
+          values: custom,
+        })
+      }
+    })
+  } catch (error) {
+    console.error('[attachments] failed to persist custom attributes', error)
+    return NextResponse.json({ error: 'Failed to save attachment attributes.' }, { status: 500 })
   }
 
   if (dataEngine) {
@@ -242,8 +245,12 @@ export async function DELETE(req: NextRequest, ctx: RouteContext) {
     tenantId: record.tenantId ?? auth.tenantId,
     organizationId: record.organizationId ?? auth.orgId,
   })
-  await deleteDriver.delete(record.partitionCode, record.storagePath)
+  // Commit the DB row removal before deleting the irreversible storage file so a
+  // failed commit cannot leave a dangling record whose backing file is already gone.
+  const recordPartitionCode = record.partitionCode
+  const recordStoragePath = record.storagePath
   await em.remove(record).flush()
+  await deleteDriver.delete(recordPartitionCode, recordStoragePath)
 
   if (dataEngine) {
     await emitCrudSideEffects({

package/src/modules/attachments/api/route.ts

@@ -437,7 +437,26 @@ export async function POST(req: Request) {
     content: extractedContent,
     storageMetadata: metadata,
   })
-  await em.persist(att).flush()
+  // Persist the attachment row and its custom-field values atomically so a
+  // custom-field failure cannot leave behind a committed orphan attachment.
+  try {
+    await em.transactional(async (tx) => {
+      await tx.persist(att).flush()
+      if (dataEngine) {
+        await setCustomFieldsIfAny({
+          dataEngine,
+          entityId: E.attachments.attachment,
+          recordId: attachmentId,
+          tenantId,
+          organizationId: orgId,
+          values: customFieldValues,
+        })
+      }
+    })
+  } catch (error) {
+    console.error('[attachments] failed to persist attachment with custom attributes', error)
+    return NextResponse.json({ error: 'Failed to save attachment attributes.' }, { status: 500 })
+  }
 
   if (useLlmOcr) {
     requestOcrProcessing(em, att, uploadDriver, storedPath).catch((error) => {
@@ -448,19 +467,6 @@ export async function POST(req: Request) {
   }
 
   if (dataEngine) {
-    try {
-      await setCustomFieldsIfAny({
-        dataEngine,
-        entityId: E.attachments.attachment,
-        recordId: attachmentId,
-        tenantId,
-        organizationId: orgId,
-        values: customFieldValues,
-      })
-    } catch (error) {
-      console.error('[attachments] failed to persist custom attributes', error)
-      return NextResponse.json({ error: 'Failed to save attachment attributes.' }, { status: 500 })
-    }
     await emitCrudSideEffects({
       dataEngine,
       action: 'created',

package/src/modules/auth/api/roles/acl/route.ts

@@ -9,6 +9,7 @@ import { RoleAcl, Role } from '@open-mercato/core/modules/auth/data/entities'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { resolveIsSuperAdmin } from '@open-mercato/core/modules/auth/lib/tenantAccess'
 import { RbacService } from '@open-mercato/core/modules/auth/services/rbacService'
+import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import {
   assertActorCanGrantAcl,
   assertActorCanModifySuperAdminRoleTarget,
@@ -208,11 +209,16 @@ export async function PUT(req: Request) {
     throw err
   }
 
-  acl.organizationsJson = requestedOrganizations
-  acl.isSuperAdmin = requestedIsSuperAdmin
-  acl.featuresJson = requestedFeatures
-  await em.persist(acl).flush()
-  
+  const aclToPersist = acl
+  await withAtomicFlush(em, [
+    () => {
+      aclToPersist.organizationsJson = requestedOrganizations
+      aclToPersist.isSuperAdmin = requestedIsSuperAdmin
+      aclToPersist.featuresJson = requestedFeatures
+      em.persist(aclToPersist)
+    },
+  ], { transaction: true })
+
   // Invalidate cache for all users in this tenant since role ACL changed
   if (targetTenantId) {
     await rbacService.invalidateTenantCache(targetTenantId)

package/src/modules/auth/api/sidebar/preferences/route.ts

@@ -15,6 +15,7 @@ import {
   saveSidebarPreference,
 } from '../../../services/sidebarPreferencesService'
 import { SIDEBAR_PREFERENCES_VERSION } from '@open-mercato/shared/modules/navigation/sidebarPreferences'
+import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
 import { Role, RoleSidebarPreference } from '../../../data/entities'
 import type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'
 import { z } from 'zod'
@@ -376,38 +377,46 @@ export async function PUT(req: Request) {
     : []
   const roleMap = new Map<string, Role>(availableRoles.map((role: Role) => [String(role.id), role]))
 
-  const updatedRoleIds: string[] = []
   if (applyToRoles.length > 0) {
     const missing = applyToRoles.filter((id) => !roleMap.has(id))
     if (missing.length) {
       return NextResponse.json({ error: 'Invalid roles', missing }, { status: 400 })
     }
-    for (const roleId of applyToRoles) {
-      const role = roleMap.get(roleId)!
-      await saveRoleSidebarPreference(em, {
-        roleId: role.id,
-        tenantId: auth.tenantId ?? null,
-        locale,
-      }, payload)
-      updatedRoleIds.push(role.id)
-    }
   }
 
-  const filteredClearRoleIds = clearRoleIds.filter((id) => !updatedRoleIds.includes(id) && !applyToRoles.includes(id))
+  const updatedRoleIds: string[] = []
+  const filteredClearRoleIds: string[] = []
+  await withAtomicFlush(em, [
+    async () => {
+      for (const roleId of applyToRoles) {
+        const role = roleMap.get(roleId)!
+        await saveRoleSidebarPreference(em, {
+          roleId: role.id,
+          tenantId: auth.tenantId ?? null,
+          locale,
+        }, payload)
+        updatedRoleIds.push(role.id)
+      }
 
-  if (filteredClearRoleIds.length > 0) {
-    // Cross-locale: role preferences are unique per (role, tenantId); keep the delete
-    // filter aligned with save/load helpers so a clear from one locale does not leave
-    // a row created under another locale orphaned.
-    await em.nativeDelete(RoleSidebarPreference, {
-      role: { $in: filteredClearRoleIds },
-      tenantId: auth.tenantId ?? null,
-    })
-    if (cache?.deleteByTags) {
-      try {
-        await cache.deleteByTags(filteredClearRoleIds.map((roleId) => `nav:sidebar:role:${roleId}`))
-      } catch {}
-    }
+      const clearTargets = clearRoleIds.filter((id) => !updatedRoleIds.includes(id) && !applyToRoles.includes(id))
+      filteredClearRoleIds.push(...clearTargets)
+
+      if (filteredClearRoleIds.length > 0) {
+        // Cross-locale: role preferences are unique per (role, tenantId); keep the delete
+        // filter aligned with save/load helpers so a clear from one locale does not leave
+        // a row created under another locale orphaned.
+        await em.nativeDelete(RoleSidebarPreference, {
+          role: { $in: filteredClearRoleIds },
+          tenantId: auth.tenantId ?? null,
+        })
+      }
+    },
+  ], { transaction: true })
+
+  if (filteredClearRoleIds.length > 0 && cache?.deleteByTags) {
+    try {
+      await cache.deleteByTags(filteredClearRoleIds.map((roleId) => `nav:sidebar:role:${roleId}`))
+    } catch {}
   }
 
   if (cache?.deleteByTags) {