@open-mercato/core 0.6.6-develop.6402.1.080aab8ec9 → 0.6.6-develop.6404.1.e2f8d5025a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.6.6-develop.6402.1.080aab8ec9",
+  "version": "0.6.6-develop.6404.1.e2f8d5025a",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -248,16 +248,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6402.1.080aab8ec9",
-    "@open-mercato/shared": "0.6.6-develop.6402.1.080aab8ec9",
-    "@open-mercato/ui": "0.6.6-develop.6402.1.080aab8ec9",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6404.1.e2f8d5025a",
+    "@open-mercato/shared": "0.6.6-develop.6404.1.e2f8d5025a",
+    "@open-mercato/ui": "0.6.6-develop.6404.1.e2f8d5025a",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.6.6-develop.6402.1.080aab8ec9",
-    "@open-mercato/shared": "0.6.6-develop.6402.1.080aab8ec9",
-    "@open-mercato/ui": "0.6.6-develop.6402.1.080aab8ec9",
+    "@open-mercato/ai-assistant": "0.6.6-develop.6404.1.e2f8d5025a",
+    "@open-mercato/shared": "0.6.6-develop.6404.1.e2f8d5025a",
+    "@open-mercato/ui": "0.6.6-develop.6404.1.e2f8d5025a",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.1",

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

@@ -346,6 +346,16 @@
   "catalog.products.create.seoWidget.titleLabel": "Titel ({{count}} Zeichen)",
   "catalog.products.create.seoWidget.tooLong": "Zu lang",
   "catalog.products.create.seoWidget.tooShort": "Zu kurz",
+  "catalog.products.create.seoWidget.validation.block.list": "SEO-Helfer: {{issues}}",
+  "catalog.products.create.seoWidget.validation.block.summary": "SEO-Helfer: {{count}} Probleme gefunden. {{issues}}",
+  "catalog.products.create.seoWidget.validation.fieldError.descriptionMissing": "Geben Sie eine Beschreibung an, damit Suchmaschinen dieses Produkt besser verstehen.",
+  "catalog.products.create.seoWidget.validation.fieldError.descriptionTooShort": "Die Beschreibung ist für gutes SEO zu kurz (mind. 50 Zeichen).",
+  "catalog.products.create.seoWidget.validation.fieldError.titleTooLong": "Der Titel ist für optimales SEO zu lang (max. 60 Zeichen).",
+  "catalog.products.create.seoWidget.validation.fieldError.titleTooShort": "Der Titel ist für gutes SEO zu kurz (mind. 10 Zeichen).",
+  "catalog.products.create.seoWidget.validation.issue.descriptionMissing": "Fügen Sie eine Produktbeschreibung für besseres SEO hinzu.",
+  "catalog.products.create.seoWidget.validation.issue.descriptionTooShort": "Die Beschreibung ist zu kurz (mind. 50 Zeichen).",
+  "catalog.products.create.seoWidget.validation.issue.titleTooLong": "Der Titel ist zu lang (max. 60 Zeichen empfohlen).",
+  "catalog.products.create.seoWidget.validation.issue.titleTooShort": "Der Titel ist zu kurz (mind. 10 Zeichen).",
   "catalog.products.create.skuHelp": "Eindeutige Produktkennung. Buchstaben, Zahlen, Bindestriche, Unterstriche, Punkte.",
   "catalog.products.create.steps.continue": "Weiter",
   "catalog.products.create.steps.general": "Allgemeine Daten",

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

@@ -346,6 +346,16 @@
   "catalog.products.create.seoWidget.titleLabel": "Title ({{count}} chars)",
   "catalog.products.create.seoWidget.tooLong": "Too long",
   "catalog.products.create.seoWidget.tooShort": "Too short",
