@open-mercato/core 0.6.6-develop.6402.1.080aab8ec9 → 0.6.6-develop.6403.1.b57089b6fe

package/dist/modules/planner/api/availability-weekly.js

@@ -109,7 +109,17 @@ const openApi = {
         { status: 200, description: "Weekly availability updated", schema: z.object({ ok: z.literal(true) }) },
         { status: 400, description: "Invalid payload", schema: z.object({ error: z.string() }) },
         { status: 401, description: "Unauthorized", schema: z.object({ error: z.string() }) },
-        { status: 403, description: "Forbidden", schema: z.object({ error: z.string() }) }
+        { status: 403, description: "Forbidden", schema: z.object({ error: z.string() }) },
+        {
+          status: 409,
+          description: "Optimistic lock conflict",
+          schema: z.object({
+            error: z.string(),
+            code: z.literal("optimistic_lock_conflict"),
+            currentUpdatedAt: z.string(),
+            expectedUpdatedAt: z.string()
+          })
+        }
       ]
     }
   }

package/dist/modules/planner/api/availability-weekly.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/planner/api/availability-weekly.ts"],
-  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { parseScopedCommandInput } from '@open-mercato/shared/lib/api/scoped'\nimport { plannerAvailabilityWeeklyReplaceSchema } from '../data/validators'\nimport { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/operationMetadata'\nimport {\n  runCrudMutationGuardAfterSuccess,\n  validateCrudMutationGuard,\n} from '@open-mercato/shared/lib/crud/mutation-guard'\nimport { assertAvailabilityWriteAccess, resolveAvailabilityActorId } from './access'\n\nexport const metadata = {\n  POST: { requireAuth: true },\n}\n\ntype RequestContext = {\n  ctx: CommandRuntimeContext\n}\n\nasync function resolveRequestContext(req: Request): Promise<RequestContext> {\n  const container = await createRequestContainer()\n  const auth = await getAuthFromRequest(req)\n  const { translate } = await resolveTranslations()\n\n  if (!auth || !auth.tenantId) {\n    throw new CrudHttpError(401, { error: translate('planner.availability.errors.unauthorized', 'Unauthorized') })\n  }\n\n  const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n  const organizationId = scope?.selectedId ?? auth.orgId ?? null\n  if (!organizationId) {\n    throw new CrudHttpError(400, {\n      error: translate('planner.availability.errors.organizationRequired', 'Organization context is required'),\n    })\n  }\n\n  const ctx: CommandRuntimeContext = {\n    container,\n    auth,\n    organizationScope: scope,\n    selectedOrganizationId: organizationId,\n    organizationIds: scope?.filterIds ?? (auth.orgId ? [auth.orgId] : null),\n    request: req,\n  }\n\n  return { ctx }\n}\n\nexport async function POST(req: Request) {\n  try {\n    const { ctx } = await resolveRequestContext(req)\n    const { translate } = await resolveTranslations()\n    const payload = await req.json().catch(() => ({}))\n    const input = parseScopedCommandInput(plannerAvailabilityWeeklyReplaceSchema, payload, ctx, translate)\n    await assertAvailabilityWriteAccess(ctx, { subjectType: input.subjectType, subjectId: input.subjectId }, translate)\n    const guardInput = {\n      tenantId: input.tenantId,\n      organizationId: input.organizationId,\n      userId: resolveAvailabilityActorId(ctx.auth),\n      resourceKind: 'planner.availability',\n      resourceId: input.subjectId,\n      operation: 'custom' as const,\n      requestMethod: req.method,\n      requestHeaders: req.headers,\n    }\n    const guardResult = await validateCrudMutationGuard(ctx.container, { ...guardInput, mutationPayload: input })\n    if (guardResult && !guardResult.ok) {\n      return NextResponse.json(guardResult.body, { status: guardResult.status })\n    }\n    const commandBus = ctx.container.resolve('commandBus') as CommandBus\n    const { logEntry } = await commandBus.execute('planner.availability.weekly.replace', { input, ctx })\n    if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {\n      await runCrudMutationGuardAfterSuccess(ctx.container, { ...guardInput, metadata: guardResult.metadata ?? null })\n    }\n    const response = NextResponse.json({ ok: true })\n    if (logEntry?.undoToken && logEntry?.id && logEntry?.commandId) {\n      response.headers.set(\n        'x-om-operation',\n        serializeOperationMetadata({\n          id: logEntry.id,\n          undoToken: logEntry.undoToken,\n          commandId: logEntry.commandId,\n          actionLabel: logEntry.actionLabel ?? null,\n          resourceKind: logEntry.resourceKind ?? 'planner.availability',\n          resourceId: logEntry.resourceId ?? null,\n          executedAt: logEntry.createdAt instanceof Date ? logEntry.createdAt.toISOString() : undefined,\n        })\n      )\n    }\n    return response\n  } catch (err) {\n    if (isCrudHttpError(err)) {\n      return NextResponse.json(err.body, { status: err.status })\n    }\n    const { translate } = await resolveTranslations()\n    console.error('planner.availability.weekly.replace failed', err)\n    return NextResponse.json(\n      { error: translate('planner.availability.errors.updateWeekly', 'Failed to save weekly availability.') },\n      { status: 400 },\n    )\n  }\n}\n\nexport const openApi = {\n  tag: 'Planner',\n  summary: 'Replace weekly availability',\n  methods: {\n    POST: {\n      summary: 'Replace weekly availability',\n      description: 'Replaces weekly availability rules for the subject in a single request.',\n      requestBody: {\n        contentType: 'application/json',\n        schema: plannerAvailabilityWeeklyReplaceSchema,\n      },\n      responses: [\n        { status: 200, description: 'Weekly availability updated', schema: z.object({ ok: z.literal(true) }) },\n        { status: 400, description: 'Invalid payload', schema: z.object({ error: z.string() }) },\n        { status: 401, description: 'Unauthorized', schema: z.object({ error: z.string() }) },\n        { status: 403, description: 'Forbidden', schema: z.object({ error: z.string() }) },\n      ],\n    },\n  },\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { resolveOrganizationScopeForRequest } from '@open-mercato/core/modules/directory/utils/organizationScope'\nimport type { CommandBus, CommandRuntimeContext } from '@open-mercato/shared/lib/commands'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'\nimport { parseScopedCommandInput } from '@open-mercato/shared/lib/api/scoped'\nimport { plannerAvailabilityWeeklyReplaceSchema } from '../data/validators'\nimport { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/operationMetadata'\nimport {\n  runCrudMutationGuardAfterSuccess,\n  validateCrudMutationGuard,\n} from '@open-mercato/shared/lib/crud/mutation-guard'\nimport { assertAvailabilityWriteAccess, resolveAvailabilityActorId } from './access'\n\nexport const metadata = {\n  POST: { requireAuth: true },\n}\n\ntype RequestContext = {\n  ctx: CommandRuntimeContext\n}\n\nasync function resolveRequestContext(req: Request): Promise<RequestContext> {\n  const container = await createRequestContainer()\n  const auth = await getAuthFromRequest(req)\n  const { translate } = await resolveTranslations()\n\n  if (!auth || !auth.tenantId) {\n    throw new CrudHttpError(401, { error: translate('planner.availability.errors.unauthorized', 'Unauthorized') })\n  }\n\n  const scope = await resolveOrganizationScopeForRequest({ container, auth, request: req })\n  const organizationId = scope?.selectedId ?? auth.orgId ?? null\n  if (!organizationId) {\n    throw new CrudHttpError(400, {\n      error: translate('planner.availability.errors.organizationRequired', 'Organization context is required'),\n    })\n  }\n\n  const ctx: CommandRuntimeContext = {\n    container,\n    auth,\n    organizationScope: scope,\n    selectedOrganizationId: organizationId,\n    organizationIds: scope?.filterIds ?? (auth.orgId ? [auth.orgId] : null),\n    request: req,\n  }\n\n  return { ctx }\n}\n\nexport async function POST(req: Request) {\n  try {\n    const { ctx } = await resolveRequestContext(req)\n    const { translate } = await resolveTranslations()\n    const payload = await req.json().catch(() => ({}))\n    const input = parseScopedCommandInput(plannerAvailabilityWeeklyReplaceSchema, payload, ctx, translate)\n    await assertAvailabilityWriteAccess(ctx, { subjectType: input.subjectType, subjectId: input.subjectId }, translate)\n    const guardInput = {\n      tenantId: input.tenantId,\n      organizationId: input.organizationId,\n      userId: resolveAvailabilityActorId(ctx.auth),\n      resourceKind: 'planner.availability',\n      resourceId: input.subjectId,\n      operation: 'custom' as const,\n      requestMethod: req.method,\n      requestHeaders: req.headers,\n    }\n    const guardResult = await validateCrudMutationGuard(ctx.container, { ...guardInput, mutationPayload: input })\n    if (guardResult && !guardResult.ok) {\n      return NextResponse.json(guardResult.body, { status: guardResult.status })\n    }\n    const commandBus = ctx.container.resolve('commandBus') as CommandBus\n    const { logEntry } = await commandBus.execute('planner.availability.weekly.replace', { input, ctx })\n    if (guardResult?.ok && guardResult.shouldRunAfterSuccess) {\n      await runCrudMutationGuardAfterSuccess(ctx.container, { ...guardInput, metadata: guardResult.metadata ?? null })\n    }\n    const response = NextResponse.json({ ok: true })\n    if (logEntry?.undoToken && logEntry?.id && logEntry?.commandId) {\n      response.headers.set(\n        'x-om-operation',\n        serializeOperationMetadata({\n          id: logEntry.id,\n          undoToken: logEntry.undoToken,\n          commandId: logEntry.commandId,\n          actionLabel: logEntry.actionLabel ?? null,\n          resourceKind: logEntry.resourceKind ?? 'planner.availability',\n          resourceId: logEntry.resourceId ?? null,\n          executedAt: logEntry.createdAt instanceof Date ? logEntry.createdAt.toISOString() : undefined,\n        })\n      )\n    }\n    return response\n  } catch (err) {\n    if (isCrudHttpError(err)) {\n      return NextResponse.json(err.body, { status: err.status })\n    }\n    const { translate } = await resolveTranslations()\n    console.error('planner.availability.weekly.replace failed', err)\n    return NextResponse.json(\n      { error: translate('planner.availability.errors.updateWeekly', 'Failed to save weekly availability.') },\n      { status: 400 },\n    )\n  }\n}\n\nexport const openApi = {\n  tag: 'Planner',\n  summary: 'Replace weekly availability',\n  methods: {\n    POST: {\n      summary: 'Replace weekly availability',\n      description: 'Replaces weekly availability rules for the subject in a single request.',\n      requestBody: {\n        contentType: 'application/json',\n        schema: plannerAvailabilityWeeklyReplaceSchema,\n      },\n      responses: [\n        { status: 200, description: 'Weekly availability updated', schema: z.object({ ok: z.literal(true) }) },\n        { status: 400, description: 'Invalid payload', schema: z.object({ error: z.string() }) },\n        { status: 401, description: 'Unauthorized', schema: z.object({ error: z.string() }) },\n        { status: 403, description: 'Forbidden', schema: z.object({ error: z.string() }) },\n        {\n          status: 409,\n          description: 'Optimistic lock conflict',\n          schema: z.object({\n            error: z.string(),\n            code: z.literal('optimistic_lock_conflict'),\n            currentUpdatedAt: z.string(),\n            expectedUpdatedAt: z.string(),\n          }),\n        },\n      ],\n    },\n  },\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/planner/commands/availability-weekly.js

@@ -5,12 +5,19 @@ import {
   plannerAvailabilityWeeklyReplaceSchema
 } from "../data/validators.js";
 import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
+import { emitCrudSideEffects } from "@open-mercato/shared/lib/commands/helpers";
 import {
   enforceCommandOptimisticLock,
   enforceRecordGoneIsConflict
 } from "@open-mercato/shared/lib/crud/optimistic-lock-command";
 import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload } from "./shared.js";
+import { plannerAvailabilityRuleSetCrudEvents } from "../lib/crud.js";
+import { E } from "../../../generated/entities.ids.generated.js";
 const AVAILABILITY_RULE_RESOURCE_KIND = "planner.availability.rule";
+const AVAILABILITY_RULE_SET_CACHE_RESOURCE_KIND = "planner.availability-rule-set";
+const availabilityRuleSetCrudIndexer = {
+  entityType: E.planner.planner_availability_rule_set
+};
 const AVAILABILITY_RULE_SET_RESOURCE_KIND = "planner.availability.rule.set";
 const DAY_CODES = ["SU", "MO", "TU", "WE", "TH", "FR", "SA"];
 function parseTimeInput(value) {
@@ -61,6 +68,13 @@ function toAvailabilityRuleSnapshot(record) {
     deletedAt: record.deletedAt ?? null
   };
 }
+function nextRuleSetUpdatedAt(current, fallback) {
+  const currentMs = current instanceof Date ? current.getTime() : Number.NaN;
+  if (Number.isFinite(currentMs) && fallback.getTime() <= currentMs) {
+    return new Date(currentMs + 1);
+  }
+  return fallback;
+}
 async function loadWeeklySnapshots(em, params) {
   const existing = await em.find(PlannerAvailabilityRule, {
     tenantId: params.tenantId,
@@ -125,7 +139,7 @@ const replaceWeeklyAvailabilityCommand = {
     ensureOrganizationScope(ctx, parsed.organizationId);
     const em = ctx.container.resolve("em").fork();
     const now = /* @__PURE__ */ new Date();
-    await em.transactional(async (trx) => {
+    const touchedRuleSet = await em.transactional(async (trx) => {
       let ruleSet = null;
       if (parsed.subjectType === "ruleset") {
         ruleSet = await trx.findOne(PlannerAvailabilityRuleSet, {
@@ -188,11 +202,27 @@ const replaceWeeklyAvailabilityCommand = {
         trx.persist(record);
       });
       if (ruleSet) {
-        ruleSet.updatedAt = now;
+        ruleSet.updatedAt = nextRuleSetUpdatedAt(ruleSet.updatedAt, now);
         trx.persist(ruleSet);
       }
       await trx.flush();
+      return ruleSet;
     });
+    if (touchedRuleSet) {
+      const dataEngine = ctx.container.resolve("dataEngine");
+      await emitCrudSideEffects({
+        dataEngine,
+        action: "updated",
+        entity: touchedRuleSet,
+        identifiers: {
+          id: touchedRuleSet.id,
+          organizationId: touchedRuleSet.organizationId,
+          tenantId: touchedRuleSet.tenantId
+        },
+        events: plannerAvailabilityRuleSetCrudEvents,
+        indexer: availabilityRuleSetCrudIndexer
+      });
+    }
     return { ok: true };
   },
   buildLog: async ({ input, snapshots, ctx }) => {
@@ -219,7 +249,8 @@ const replaceWeeklyAvailabilityCommand = {
           before,
           after
         }
-      }
+      },
+      context: parsed.subjectType === "ruleset" ? { cacheAliases: [AVAILABILITY_RULE_SET_CACHE_RESOURCE_KIND] } : null
     };
   },
   undo: async ({ logEntry, ctx }) => {

package/dist/modules/planner/commands/availability-weekly.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/planner/commands/availability-weekly.ts"],
-  "sourcesContent": ["import type { CommandHandler } from '@open-mercato/shared/lib/commands'\nimport { registerCommand } from '@open-mercato/shared/lib/commands'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { parseAvailabilityRuleWindow } from '@open-mercato/core/modules/planner/lib/availabilitySchedule'\nimport { PlannerAvailabilityRule, PlannerAvailabilityRuleSet } from '../data/entities'\nimport {\n  plannerAvailabilityWeeklyReplaceSchema,\n  type PlannerAvailabilityWeeklyReplaceInput,\n} from '../data/validators'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport type { PlannerAvailabilityKind, PlannerAvailabilitySubjectType } from '../data/entities'\nimport {\n  enforceCommandOptimisticLock,\n  enforceRecordGoneIsConflict,\n} from '@open-mercato/shared/lib/crud/optimistic-lock-command'\nimport { ensureOrganizationScope, ensureTenantScope, extractUndoPayload } from './shared'\n\nconst AVAILABILITY_RULE_RESOURCE_KIND = 'planner.availability.rule'\n\n// Canonical resource kind for the parent rule set, matching the tag the CRUD\n// factory derives for `planner.availability-rule-sets.*` commands. Weekly\n// replace mutates the rule set's child `availability_rules`, so the parent is\n// the optimistic-lock consistency boundary (document-aggregate pattern).\nconst AVAILABILITY_RULE_SET_RESOURCE_KIND = 'planner.availability.rule.set'\n\nconst DAY_CODES = ['SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA']\n\ntype AvailabilityRuleSnapshot = {\n  id: string\n  tenantId: string\n  organizationId: string\n  subjectType: PlannerAvailabilitySubjectType\n  subjectId: string\n  timezone: string\n  rrule: string\n  exdates: string[]\n  kind: PlannerAvailabilityKind\n  note: string | null\n  deletedAt: Date | null\n}\n\ntype WeeklyUndoPayload = {\n  before: AvailabilityRuleSnapshot[]\n  after: AvailabilityRuleSnapshot[]\n}\n\nfunction parseTimeInput(value: string): { hours: number; minutes: number } | null {\n  const [hours, minutes] = value.split(':').map((part) => Number(part))\n  if (!Number.isFinite(hours) || !Number.isFinite(minutes)) return null\n  if (hours < 0 || hours > 23 || minutes < 0 || minutes > 59) return null\n  return { hours, minutes }\n}\n\nfunction toDateForWeekday(weekday: number, time: string): Date | null {\n  const parsed = parseTimeInput(time)\n  if (!parsed) return null\n  const now = new Date()\n  const base = new Date(now.getFullYear(), now.getMonth(), now.getDate())\n  const diff = (weekday - base.getDay() + 7) % 7\n  const target = new Date(base.getTime() + diff * 24 * 60 * 60 * 1000)\n  target.setHours(parsed.hours, parsed.minutes, 0, 0)\n  return target\n}\n\nfunction formatDuration(minutes: number): string {\n  const clamped = Math.max(1, minutes)\n  const hours = Math.floor(clamped / 60)\n  const mins = clamped % 60\n  if (hours > 0 && mins > 0) return `PT${hours}H${mins}M`\n  if (hours > 0) return `PT${hours}H`\n  return `PT${mins}M`\n}\n\nfunction buildWeeklyRrule(start: Date, end: Date): string {\n  const dtStart = start.toISOString().replace(/[-:]/g, '').split('.')[0] + 'Z'\n  const durationMinutes = Math.max(1, Math.round((end.getTime() - start.getTime()) / 60000))\n  const duration = formatDuration(durationMinutes)\n  const dayCode = DAY_CODES[start.getDay()] ?? 'MO'\n  return `DTSTART:${dtStart}\\nDURATION:${duration}\\nRRULE:FREQ=WEEKLY;BYDAY=${dayCode}`\n}\n\nfunction toAvailabilityRuleSnapshot(record: PlannerAvailabilityRule): AvailabilityRuleSnapshot {\n  return {\n    id: record.id,\n    tenantId: record.tenantId,\n    organizationId: record.organizationId,\n    subjectType: record.subjectType,\n    subjectId: record.subjectId,\n    timezone: record.timezone,\n    rrule: record.rrule,\n    exdates: [...(record.exdates ?? [])],\n    kind: record.kind,\n    note: record.note ?? null,\n    deletedAt: record.deletedAt ?? null,\n  }\n}\n\nasync function loadWeeklySnapshots(\n  em: EntityManager,\n  params: {\n    tenantId: string\n    organizationId: string\n    subjectType: PlannerAvailabilitySubjectType\n    subjectId: string\n  }\n): Promise<AvailabilityRuleSnapshot[]> {\n  const existing = await em.find(PlannerAvailabilityRule, {\n    tenantId: params.tenantId,\n    organizationId: params.organizationId,\n    subjectType: params.subjectType,\n    subjectId: params.subjectId,\n    deletedAt: null,\n  })\n  return existing\n    .filter((rule) => {\n      const repeat = parseAvailabilityRuleWindow(rule).repeat\n      return repeat === 'weekly' || repeat === 'daily'\n    })\n    .map(toAvailabilityRuleSnapshot)\n}\n\nasync function restoreAvailabilityRuleFromSnapshot(em: EntityManager, snapshot: AvailabilityRuleSnapshot): Promise<void> {\n  let record = await em.findOne(PlannerAvailabilityRule, { id: snapshot.id })\n  if (!record) {\n    record = em.create(PlannerAvailabilityRule, {\n      id: snapshot.id,\n      tenantId: snapshot.tenantId,\n      organizationId: snapshot.organizationId,\n      subjectType: snapshot.subjectType,\n      subjectId: snapshot.subjectId,\n      timezone: snapshot.timezone,\n      rrule: snapshot.rrule,\n      exdates: snapshot.exdates ?? [],\n      kind: snapshot.kind ?? 'availability',\n      note: snapshot.note ?? null,\n      createdAt: new Date(),\n      updatedAt: new Date(),\n      deletedAt: snapshot.deletedAt ?? null,\n    })\n    em.persist(record)\n  } else {\n    record.subjectType = snapshot.subjectType\n    record.subjectId = snapshot.subjectId\n    record.timezone = snapshot.timezone\n    record.rrule = snapshot.rrule\n    record.exdates = snapshot.exdates ?? []\n    record.kind = snapshot.kind ?? 'availability'\n    record.note = snapshot.note ?? null\n    record.deletedAt = snapshot.deletedAt ?? null\n  }\n}\n\nconst replaceWeeklyAvailabilityCommand: CommandHandler<PlannerAvailabilityWeeklyReplaceInput, { ok: true }> = {\n  id: 'planner.availability.weekly.replace',\n  async prepare(input, ctx) {\n    const parsed = plannerAvailabilityWeeklyReplaceSchema.parse(input)\n    ensureTenantScope(ctx, parsed.tenantId)\n    ensureOrganizationScope(ctx, parsed.organizationId)\n    const em = (ctx.container.resolve('em') as EntityManager)\n    const before = await loadWeeklySnapshots(em, {\n      tenantId: parsed.tenantId,\n      organizationId: parsed.organizationId,\n      subjectType: parsed.subjectType,\n      subjectId: parsed.subjectId,\n    })\n    return { before }\n  },\n  async execute(input, ctx) {\n    const parsed = plannerAvailabilityWeeklyReplaceSchema.parse(input)\n    ensureTenantScope(ctx, parsed.tenantId)\n    ensureOrganizationScope(ctx, parsed.organizationId)\n\n    const em = (ctx.container.resolve('em') as EntityManager).fork()\n    const now = new Date()\n\n    await em.transactional(async (trx) => {\n      // The weekly rules of a rule set are a sub-resource of that rule set: the\n      // parent is the optimistic-lock consistency boundary. Guard the parent's\n      // version (so a stale weekly save loses to a concurrent rule-set\n      // change/delete) and bump its `updated_at` after the replace (so a\n      // concurrent rule-set delete/update with a stale token conflicts). See #2927.\n      let ruleSet: PlannerAvailabilityRuleSet | null = null\n      if (parsed.subjectType === 'ruleset') {\n        ruleSet = await trx.findOne(PlannerAvailabilityRuleSet, {\n          id: parsed.subjectId,\n          tenantId: parsed.tenantId,\n          organizationId: parsed.organizationId,\n          deletedAt: null,\n        })\n        if (ruleSet) {\n          enforceCommandOptimisticLock({\n            resourceKind: AVAILABILITY_RULE_SET_RESOURCE_KIND,\n            resourceId: ruleSet.id,\n            current: ruleSet.updatedAt,\n            request: ctx.request ?? null,\n          })\n        } else {\n          // The rule set was deleted concurrently. When the client opted into\n          // optimistic locking, surface the unified conflict instead of\n          // silently writing orphan rules; otherwise preserve legacy behavior.\n          enforceRecordGoneIsConflict({\n            resourceKind: AVAILABILITY_RULE_SET_RESOURCE_KIND,\n            resourceId: parsed.subjectId,\n            request: ctx.request ?? null,\n          })\n        }\n      }\n\n      const existing = await trx.find(PlannerAvailabilityRule, {\n        tenantId: parsed.tenantId,\n        organizationId: parsed.organizationId,\n        subjectType: parsed.subjectType,\n        subjectId: parsed.subjectId,\n        deletedAt: null,\n      })\n\n      const toDelete = existing.filter((rule) => {\n        const repeat = parseAvailabilityRuleWindow(rule).repeat\n        return repeat === 'weekly' || repeat === 'daily'\n      })\n\n      toDelete.forEach((rule) => {\n        rule.deletedAt = now\n        rule.updatedAt = now\n      })\n\n      if (toDelete.length) {\n        trx.persist(toDelete)\n      }\n\n      parsed.windows.forEach((window) => {\n        const start = toDateForWeekday(window.weekday, window.start)\n        const end = toDateForWeekday(window.weekday, window.end)\n        if (!start || !end || start >= end) return\n        const rrule = buildWeeklyRrule(start, end)\n        const record = trx.create(PlannerAvailabilityRule, {\n          tenantId: parsed.tenantId,\n          organizationId: parsed.organizationId,\n          subjectType: parsed.subjectType,\n          subjectId: parsed.subjectId,\n          timezone: parsed.timezone,\n          rrule,\n          exdates: [],\n          kind: 'availability',\n          note: null,\n          createdAt: now,\n          updatedAt: now,\n        })\n        trx.persist(record)\n      })\n\n      if (ruleSet) {\n        ruleSet.updatedAt = now\n        trx.persist(ruleSet)\n      }\n\n      await trx.flush()\n    })\n\n    return { ok: true }\n  },\n  buildLog: async ({ input, snapshots, ctx }) => {\n    const parsed = plannerAvailabilityWeeklyReplaceSchema.parse(input)\n    const em = (ctx.container.resolve('em') as EntityManager).fork()\n    const after = await loadWeeklySnapshots(em, {\n      tenantId: parsed.tenantId,\n      organizationId: parsed.organizationId,\n      subjectType: parsed.subjectType,\n      subjectId: parsed.subjectId,\n    })\n    const before = (snapshots.before as AvailabilityRuleSnapshot[] | undefined) ?? []\n    const { translate } = await resolveTranslations()\n    return {\n      actionLabel: translate('planner.audit.availability.weekly.replace', 'Replace weekly availability'),\n      resourceKind: AVAILABILITY_RULE_RESOURCE_KIND,\n      resourceId: null,\n      tenantId: parsed.tenantId,\n      organizationId: parsed.organizationId,\n      snapshotBefore: before,\n      snapshotAfter: after,\n      payload: {\n        undo: {\n          before,\n          after,\n        } satisfies WeeklyUndoPayload,\n      },\n    }\n  },\n  undo: async ({ logEntry, ctx }) => {\n    const payload = extractUndoPayload<WeeklyUndoPayload>(logEntry)\n    const before = payload?.before ?? []\n    const after = payload?.after ?? []\n    if (!before.length && !after.length) return\n    const em = (ctx.container.resolve('em') as EntityManager).fork()\n    await em.transactional(async (trx) => {\n      if (after.length) {\n        const ids = after.map((rule) => rule.id)\n        const records = await trx.find(PlannerAvailabilityRule, { id: { $in: ids } })\n        records.forEach((record) => {\n          record.deletedAt = new Date()\n        })\n        if (records.length) trx.persist(records)\n      }\n\n      for (const snapshot of before) {\n        await restoreAvailabilityRuleFromSnapshot(trx, { ...snapshot, deletedAt: null })\n      }\n\n      await trx.flush()\n    })\n  },\n}\n\nregisterCommand(replaceWeeklyAvailabilityCommand)\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { CommandHandler } from '@open-mercato/shared/lib/commands'\nimport { registerCommand } from '@open-mercato/shared/lib/commands'\nimport type { EntityManager } from '@mikro-orm/postgresql'\nimport { parseAvailabilityRuleWindow } from '@open-mercato/core/modules/planner/lib/availabilitySchedule'\nimport { PlannerAvailabilityRule, PlannerAvailabilityRuleSet } from '../data/entities'\nimport {\n  plannerAvailabilityWeeklyReplaceSchema,\n  type PlannerAvailabilityWeeklyReplaceInput,\n} from '../data/validators'\nimport { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'\nimport { emitCrudSideEffects } from '@open-mercato/shared/lib/commands/helpers'\nimport {\n  enforceCommandOptimisticLock,\n  enforceRecordGoneIsConflict,\n} from '@open-mercato/shared/lib/crud/optimistic-lock-command'\nimport type { DataEngine } from '@open-mercato/shared/lib/data/engine'\nimport type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'\nimport type { PlannerAvailabilityKind, PlannerAvailabilitySubjectType } from '../data/entities'\nimport { ensureOrganizationScope, ensureTenantScope, extractUndoPayload } from './shared'\nimport { plannerAvailabilityRuleSetCrudEvents } from '../lib/crud'\nimport { E } from '#generated/entities.ids.generated'\n\nconst AVAILABILITY_RULE_RESOURCE_KIND = 'planner.availability.rule'\nconst AVAILABILITY_RULE_SET_CACHE_RESOURCE_KIND = 'planner.availability-rule-set'\n\nconst availabilityRuleSetCrudIndexer: CrudIndexerConfig<PlannerAvailabilityRuleSet> = {\n  entityType: E.planner.planner_availability_rule_set,\n}\n\n// Canonical resource kind for the parent rule set, matching the tag the CRUD\n// factory derives for `planner.availability-rule-sets.*` commands. Weekly\n// replace mutates the rule set's child `availability_rules`, so the parent is\n// the optimistic-lock consistency boundary (document-aggregate pattern).\nconst AVAILABILITY_RULE_SET_RESOURCE_KIND = 'planner.availability.rule.set'\n\nconst DAY_CODES = ['SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA']\n\ntype AvailabilityRuleSnapshot = {\n  id: string\n  tenantId: string\n  organizationId: string\n  subjectType: PlannerAvailabilitySubjectType\n  subjectId: string\n  timezone: string\n  rrule: string\n  exdates: string[]\n  kind: PlannerAvailabilityKind\n  note: string | null\n  deletedAt: Date | null\n}\n\ntype WeeklyUndoPayload = {\n  before: AvailabilityRuleSnapshot[]\n  after: AvailabilityRuleSnapshot[]\n}\n\nfunction parseTimeInput(value: string): { hours: number; minutes: number } | null {\n  const [hours, minutes] = value.split(':').map((part) => Number(part))\n  if (!Number.isFinite(hours) || !Number.isFinite(minutes)) return null\n  if (hours < 0 || hours > 23 || minutes < 0 || minutes > 59) return null\n  return { hours, minutes }\n}\n\nfunction toDateForWeekday(weekday: number, time: string): Date | null {\n  const parsed = parseTimeInput(time)\n  if (!parsed) return null\n  const now = new Date()\n  const base = new Date(now.getFullYear(), now.getMonth(), now.getDate())\n  const diff = (weekday - base.getDay() + 7) % 7\n  const target = new Date(base.getTime() + diff * 24 * 60 * 60 * 1000)\n  target.setHours(parsed.hours, parsed.minutes, 0, 0)\n  return target\n}\n\nfunction formatDuration(minutes: number): string {\n  const clamped = Math.max(1, minutes)\n  const hours = Math.floor(clamped / 60)\n  const mins = clamped % 60\n  if (hours > 0 && mins > 0) return `PT${hours}H${mins}M`\n  if (hours > 0) return `PT${hours}H`\n  return `PT${mins}M`\n}\n\nfunction buildWeeklyRrule(start: Date, end: Date): string {\n  const dtStart = start.toISOString().replace(/[-:]/g, '').split('.')[0] + 'Z'\n  const durationMinutes = Math.max(1, Math.round((end.getTime() - start.getTime()) / 60000))\n  const duration = formatDuration(durationMinutes)\n  const dayCode = DAY_CODES[start.getDay()] ?? 'MO'\n  return `DTSTART:${dtStart}\\nDURATION:${duration}\\nRRULE:FREQ=WEEKLY;BYDAY=${dayCode}`\n}\n\nfunction toAvailabilityRuleSnapshot(record: PlannerAvailabilityRule): AvailabilityRuleSnapshot {\n  return {\n    id: record.id,\n    tenantId: record.tenantId,\n    organizationId: record.organizationId,\n    subjectType: record.subjectType,\n    subjectId: record.subjectId,\n    timezone: record.timezone,\n    rrule: record.rrule,\n    exdates: [...(record.exdates ?? [])],\n    kind: record.kind,\n    note: record.note ?? null,\n    deletedAt: record.deletedAt ?? null,\n  }\n}\n\nfunction nextRuleSetUpdatedAt(current: Date | null | undefined, fallback: Date): Date {\n  const currentMs = current instanceof Date ? current.getTime() : Number.NaN\n  if (Number.isFinite(currentMs) && fallback.getTime() <= currentMs) {\n    return new Date(currentMs + 1)\n  }\n  return fallback\n}\n\nasync function loadWeeklySnapshots(\n  em: EntityManager,\n  params: {\n    tenantId: string\n    organizationId: string\n    subjectType: PlannerAvailabilitySubjectType\n    subjectId: string\n  }\n): Promise<AvailabilityRuleSnapshot[]> {\n  const existing = await em.find(PlannerAvailabilityRule, {\n    tenantId: params.tenantId,\n    organizationId: params.organizationId,\n    subjectType: params.subjectType,\n    subjectId: params.subjectId,\n    deletedAt: null,\n  })\n  return existing\n    .filter((rule) => {\n      const repeat = parseAvailabilityRuleWindow(rule).repeat\n      return repeat === 'weekly' || repeat === 'daily'\n    })\n    .map(toAvailabilityRuleSnapshot)\n}\n\nasync function restoreAvailabilityRuleFromSnapshot(em: EntityManager, snapshot: AvailabilityRuleSnapshot): Promise<void> {\n  let record = await em.findOne(PlannerAvailabilityRule, { id: snapshot.id })\n  if (!record) {\n    record = em.create(PlannerAvailabilityRule, {\n      id: snapshot.id,\n      tenantId: snapshot.tenantId,\n      organizationId: snapshot.organizationId,\n      subjectType: snapshot.subjectType,\n      subjectId: snapshot.subjectId,\n      timezone: snapshot.timezone,\n      rrule: snapshot.rrule,\n      exdates: snapshot.exdates ?? [],\n      kind: snapshot.kind ?? 'availability',\n      note: snapshot.note ?? null,\n      createdAt: new Date(),\n      updatedAt: new Date(),\n      deletedAt: snapshot.deletedAt ?? null,\n    })\n    em.persist(record)\n  } else {\n    record.subjectType = snapshot.subjectType\n    record.subjectId = snapshot.subjectId\n    record.timezone = snapshot.timezone\n    record.rrule = snapshot.rrule\n    record.exdates = snapshot.exdates ?? []\n    record.kind = snapshot.kind ?? 'availability'\n    record.note = snapshot.note ?? null\n    record.deletedAt = snapshot.deletedAt ?? null\n  }\n}\n\nconst replaceWeeklyAvailabilityCommand: CommandHandler<PlannerAvailabilityWeeklyReplaceInput, { ok: true }> = {\n  id: 'planner.availability.weekly.replace',\n  async prepare(input, ctx) {\n    const parsed = plannerAvailabilityWeeklyReplaceSchema.parse(input)\n    ensureTenantScope(ctx, parsed.tenantId)\n    ensureOrganizationScope(ctx, parsed.organizationId)\n    const em = (ctx.container.resolve('em') as EntityManager)\n    const before = await loadWeeklySnapshots(em, {\n      tenantId: parsed.tenantId,\n      organizationId: parsed.organizationId,\n      subjectType: parsed.subjectType,\n      subjectId: parsed.subjectId,\n    })\n    return { before }\n  },\n  async execute(input, ctx) {\n    const parsed = plannerAvailabilityWeeklyReplaceSchema.parse(input)\n    ensureTenantScope(ctx, parsed.tenantId)\n    ensureOrganizationScope(ctx, parsed.organizationId)\n\n    const em = (ctx.container.resolve('em') as EntityManager).fork()\n    const now = new Date()\n\n    // The weekly rules of a rule set are a sub-resource of that rule set: the\n    // parent is the optimistic-lock consistency boundary. Guard the parent's\n    // version (so a stale weekly save loses to a concurrent rule-set\n    // change/delete) and bump its `updated_at` after the replace (so a\n    // concurrent rule-set delete/update with a stale token conflicts). See #2927.\n    const touchedRuleSet = await em.transactional(async (trx): Promise<PlannerAvailabilityRuleSet | null> => {\n      let ruleSet: PlannerAvailabilityRuleSet | null = null\n      if (parsed.subjectType === 'ruleset') {\n        ruleSet = await trx.findOne(PlannerAvailabilityRuleSet, {\n          id: parsed.subjectId,\n          tenantId: parsed.tenantId,\n          organizationId: parsed.organizationId,\n          deletedAt: null,\n        })\n        if (ruleSet) {\n          enforceCommandOptimisticLock({\n            resourceKind: AVAILABILITY_RULE_SET_RESOURCE_KIND,\n            resourceId: ruleSet.id,\n            current: ruleSet.updatedAt,\n            request: ctx.request ?? null,\n          })\n        } else {\n          // The rule set was deleted concurrently. When the client opted into\n          // optimistic locking, surface the unified conflict instead of\n          // silently writing orphan rules; otherwise preserve legacy behavior.\n          enforceRecordGoneIsConflict({\n            resourceKind: AVAILABILITY_RULE_SET_RESOURCE_KIND,\n            resourceId: parsed.subjectId,\n            request: ctx.request ?? null,\n          })\n        }\n      }\n\n      const existing = await trx.find(PlannerAvailabilityRule, {\n        tenantId: parsed.tenantId,\n        organizationId: parsed.organizationId,\n        subjectType: parsed.subjectType,\n        subjectId: parsed.subjectId,\n        deletedAt: null,\n      })\n\n      const toDelete = existing.filter((rule) => {\n        const repeat = parseAvailabilityRuleWindow(rule).repeat\n        return repeat === 'weekly' || repeat === 'daily'\n      })\n\n      toDelete.forEach((rule) => {\n        rule.deletedAt = now\n        rule.updatedAt = now\n      })\n\n      if (toDelete.length) {\n        trx.persist(toDelete)\n      }\n\n      parsed.windows.forEach((window) => {\n        const start = toDateForWeekday(window.weekday, window.start)\n        const end = toDateForWeekday(window.weekday, window.end)\n        if (!start || !end || start >= end) return\n        const rrule = buildWeeklyRrule(start, end)\n        const record = trx.create(PlannerAvailabilityRule, {\n          tenantId: parsed.tenantId,\n          organizationId: parsed.organizationId,\n          subjectType: parsed.subjectType,\n          subjectId: parsed.subjectId,\n          timezone: parsed.timezone,\n          rrule,\n          exdates: [],\n          kind: 'availability',\n          note: null,\n          createdAt: now,\n          updatedAt: now,\n        })\n        trx.persist(record)\n      })\n\n      if (ruleSet) {\n        ruleSet.updatedAt = nextRuleSetUpdatedAt(ruleSet.updatedAt, now)\n        trx.persist(ruleSet)\n      }\n\n      await trx.flush()\n      return ruleSet\n    })\n\n    if (touchedRuleSet) {\n      const dataEngine = ctx.container.resolve('dataEngine') as DataEngine\n      await emitCrudSideEffects({\n        dataEngine,\n        action: 'updated',\n        entity: touchedRuleSet,\n        identifiers: {\n          id: touchedRuleSet.id,\n          organizationId: touchedRuleSet.organizationId,\n          tenantId: touchedRuleSet.tenantId,\n        },\n        events: plannerAvailabilityRuleSetCrudEvents,\n        indexer: availabilityRuleSetCrudIndexer,\n      })\n    }\n\n    return { ok: true }\n  },\n  buildLog: async ({ input, snapshots, ctx }) => {\n    const parsed = plannerAvailabilityWeeklyReplaceSchema.parse(input)\n    const em = (ctx.container.resolve('em') as EntityManager).fork()\n    const after = await loadWeeklySnapshots(em, {\n      tenantId: parsed.tenantId,\n      organizationId: parsed.organizationId,\n      subjectType: parsed.subjectType,\n      subjectId: parsed.subjectId,\n    })\n    const before = (snapshots.before as AvailabilityRuleSnapshot[] | undefined) ?? []\n    const { translate } = await resolveTranslations()\n    return {\n      actionLabel: translate('planner.audit.availability.weekly.replace', 'Replace weekly availability'),\n      resourceKind: AVAILABILITY_RULE_RESOURCE_KIND,\n      resourceId: null,\n      tenantId: parsed.tenantId,\n      organizationId: parsed.organizationId,\n      snapshotBefore: before,\n      snapshotAfter: after,\n      payload: {\n        undo: {\n          before,\n          after,\n        } satisfies WeeklyUndoPayload,\n      },\n      context: parsed.subjectType === 'ruleset'\n        ? { cacheAliases: [AVAILABILITY_RULE_SET_CACHE_RESOURCE_KIND] }\n        : null,\n    }\n  },\n  undo: async ({ logEntry, ctx }) => {\n    const payload = extractUndoPayload<WeeklyUndoPayload>(logEntry)\n    const before = payload?.before ?? []\n    const after = payload?.after ?? []\n    if (!before.length && !after.length) return\n    const em = (ctx.container.resolve('em') as EntityManager).fork()\n    await em.transactional(async (trx) => {\n      if (after.length) {\n        const ids = after.map((rule) => rule.id)\n        const records = await trx.find(PlannerAvailabilityRule, { id: { $in: ids } })\n        records.forEach((record) => {\n          record.deletedAt = new Date()\n        })\n        if (records.length) trx.persist(records)\n      }\n\n      for (const snapshot of before) {\n        await restoreAvailabilityRuleFromSnapshot(trx, { ...snapshot, deletedAt: null })\n      }\n\n      await trx.flush()\n    })\n  },\n}\n\nregisterCommand(replaceWeeklyAvailabilityCommand)\n"],
+  "mappings": "AACA,SAAS,uBAAuB;AAEhC,SAAS,mCAAmC;AAC5C,SAAS,yBAAyB,kCAAkC;AACpE;AAAA,EACE;AAAA,OAEK;AACP,SAAS,2BAA2B;AACpC,SAAS,2BAA2B;AACpC;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAIP,SAAS,yBAAyB,mBAAmB,0BAA0B;AAC/E,SAAS,4CAA4C;AACrD,SAAS,SAAS;AAElB,MAAM,kCAAkC;AACxC,MAAM,4CAA4C;AAElD,MAAM,iCAAgF;AAAA,EACpF,YAAY,EAAE,QAAQ;AACxB;AAMA,MAAM,sCAAsC;AAE5C,MAAM,YAAY,CAAC,MAAM,MAAM,MAAM,MAAM,MAAM,MAAM,IAAI;AAqB3D,SAAS,eAAe,OAA0D;AAChF,QAAM,CAAC,OAAO,OAAO,IAAI,MAAM,MAAM,GAAG,EAAE,IAAI,CAAC,SAAS,OAAO,IAAI,CAAC;AACpE,MAAI,CAAC,OAAO,SAAS,KAAK,KAAK,CAAC,OAAO,SAAS,OAAO,EAAG,QAAO;AACjE,MAAI,QAAQ,KAAK,QAAQ,MAAM,UAAU,KAAK,UAAU,GAAI,QAAO;AACnE,SAAO,EAAE,OAAO,QAAQ;AAC1B;AAEA,SAAS,iBAAiB,SAAiB,MAA2B;AACpE,QAAM,SAAS,eAAe,IAAI;AAClC,MAAI,CAAC,OAAQ,QAAO;AACpB,QAAM,MAAM,oBAAI,KAAK;AACrB,QAAM,OAAO,IAAI,KAAK,IAAI,YAAY,GAAG,IAAI,SAAS,GAAG,IAAI,QAAQ,CAAC;AACtE,QAAM,QAAQ,UAAU,KAAK,OAAO,IAAI,KAAK;AAC7C,QAAM,SAAS,IAAI,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,KAAK,GAAI;AACnE,SAAO,SAAS,OAAO,OAAO,OAAO,SAAS,GAAG,CAAC;AAClD,SAAO;AACT;AAEA,SAAS,eAAe,SAAyB;AAC/C,QAAM,UAAU,KAAK,IAAI,GAAG,OAAO;AACnC,QAAM,QAAQ,KAAK,MAAM,UAAU,EAAE;AACrC,QAAM,OAAO,UAAU;AACvB,MAAI,QAAQ,KAAK,OAAO,EAAG,QAAO,KAAK,KAAK,IAAI,IAAI;AACpD,MAAI,QAAQ,EAAG,QAAO,KAAK,KAAK;AAChC,SAAO,KAAK,IAAI;AAClB;AAEA,SAAS,iBAAiB,OAAa,KAAmB;AACxD,QAAM,UAAU,MAAM,YAAY,EAAE,QAAQ,SAAS,EAAE,EAAE,MAAM,GAAG,EAAE,CAAC,IAAI;AACzE,QAAM,kBAAkB,KAAK,IAAI,GAAG,KAAK,OAAO,IAAI,QAAQ,IAAI,MAAM,QAAQ,KAAK,GAAK,CAAC;AACzF,QAAM,WAAW,eAAe,eAAe;AAC/C,QAAM,UAAU,UAAU,MAAM,OAAO,CAAC,KAAK;AAC7C,SAAO,WAAW,OAAO;AAAA,WAAc,QAAQ;AAAA,0BAA6B,OAAO;AACrF;AAEA,SAAS,2BAA2B,QAA2D;AAC7F,SAAO;AAAA,IACL,IAAI,OAAO;AAAA,IACX,UAAU,OAAO;AAAA,IACjB,gBAAgB,OAAO;AAAA,IACvB,aAAa,OAAO;AAAA,IACpB,WAAW,OAAO;AAAA,IAClB,UAAU,OAAO;AAAA,IACjB,OAAO,OAAO;AAAA,IACd,SAAS,CAAC,GAAI,OAAO,WAAW,CAAC,CAAE;AAAA,IACnC,MAAM,OAAO;AAAA,IACb,MAAM,OAAO,QAAQ;AAAA,IACrB,WAAW,OAAO,aAAa;AAAA,EACjC;AACF;AAEA,SAAS,qBAAqB,SAAkC,UAAsB;AACpF,QAAM,YAAY,mBAAmB,OAAO,QAAQ,QAAQ,IAAI,OAAO;AACvE,MAAI,OAAO,SAAS,SAAS,KAAK,SAAS,QAAQ,KAAK,WAAW;AACjE,WAAO,IAAI,KAAK,YAAY,CAAC;AAAA,EAC/B;AACA,SAAO;AACT;AAEA,eAAe,oBACb,IACA,QAMqC;AACrC,QAAM,WAAW,MAAM,GAAG,KAAK,yBAAyB;AAAA,IACtD,UAAU,OAAO;AAAA,IACjB,gBAAgB,OAAO;AAAA,IACvB,aAAa,OAAO;AAAA,IACpB,WAAW,OAAO;AAAA,IAClB,WAAW;AAAA,EACb,CAAC;AACD,SAAO,SACJ,OAAO,CAAC,SAAS;AAChB,UAAM,SAAS,4BAA4B,IAAI,EAAE;AACjD,WAAO,WAAW,YAAY,WAAW;AAAA,EAC3C,CAAC,EACA,IAAI,0BAA0B;AACnC;AAEA,eAAe,oCAAoC,IAAmB,UAAmD;AACvH,MAAI,SAAS,MAAM,GAAG,QAAQ,yBAAyB,EAAE,IAAI,SAAS,GAAG,CAAC;AAC1E,MAAI,CAAC,QAAQ;AACX,aAAS,GAAG,OAAO,yBAAyB;AAAA,MAC1C,IAAI,SAAS;AAAA,MACb,UAAU,SAAS;AAAA,MACnB,gBAAgB,SAAS;AAAA,MACzB,aAAa,SAAS;AAAA,MACtB,WAAW,SAAS;AAAA,MACpB,UAAU,SAAS;AAAA,MACnB,OAAO,SAAS;AAAA,MAChB,SAAS,SAAS,WAAW,CAAC;AAAA,MAC9B,MAAM,SAAS,QAAQ;AAAA,MACvB,MAAM,SAAS,QAAQ;AAAA,MACvB,WAAW,oBAAI,KAAK;AAAA,MACpB,WAAW,oBAAI,KAAK;AAAA,MACpB,WAAW,SAAS,aAAa;AAAA,IACnC,CAAC;AACD,OAAG,QAAQ,MAAM;AAAA,EACnB,OAAO;AACL,WAAO,cAAc,SAAS;AAC9B,WAAO,YAAY,SAAS;AAC5B,WAAO,WAAW,SAAS;AAC3B,WAAO,QAAQ,SAAS;AACxB,WAAO,UAAU,SAAS,WAAW,CAAC;AACtC,WAAO,OAAO,SAAS,QAAQ;AAC/B,WAAO,OAAO,SAAS,QAAQ;AAC/B,WAAO,YAAY,SAAS,aAAa;AAAA,EAC3C;AACF;AAEA,MAAM,mCAAwG;AAAA,EAC5G,IAAI;AAAA,EACJ,MAAM,QAAQ,OAAO,KAAK;AACxB,UAAM,SAAS,uCAAuC,MAAM,KAAK;AACjE,sBAAkB,KAAK,OAAO,QAAQ;AACtC,4BAAwB,KAAK,OAAO,cAAc;AAClD,UAAM,KAAM,IAAI,UAAU,QAAQ,IAAI;AACtC,UAAM,SAAS,MAAM,oBAAoB,IAAI;AAAA,MAC3C,UAAU,OAAO;AAAA,MACjB,gBAAgB,OAAO;AAAA,MACvB,aAAa,OAAO;AAAA,MACpB,WAAW,OAAO;AAAA,IACpB,CAAC;AACD,WAAO,EAAE,OAAO;AAAA,EAClB;AAAA,EACA,MAAM,QAAQ,OAAO,KAAK;AACxB,UAAM,SAAS,uCAAuC,MAAM,KAAK;AACjE,sBAAkB,KAAK,OAAO,QAAQ;AACtC,4BAAwB,KAAK,OAAO,cAAc;AAElD,UAAM,KAAM,IAAI,UAAU,QAAQ,IAAI,EAAoB,KAAK;AAC/D,UAAM,MAAM,oBAAI,KAAK;AAOrB,UAAM,iBAAiB,MAAM,GAAG,cAAc,OAAO,QAAoD;AACvG,UAAI,UAA6C;AACjD,UAAI,OAAO,gBAAgB,WAAW;AACpC,kBAAU,MAAM,IAAI,QAAQ,4BAA4B;AAAA,UACtD,IAAI,OAAO;AAAA,UACX,UAAU,OAAO;AAAA,UACjB,gBAAgB,OAAO;AAAA,UACvB,WAAW;AAAA,QACb,CAAC;AACD,YAAI,SAAS;AACX,uCAA6B;AAAA,YAC3B,cAAc;AAAA,YACd,YAAY,QAAQ;AAAA,YACpB,SAAS,QAAQ;AAAA,YACjB,SAAS,IAAI,WAAW;AAAA,UAC1B,CAAC;AAAA,QACH,OAAO;AAIL,sCAA4B;AAAA,YAC1B,cAAc;AAAA,YACd,YAAY,OAAO;AAAA,YACnB,SAAS,IAAI,WAAW;AAAA,UAC1B,CAAC;AAAA,QACH;AAAA,MACF;AAEA,YAAM,WAAW,MAAM,IAAI,KAAK,yBAAyB;AAAA,QACvD,UAAU,OAAO;AAAA,QACjB,gBAAgB,OAAO;AAAA,QACvB,aAAa,OAAO;AAAA,QACpB,WAAW,OAAO;AAAA,QAClB,WAAW;AAAA,MACb,CAAC;AAED,YAAM,WAAW,SAAS,OAAO,CAAC,SAAS;AACzC,cAAM,SAAS,4BAA4B,IAAI,EAAE;AACjD,eAAO,WAAW,YAAY,WAAW;AAAA,MAC3C,CAAC;AAED,eAAS,QAAQ,CAAC,SAAS;AACzB,aAAK,YAAY;AACjB,aAAK,YAAY;AAAA,MACnB,CAAC;AAED,UAAI,SAAS,QAAQ;AACnB,YAAI,QAAQ,QAAQ;AAAA,MACtB;AAEA,aAAO,QAAQ,QAAQ,CAAC,WAAW;AACjC,cAAM,QAAQ,iBAAiB,OAAO,SAAS,OAAO,KAAK;AAC3D,cAAM,MAAM,iBAAiB,OAAO,SAAS,OAAO,GAAG;AACvD,YAAI,CAAC,SAAS,CAAC,OAAO,SAAS,IAAK;AACpC,cAAM,QAAQ,iBAAiB,OAAO,GAAG;AACzC,cAAM,SAAS,IAAI,OAAO,yBAAyB;AAAA,UACjD,UAAU,OAAO;AAAA,UACjB,gBAAgB,OAAO;AAAA,UACvB,aAAa,OAAO;AAAA,UACpB,WAAW,OAAO;AAAA,UAClB,UAAU,OAAO;AAAA,UACjB;AAAA,UACA,SAAS,CAAC;AAAA,UACV,MAAM;AAAA,UACN,MAAM;AAAA,UACN,WAAW;AAAA,UACX,WAAW;AAAA,QACb,CAAC;AACD,YAAI,QAAQ,MAAM;AAAA,MACpB,CAAC;AAED,UAAI,SAAS;AACX,gBAAQ,YAAY,qBAAqB,QAAQ,WAAW,GAAG;AAC/D,YAAI,QAAQ,OAAO;AAAA,MACrB;AAEA,YAAM,IAAI,MAAM;AAChB,aAAO;AAAA,IACT,CAAC;AAED,QAAI,gBAAgB;AAClB,YAAM,aAAa,IAAI,UAAU,QAAQ,YAAY;AACrD,YAAM,oBAAoB;AAAA,QACxB;AAAA,QACA,QAAQ;AAAA,QACR,QAAQ;AAAA,QACR,aAAa;AAAA,UACX,IAAI,eAAe;AAAA,UACnB,gBAAgB,eAAe;AAAA,UAC/B,UAAU,eAAe;AAAA,QAC3B;AAAA,QACA,QAAQ;AAAA,QACR,SAAS;AAAA,MACX,CAAC;AAAA,IACH;AAEA,WAAO,EAAE,IAAI,KAAK;AAAA,EACpB;AAAA,EACA,UAAU,OAAO,EAAE,OAAO,WAAW,IAAI,MAAM;AAC7C,UAAM,SAAS,uCAAuC,MAAM,KAAK;AACjE,UAAM,KAAM,IAAI,UAAU,QAAQ,IAAI,EAAoB,KAAK;AAC/D,UAAM,QAAQ,MAAM,oBAAoB,IAAI;AAAA,MAC1C,UAAU,OAAO;AAAA,MACjB,gBAAgB,OAAO;AAAA,MACvB,aAAa,OAAO;AAAA,MACpB,WAAW,OAAO;AAAA,IACpB,CAAC;AACD,UAAM,SAAU,UAAU,UAAqD,CAAC;AAChF,UAAM,EAAE,UAAU,IAAI,MAAM,oBAAoB;AAChD,WAAO;AAAA,MACL,aAAa,UAAU,6CAA6C,6BAA6B;AAAA,MACjG,cAAc;AAAA,MACd,YAAY;AAAA,MACZ,UAAU,OAAO;AAAA,MACjB,gBAAgB,OAAO;AAAA,MACvB,gBAAgB;AAAA,MAChB,eAAe;AAAA,MACf,SAAS;AAAA,QACP,MAAM;AAAA,UACJ;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,MACA,SAAS,OAAO,gBAAgB,YAC5B,EAAE,cAAc,CAAC,yCAAyC,EAAE,IAC5D;AAAA,IACN;AAAA,EACF;AAAA,EACA,MAAM,OAAO,EAAE,UAAU,IAAI,MAAM;AACjC,UAAM,UAAU,mBAAsC,QAAQ;AAC9D,UAAM,SAAS,SAAS,UAAU,CAAC;AACnC,UAAM,QAAQ,SAAS,SAAS,CAAC;AACjC,QAAI,CAAC,OAAO,UAAU,CAAC,MAAM,OAAQ;AACrC,UAAM,KAAM,IAAI,UAAU,QAAQ,IAAI,EAAoB,KAAK;AAC/D,UAAM,GAAG,cAAc,OAAO,QAAQ;AACpC,UAAI,MAAM,QAAQ;AAChB,cAAM,MAAM,MAAM,IAAI,CAAC,SAAS,KAAK,EAAE;AACvC,cAAM,UAAU,MAAM,IAAI,KAAK,yBAAyB,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;AAC5E,gBAAQ,QAAQ,CAAC,WAAW;AAC1B,iBAAO,YAAY,oBAAI,KAAK;AAAA,QAC9B,CAAC;AACD,YAAI,QAAQ,OAAQ,KAAI,QAAQ,OAAO;AAAA,MACzC;AAEA,iBAAW,YAAY,QAAQ;AAC7B,cAAM,oCAAoC,KAAK,EAAE,GAAG,UAAU,WAAW,KAAK,CAAC;AAAA,MACjF;AAEA,YAAM,IAAI,MAAM;AAAA,IAClB,CAAC;AAAA,EACH;AACF;AAEA,gBAAgB,gCAAgC;",
   "names": []
 }

package/dist/modules/planner/components/AvailabilityRulesEditor.js

@@ -19,6 +19,7 @@ import { createCrud, deleteCrud, updateCrud } from "@open-mercato/ui/backend/uti
 import { useGuardedMutation } from "@open-mercato/ui/backend/injection/useGuardedMutation";
 import { buildOptimisticLockHeader } from "@open-mercato/ui/backend/utils/optimisticLock";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
+import { surfaceRecordConflict } from "@open-mercato/ui/backend/conflicts";
 import { Spinner } from "@open-mercato/ui/primitives/spinner";
 import { ComboboxInput, TimePicker } from "@open-mercato/ui/backend/inputs";
 import { DictionaryEntrySelect } from "@open-mercato/core/modules/dictionaries/components/DictionaryEntrySelect";
@@ -29,7 +30,6 @@ import {
 import { useT } from "@open-mercato/shared/lib/i18n/context";
 import { useConfirmDialog } from "@open-mercato/ui/backend/confirm-dialog";
 import { normalizeCrudServerError } from "@open-mercato/ui/backend/utils/serverErrors";
-import { surfaceRecordConflict } from "@open-mercato/ui/backend/conflicts";
 import { parseAvailabilityRuleWindow } from "@open-mercato/core/modules/planner/lib/availabilitySchedule";
 import { deleteAvailabilityRuleSet } from "@open-mercato/core/modules/planner/lib/deleteAvailabilityRuleSet";
 import { CrudForm } from "@open-mercato/ui/backend/CrudForm";
@@ -650,6 +650,11 @@ function AvailabilityRulesEditor({
   React.useEffect(() => {
     void refreshBookedEvents();
   }, [refreshBookedEvents]);
+  const refreshAfterRuleSetConflict = React.useCallback(() => {
+    void refreshRuleSets();
+    void refreshRuleSetRules();
+    void refreshAvailability();
+  }, [refreshAvailability, refreshRuleSetRules, refreshRuleSets]);
   const weeklyDraft = React.useMemo(() => buildWeeklyDraft(activeRules), [activeRules]);
   const [weeklyWindows, setWeeklyWindows] = React.useState(() => cloneWeeklyWindows(weeklyDraft));
   const weeklyWindowsRef = React.useRef(cloneWeeklyWindows(weeklyDraft));
@@ -746,14 +751,15 @@ function AvailabilityRulesEditor({
       if (!shouldSkipRefresh) {
         await refreshAvailability();
         await refreshRuleSetRules();
+        if (usingRuleSet) {
+          await refreshRuleSets();
+        }
       }
       if (parentRuleSet) {
         await refreshRuleSets();
       }
     } catch (error2) {
-      if (surfaceRecordConflict(error2, t)) {
-        return;
-      }
+      if (surfaceRecordConflict(error2, t, { onRefresh: refreshAfterRuleSetConflict })) return;
       const message = error2 instanceof Error ? error2.message : listLabels.saveWeeklyError;
       flash(message, "error");
     } finally {
@@ -765,8 +771,9 @@ function AvailabilityRulesEditor({
     refreshAvailability,
     refreshRuleSetRules,
     refreshRuleSets,
-    ruleSets,
+    refreshAfterRuleSetConflict,
     effectiveRulesetId,
+    ruleSets,
     subjectId,
     subjectType,
     t,
@@ -1010,7 +1017,7 @@ function AvailabilityRulesEditor({
       refreshRuleSets,
       onSuccess: () => flash(listLabels.ruleSetDeleteSuccess, "success"),
       onError: (error2) => {
-        if (surfaceRecordConflict(error2, t)) return;
+        if (surfaceRecordConflict(error2, t, { onRefresh: refreshAfterRuleSetConflict })) return;
         console.error("planner.availability-rule-sets.delete", error2);
         const normalized = normalizeCrudServerError(error2);
         flash(normalized.message ?? listLabels.ruleSetDeleteError, "error");
@@ -1025,6 +1032,7 @@ function AvailabilityRulesEditor({
     listLabels.ruleSetDeleteSuccess,
     onRulesetChange,
     refreshAvailability,
+    refreshAfterRuleSetConflict,
     refreshRuleSets,
     ruleSets,
     rulesetId,