+  "catalog.products.create.seoWidget.validation.block.list": "SEO helper: {{issues}}",
+  "catalog.products.create.seoWidget.validation.block.summary": "SEO helper: {{count}} issues found. {{issues}}",
+  "catalog.products.create.seoWidget.validation.fieldError.descriptionMissing": "Provide a description to help search engines understand this product.",
+  "catalog.products.create.seoWidget.validation.fieldError.descriptionTooShort": "Description is too short for good SEO (min 50 characters).",
+  "catalog.products.create.seoWidget.validation.fieldError.titleTooLong": "Title is too long for optimal SEO (max 60 characters).",
+  "catalog.products.create.seoWidget.validation.fieldError.titleTooShort": "Title is too short for good SEO (min 10 characters).",
+  "catalog.products.create.seoWidget.validation.issue.descriptionMissing": "Add a product description for better SEO.",
+  "catalog.products.create.seoWidget.validation.issue.descriptionTooShort": "Description is too short (min 50 characters).",
+  "catalog.products.create.seoWidget.validation.issue.titleTooLong": "Title is too long (max 60 characters recommended).",
+  "catalog.products.create.seoWidget.validation.issue.titleTooShort": "Title is too short (min 10 characters).",
   "catalog.products.create.skuHelp": "Unique product identifier. Letters, numbers, hyphens, underscores, periods.",
   "catalog.products.create.steps.continue": "Continue",
   "catalog.products.create.steps.general": "General data",

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

@@ -346,6 +346,16 @@
   "catalog.products.create.seoWidget.titleLabel": "Título ({{count}} caracteres)",
   "catalog.products.create.seoWidget.tooLong": "Muy largo",
   "catalog.products.create.seoWidget.tooShort": "Muy corto",
+  "catalog.products.create.seoWidget.validation.block.list": "Asistente SEO: {{issues}}",
+  "catalog.products.create.seoWidget.validation.block.summary": "Asistente SEO: {{count}} problemas encontrados. {{issues}}",
+  "catalog.products.create.seoWidget.validation.fieldError.descriptionMissing": "Proporciona una descripción para ayudar a los motores de búsqueda a entender este producto.",
+  "catalog.products.create.seoWidget.validation.fieldError.descriptionTooShort": "La descripción es demasiado corta para un buen SEO (mín. 50 caracteres).",
+  "catalog.products.create.seoWidget.validation.fieldError.titleTooLong": "El título es demasiado largo para un SEO óptimo (máx. 60 caracteres).",
+  "catalog.products.create.seoWidget.validation.fieldError.titleTooShort": "El título es demasiado corto para un buen SEO (mín. 10 caracteres).",
+  "catalog.products.create.seoWidget.validation.issue.descriptionMissing": "Añade una descripción de producto para mejorar el SEO.",
+  "catalog.products.create.seoWidget.validation.issue.descriptionTooShort": "La descripción es demasiado corta (mín. 50 caracteres).",
+  "catalog.products.create.seoWidget.validation.issue.titleTooLong": "El título es demasiado largo (máx. 60 caracteres recomendado).",
+  "catalog.products.create.seoWidget.validation.issue.titleTooShort": "El título es demasiado corto (mín. 10 caracteres).",
   "catalog.products.create.skuHelp": "Identificador único del producto. Letras, números, guiones, guiones bajos, puntos.",
   "catalog.products.create.steps.continue": "Continuar",
   "catalog.products.create.steps.general": "Datos generales",

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

@@ -346,6 +346,16 @@
   "catalog.products.create.seoWidget.titleLabel": "Tytuł ({{count}} znaków)",
   "catalog.products.create.seoWidget.tooLong": "Za długi",
   "catalog.products.create.seoWidget.tooShort": "Za krótki",
+  "catalog.products.create.seoWidget.validation.block.list": "Pomocnik SEO: {{issues}}",
+  "catalog.products.create.seoWidget.validation.block.summary": "Pomocnik SEO: znaleziono {{count}} problemów. {{issues}}",
+  "catalog.products.create.seoWidget.validation.fieldError.descriptionMissing": "Podaj opis, aby wyszukiwarki lepiej rozumiały ten produkt.",
+  "catalog.products.create.seoWidget.validation.fieldError.descriptionTooShort": "Opis jest za krótki dla dobrego SEO (min. 50 znaków).",
+  "catalog.products.create.seoWidget.validation.fieldError.titleTooLong": "Tytuł jest za długi dla optymalnego SEO (maks. 60 znaków).",
+  "catalog.products.create.seoWidget.validation.fieldError.titleTooShort": "Tytuł jest za krótki dla dobrego SEO (min. 10 znaków).",
+  "catalog.products.create.seoWidget.validation.issue.descriptionMissing": "Dodaj opis produktu dla lepszego SEO.",
+  "catalog.products.create.seoWidget.validation.issue.descriptionTooShort": "Opis jest za krótki (min. 50 znaków).",
+  "catalog.products.create.seoWidget.validation.issue.titleTooLong": "Tytuł jest za długi (zalecane maks. 60 znaków).",
+  "catalog.products.create.seoWidget.validation.issue.titleTooShort": "Tytuł jest za krótki (min. 10 znaków).",
   "catalog.products.create.skuHelp": "Unikalny identyfikator produktu. Litery, cyfry, myślniki, podkreślenia, kropki.",
   "catalog.products.create.steps.continue": "Dalej",
   "catalog.products.create.steps.general": "Dane ogólne",

package/src/modules/catalog/widgets/injection/product-seo/state.ts

@@ -1,9 +1,26 @@
+import type { TranslateFn } from '@open-mercato/shared/lib/i18n/context'
+
 export type ProductSeoValidationPayload = {
   ok: boolean
   issues: string[]
   message?: string
 }
 
+// The `onBeforeSave` validation hook (widget.ts) is a plain side-effect handler
+// with no React context, so it cannot call `useT`. The widget component (which
+// does have `useT`) publishes its translator here on mount; the hook reads it to
+// localize the save-block message (#3299). Undefined until the widget mounts —
+// callers fall back to English via `evaluateProductSeo`'s default translator.
+let productSeoTranslator: TranslateFn | null = null
+
+export function setProductSeoTranslator(t: TranslateFn | null) {
+  productSeoTranslator = t
+}
+
+export function getProductSeoTranslator(): TranslateFn | undefined {
+  return productSeoTranslator ?? undefined
+}
+
 type Listener = (payload: ProductSeoValidationPayload) => void
 
 const listeners = new Set<Listener>()

package/src/modules/catalog/widgets/injection/product-seo/validation.ts

@@ -1,3 +1,5 @@
+import type { TranslateFn } from '@open-mercato/shared/lib/i18n/context'
+
 export type ProductSeoEvaluation = {
   ok: boolean
   issues: string[]
@@ -5,42 +7,63 @@ export type ProductSeoEvaluation = {
   message?: string
 }
 
-const MESSAGE_PREFIX = 'SEO helper: '
+// English-fallback translator: keeps this pure module usable (and unit-testable)
+// when no real `t` is threaded in — every string still ships its English default,
+// interpolating `{{param}}` placeholders the same way the real translator does.
+const englishFallback: TranslateFn = (_key, fallbackOrParams, params) => {
+  const template = typeof fallbackOrParams === 'string' ? fallbackOrParams : ''
+  const resolvedParams = typeof fallbackOrParams === 'string' ? params : fallbackOrParams
+  if (!resolvedParams) return template
+  return template.replace(/\{\{(\w+)\}\}|\{(\w+)\}/g, (match, doubleKey, singleKey) => {
+    const key = doubleKey ?? singleKey
+    const value = resolvedParams[key]
+    return value === undefined ? match : String(value)
+  })
+}
+
+const K = 'catalog.products.create.seoWidget.validation'
 
-export function buildSeoBlockMessage(issues: string[]): string {
-  if (issues.length === 1) return `${MESSAGE_PREFIX}${issues[0]}`
-  if (issues.length <= 3) return `${MESSAGE_PREFIX}${issues.join(' ')}`
-  return `${MESSAGE_PREFIX}${issues.length} issues found. ${issues.slice(0, 2).join(' ')}`
+export function buildSeoBlockMessage(issues: string[], t: TranslateFn = englishFallback): string {
+  if (issues.length <= 3) {
+    return t(`${K}.block.list`, 'SEO helper: {{issues}}', { issues: issues.join(' ') })
+  }
+  return t(`${K}.block.summary`, 'SEO helper: {{count}} issues found. {{issues}}', {
+    count: issues.length,
+    issues: issues.slice(0, 2).join(' '),
+  })
 }
 
-export function evaluateProductSeo(data: Record<string, unknown> | null | undefined): ProductSeoEvaluation {
+export function evaluateProductSeo(
+  data: Record<string, unknown> | null | undefined,
+  t: TranslateFn = englishFallback,
+): ProductSeoEvaluation {
   const issues: string[] = []
   const fieldErrors: Record<string, string> = {}
 
   const title = (data?.title as unknown) || (data?.name as unknown)
   if (typeof title === 'string' && title.length > 0) {
     if (title.length < 10) {
-      issues.push('Title is too short (min 10 characters).')
-      fieldErrors.title = 'Title is too short for good SEO (min 10 characters).'
+      issues.push(t(`${K}.issue.titleTooShort`, 'Title is too short (min 10 characters).'))
+      fieldErrors.title = t(`${K}.fieldError.titleTooShort`, 'Title is too short for good SEO (min 10 characters).')
     } else if (title.length > 60) {
-      issues.push('Title is too long (max 60 characters recommended).')
-      fieldErrors.title = 'Title is too long for optimal SEO (max 60 characters).'
+      issues.push(t(`${K}.issue.titleTooLong`, 'Title is too long (max 60 characters recommended).'))
+      fieldErrors.title = t(`${K}.fieldError.titleTooLong`, 'Title is too long for optimal SEO (max 60 characters).')
     }
   }
 
   const description = data?.description
   if (typeof description === 'string') {
     if (description.trim().length === 0) {
-      issues.push('Add a product description for better SEO.')
-      fieldErrors.description = 'Provide a description to help search engines understand this product.'
+      issues.push(t(`${K}.issue.descriptionMissing`, 'Add a product description for better SEO.'))
+      fieldErrors.description = t(`${K}.fieldError.descriptionMissing`, 'Provide a description to help search engines understand this product.')
     } else if (description.length < 50) {
-      issues.push('Description is too short (min 50 characters).')
-      fieldErrors.description = 'Description is too short for good SEO (min 50 characters).'
+      issues.push(t(`${K}.issue.descriptionTooShort`, 'Description is too short (min 50 characters).'))
+      fieldErrors.description = t(`${K}.fieldError.descriptionTooShort`, 'Description is too short for good SEO (min 50 characters).')
     }
   }
 
   if (issues.length) {
-    return { ok: false, issues, fieldErrors, message: buildSeoBlockMessage(issues) }
+    return { ok: false, issues, fieldErrors, message: buildSeoBlockMessage(issues, t) }
   }
 
   return { ok: true, issues: [], fieldErrors: {} }

package/src/modules/catalog/widgets/injection/product-seo/widget.client.tsx

@@ -1,7 +1,7 @@
 "use client"
 import * as React from 'react'
 import type { InjectionWidgetComponentProps } from '@open-mercato/shared/modules/widgets/injection'
-import { subscribeProductSeoValidation } from './state'
+import { subscribeProductSeoValidation, setProductSeoTranslator } from './state'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { StatusBadge, type StatusBadgeVariant } from '@open-mercato/ui/primitives/status-badge'
 import { Alert } from '@open-mercato/ui/primitives/alert'
@@ -36,6 +36,12 @@ function computeIssueKeys(title: string, description: string): IssueKey[] {
 
 export default function ProductSeoWidget({ data }: InjectionWidgetComponentProps<unknown, SeoData>) {
   const t = useT()
+  // Expose the translator to the module's `onBeforeSave` hook (which has no React
+  // context) so the save-block message is localized (#3299).
+  React.useEffect(() => {
+    setProductSeoTranslator(t)
+    return () => setProductSeoTranslator(null)
+  }, [t])
   const title = (data?.title || data?.name || '') ?? ''
   const description = data?.description ?? ''
   const baselineIssueKeys = React.useMemo(() => computeIssueKeys(title, description), [title, description])

package/src/modules/catalog/widgets/injection/product-seo/widget.ts

@@ -1,6 +1,6 @@
 import type { InjectionWidgetModule } from '@open-mercato/shared/modules/widgets/injection'
 import ProductSeoWidget from './widget.client'
-import { publishProductSeoValidation } from './state'
+import { publishProductSeoValidation, getProductSeoTranslator } from './state'
 import { evaluateProductSeo } from './validation'
 
 const widget: InjectionWidgetModule<any, any> = {
@@ -16,7 +16,7 @@ const widget: InjectionWidgetModule<any, any> = {
   Widget: ProductSeoWidget,
   eventHandlers: {
     onBeforeSave: async (data) => {
-      const evaluation = evaluateProductSeo(data as Record<string, unknown>)
+      const evaluation = evaluateProductSeo(data as Record<string, unknown>, getProductSeoTranslator())
 
       if (!evaluation.ok) {
         publishProductSeoValidation({ ok: false, issues: evaluation.issues, message: evaluation.message })

package/src/modules/planner/api/availability-weekly.ts

@@ -123,6 +123,16 @@ export const openApi = {
         { 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: 409,
+          description: 'Optimistic lock conflict',
+          schema: z.object({
+            error: z.string(),
+            code: z.literal('optimistic_lock_conflict'),
+            currentUpdatedAt: z.string(),
+            expectedUpdatedAt: z.string(),
+          }),
+        },
       ],
     },
   },

package/src/modules/planner/commands/availability-weekly.ts

@@ -8,14 +8,24 @@ import {
   type PlannerAvailabilityWeeklyReplaceInput,
 } from '../data/validators'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
-import type { PlannerAvailabilityKind, PlannerAvailabilitySubjectType } from '../data/entities'
+import { emitCrudSideEffects } from '@open-mercato/shared/lib/commands/helpers'
 import {
   enforceCommandOptimisticLock,
   enforceRecordGoneIsConflict,
 } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
+import type { DataEngine } from '@open-mercato/shared/lib/data/engine'
+import type { CrudIndexerConfig } from '@open-mercato/shared/lib/crud/types'
+import type { PlannerAvailabilityKind, PlannerAvailabilitySubjectType } from '../data/entities'
 import { ensureOrganizationScope, ensureTenantScope, extractUndoPayload } from './shared'
+import { plannerAvailabilityRuleSetCrudEvents } from '../lib/crud'
+import { E } from '#generated/entities.ids.generated'
 
 const AVAILABILITY_RULE_RESOURCE_KIND = 'planner.availability.rule'
+const AVAILABILITY_RULE_SET_CACHE_RESOURCE_KIND = 'planner.availability-rule-set'
+
+const availabilityRuleSetCrudIndexer: CrudIndexerConfig<PlannerAvailabilityRuleSet> = {
+  entityType: E.planner.planner_availability_rule_set,
+}
 
 // Canonical resource kind for the parent rule set, matching the tag the CRUD
 // factory derives for `planner.availability-rule-sets.*` commands. Weekly
@@ -95,6 +105,14 @@ function toAvailabilityRuleSnapshot(record: PlannerAvailabilityRule): Availabili
   }
 }
 
+function nextRuleSetUpdatedAt(current: Date | null | undefined, fallback: Date): Date {
+  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: EntityManager,
   params: {
@@ -173,12 +191,12 @@ const replaceWeeklyAvailabilityCommand: CommandHandler<PlannerAvailabilityWeekly
     const em = (ctx.container.resolve('em') as EntityManager).fork()
     const now = new Date()
 
-    await em.transactional(async (trx) => {
-      // The weekly rules of a rule set are a sub-resource of that rule set: the
-      // parent is the optimistic-lock consistency boundary. Guard the parent's
-      // version (so a stale weekly save loses to a concurrent rule-set
-      // change/delete) and bump its `updated_at` after the replace (so a
-      // concurrent rule-set delete/update with a stale token conflicts). See #2927.
+    // The weekly rules of a rule set are a sub-resource of that rule set: the
+    // parent is the optimistic-lock consistency boundary. Guard the parent's
+    // version (so a stale weekly save loses to a concurrent rule-set
+    // change/delete) and bump its `updated_at` after the replace (so a
+    // concurrent rule-set delete/update with a stale token conflicts). See #2927.
+    const touchedRuleSet = await em.transactional(async (trx): Promise<PlannerAvailabilityRuleSet | null> => {
       let ruleSet: PlannerAvailabilityRuleSet | null = null
       if (parsed.subjectType === 'ruleset') {
         ruleSet = await trx.findOne(PlannerAvailabilityRuleSet, {
@@ -250,13 +268,30 @@ const replaceWeeklyAvailabilityCommand: CommandHandler<PlannerAvailabilityWeekly
       })
 
       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') as 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 }) => {
@@ -284,6 +319,9 @@ const replaceWeeklyAvailabilityCommand: CommandHandler<PlannerAvailabilityWeekly
           after,
         } satisfies WeeklyUndoPayload,
       },
+      context: parsed.subjectType === 'ruleset'
+        ? { cacheAliases: [AVAILABILITY_RULE_SET_CACHE_RESOURCE_KIND] }
+        : null,
     }
   },
   undo: async ({ logEntry, ctx }) => {

package/src/modules/planner/components/AvailabilityRulesEditor.tsx

@@ -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, type DictionarySelectLabels } from '@open-mercato/core/modules/dictionaries/components/DictionaryEntrySelect'
@@ -30,7 +31,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, type CrudField } from '@open-mercato/ui/backend/CrudForm'
@@ -778,6 +778,12 @@ export function AvailabilityRulesEditor({
     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<WeeklyWindows>(() => cloneWeeklyWindows(weeklyDraft))
   const weeklyWindowsRef = React.useRef<WeeklyWindows>(cloneWeeklyWindows(weeklyDraft))
@@ -893,14 +899,15 @@ export function AvailabilityRulesEditor({
       if (!shouldSkipRefresh) {
         await refreshAvailability()
         await refreshRuleSetRules()
+        if (usingRuleSet) {
+          await refreshRuleSets()
+        }
       }
       if (parentRuleSet) {
         await refreshRuleSets()
       }
     } catch (error) {
-      if (surfaceRecordConflict(error, t)) {
-        return
-      }
+      if (surfaceRecordConflict(error, t, { onRefresh: refreshAfterRuleSetConflict })) return
       const message = error instanceof Error ? error.message : listLabels.saveWeeklyError
       flash(message, 'error')
     } finally {
@@ -912,8 +919,9 @@ export function AvailabilityRulesEditor({
     refreshAvailability,
     refreshRuleSetRules,
     refreshRuleSets,
-    ruleSets,
+    refreshAfterRuleSetConflict,
     effectiveRulesetId,
+    ruleSets,
     subjectId,
     subjectType,
     t,
@@ -1180,7 +1188,7 @@ export function AvailabilityRulesEditor({
       refreshRuleSets,
       onSuccess: () => flash(listLabels.ruleSetDeleteSuccess, 'success'),
       onError: (error) => {
-        if (surfaceRecordConflict(error, t)) return
+        if (surfaceRecordConflict(error, t, { onRefresh: refreshAfterRuleSetConflict })) return
         console.error('planner.availability-rule-sets.delete', error)
         const normalized = normalizeCrudServerError(error)
         flash(normalized.message ?? listLabels.ruleSetDeleteError, 'error')
@@ -1195,6 +1203,7 @@ export function AvailabilityRulesEditor({
     listLabels.ruleSetDeleteSuccess,
     onRulesetChange,
     refreshAvailability,
+    refreshAfterRuleSetConflict,
     refreshRuleSets,
     ruleSets,
     rulesetId,