@zeniai/client-epic-state 5.1.60-betaDI0 → 5.1.60-betaDI1

package/lib/entity/notificationRegistry/notificationRegistryReducer.d.ts

@@ -1,6 +1,10 @@
 import { NotificationRegistryPayload } from './notificationRegistryPayload';
 import { NotificationRegistryState } from './notificationRegistryState';
 export declare const initialState: NotificationRegistryState;
-export declare const clearAllNotificationRegistry: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationRegistry/clearAllNotificationRegistry">, updateNotificationRegistry: import("@reduxjs/toolkit").ActionCreatorWithPayload<NotificationRegistryPayload, "notificationRegistry/updateNotificationRegistry">;
+export interface UpdateNotificationRegistryPayload {
+    registry: NotificationRegistryPayload | undefined;
+    registryEpochAtDispatch: number;
+}
+export declare const clearAllNotificationRegistry: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"notificationRegistry/clearAllNotificationRegistry">, updateNotificationRegistry: import("@reduxjs/toolkit").ActionCreatorWithPayload<UpdateNotificationRegistryPayload, "notificationRegistry/updateNotificationRegistry">;
 declare const _default: import("redux").Reducer<NotificationRegistryState>;
 export default _default;

package/lib/entity/notificationRegistry/notificationRegistryReducer.js

@@ -4,21 +4,45 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateNotificationRegistry = exports.clearAllNotificationRegistry = exports.initialState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const notificationRegistryPayload_1 = require("./notificationRegistryPayload");
-exports.initialState = {};
+exports.initialState = { registryEpoch: 0 };
 const notificationRegistry = (0, toolkit_1.createSlice)({
     name: 'notificationRegistry',
     initialState: exports.initialState,
     reducers: {
-        clearAllNotificationRegistry() {
-            return exports.initialState;
+        clearAllNotificationRegistry(draft) {
+            // Bump `registryEpoch` (don't rewind to 0) so any settings-envelope
+            // GET that was already in flight when the tenant switched is treated
+            // as stale: its captured `registryEpochAtDispatch` is now lower than
+            // the current epoch, so `updateNotificationRegistry` skips its write.
+            // Mirrors the `saveEpoch` bump in `clearAllNotificationPreferencesView`
+            // — Cursor Bugbot 67d6918e. Returning `initialState` verbatim would
+            // rewind the counter and let a stale in-flight GET restore A's
+            // registry over B's.
+            return { registryEpoch: draft.registryEpoch + 1 };
         },
         updateNotificationRegistry(draft, action) {
+            // Stale-response guard (Cursor Bugbot 67d6918e): if the fetch epic
+            // captured a `registryEpoch` lower than the current one, a clear
+            // (tenant switch) has landed since this GET dispatched. The response
+            // carries the prior tenant's snapshot and must not restore it — nor,
+            // when it omits the registry, wipe the fresh one. Skip entirely.
+            if (action.payload.registryEpochAtDispatch < draft.registryEpoch) {
+                return;
+            }
+            // Gate-off / absent-registry case: an envelope that omits
+            // `task_checklist_registry` CLEARS so tenant B doesn't inherit A's
+            // Task Checklist section. Guarded by the epoch check above so a stale
+            // absent-response can't wipe a fresh registry.
+            if (action.payload.registry == null) {
+                draft.registry = undefined;
+                return;
+            }
             // Full-replace contract: the registry payload is atomic — every fetch
             // returns the complete group/event tree. If the backend ever ships a
             // partial registry response, this write MUST switch to a merge (mirror
             // the preferences slice's `mergePreferences`). Do not assume the
             // current payload is partial without also updating this reducer.
-            draft.registry = (0, notificationRegistryPayload_1.mapNotificationRegistryPayloadToRegistry)(action.payload);
+            draft.registry = (0, notificationRegistryPayload_1.mapNotificationRegistryPayloadToRegistry)(action.payload.registry);
         },
     },
 });

package/lib/entity/notificationRegistry/notificationRegistryState.d.ts

@@ -27,5 +27,6 @@ export interface NotificationRegistry {
  * `clearAllNotificationRegistry` from taking effect.
  */
 export interface NotificationRegistryState {
+    registryEpoch: number;
     registry?: NotificationRegistry;
 }

package/lib/esm/entity/notificationRegistry/notificationRegistryReducer.js

@@ -1,20 +1,44 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { mapNotificationRegistryPayloadToRegistry, } from './notificationRegistryPayload';
-export const initialState = {};
+export const initialState = { registryEpoch: 0 };
 const notificationRegistry = createSlice({
     name: 'notificationRegistry',
     initialState,
     reducers: {
-        clearAllNotificationRegistry() {
-            return initialState;
+        clearAllNotificationRegistry(draft) {
+            // Bump `registryEpoch` (don't rewind to 0) so any settings-envelope
+            // GET that was already in flight when the tenant switched is treated
+            // as stale: its captured `registryEpochAtDispatch` is now lower than
+            // the current epoch, so `updateNotificationRegistry` skips its write.
+            // Mirrors the `saveEpoch` bump in `clearAllNotificationPreferencesView`
+            // — Cursor Bugbot 67d6918e. Returning `initialState` verbatim would
+            // rewind the counter and let a stale in-flight GET restore A's
+            // registry over B's.
+            return { registryEpoch: draft.registryEpoch + 1 };
         },
         updateNotificationRegistry(draft, action) {
+            // Stale-response guard (Cursor Bugbot 67d6918e): if the fetch epic
+            // captured a `registryEpoch` lower than the current one, a clear
+            // (tenant switch) has landed since this GET dispatched. The response
+            // carries the prior tenant's snapshot and must not restore it — nor,
+            // when it omits the registry, wipe the fresh one. Skip entirely.
+            if (action.payload.registryEpochAtDispatch < draft.registryEpoch) {
+                return;
+            }
+            // Gate-off / absent-registry case: an envelope that omits
+            // `task_checklist_registry` CLEARS so tenant B doesn't inherit A's
+            // Task Checklist section. Guarded by the epoch check above so a stale
+            // absent-response can't wipe a fresh registry.
+            if (action.payload.registry == null) {
+                draft.registry = undefined;
+                return;
+            }
             // Full-replace contract: the registry payload is atomic — every fetch
             // returns the complete group/event tree. If the backend ever ships a
             // partial registry response, this write MUST switch to a merge (mirror
             // the preferences slice's `mergePreferences`). Do not assume the
             // current payload is partial without also updating this reducer.
-            draft.registry = mapNotificationRegistryPayloadToRegistry(action.payload);
+            draft.registry = mapNotificationRegistryPayloadToRegistry(action.payload.registry);
         },
     },
 });

package/lib/esm/view/settingsView/epic/fetchNotificationSettingsEpic.js

@@ -17,6 +17,12 @@ export const fetchNotificationSettingsEpic = (actions$, state$, zeniAPI) => acti
     // meantime — the GET is carrying the pre-PUT snapshot and would
     // otherwise clobber the fresh save. Cursor Bugbot 3632510237.
     const saveEpochAtDispatch = state.notificationPreferencesViewState.saveEpoch;
+    // Snapshot the registry clear epoch at GET-dispatch time (same idiom as
+    // `saveEpochAtDispatch` above). The registry reducer compares it against
+    // the current `registryEpoch` and skips its write when a
+    // `clearAllNotificationRegistry` (tenant switch) has landed since — the
+    // GET is carrying the prior tenant's snapshot. Cursor Bugbot 67d6918e.
+    const registryEpochAtDispatch = state.notificationRegistryState.registryEpoch;
     return zeniAPI
         .getJSON(notificationPreferencesUrl(zeniAPI))
         .pipe(mergeMap((response) => {
@@ -24,9 +30,16 @@ export const fetchNotificationSettingsEpic = (actions$, state$, zeniAPI) => acti
             const updateActions = [
                 updateNotificationSettingsOnSuccess(response.data, userEmail),
             ];
-            if (response.data.task_checklist_registry != null) {
-                updateActions.push(updateNotificationRegistry(response.data.task_checklist_registry));
-            }
+            // Always dispatch — an absent `task_checklist_registry` (gate
+            // off) must CLEAR the prior tenant's registry, not leave it in
+            // place. The reducer clears on `undefined` and full-replaces
+            // otherwise, both guarded by the registry epoch so a stale GET
+            // that lands after a tenant switch is skipped. Cursor Bugbot
+            // 67d6918e.
+            updateActions.push(updateNotificationRegistry({
+                registry: response.data.task_checklist_registry ?? undefined,
+                registryEpochAtDispatch,
+            }));
             if (response.data.task_checklist_preferences != null) {
                 updateActions.push(fetchNotificationPreferencesSuccess({
                     preferences: response.data.task_checklist_preferences,

package/lib/view/settingsView/epic/fetchNotificationSettingsEpic.d.ts

@@ -18,7 +18,7 @@ export declare const fetchNotificationSettingsEpic: (actions$: ActionsObservable
     payload: import("../../../responsePayload").ZeniAPIStatus<Record<string, unknown>>;
     type: "settings/updateNotificationSettingsOnFailure";
 } | {
-    payload: import("../../../entity/notificationRegistry/notificationRegistryPayload").NotificationRegistryPayload;
+    payload: import("../../../entity/notificationRegistry/notificationRegistryReducer").UpdateNotificationRegistryPayload;
     type: "notificationRegistry/updateNotificationRegistry";
 } | {
     payload: import("../../notificationPreferencesView/notificationPreferencesViewReducer").FetchNotificationPreferencesSuccessPayload;

package/lib/view/settingsView/epic/fetchNotificationSettingsEpic.js

@@ -20,6 +20,12 @@ const fetchNotificationSettingsEpic = (actions$, state$, zeniAPI) => actions$.pi
     // meantime — the GET is carrying the pre-PUT snapshot and would
     // otherwise clobber the fresh save. Cursor Bugbot 3632510237.
     const saveEpochAtDispatch = state.notificationPreferencesViewState.saveEpoch;
+    // Snapshot the registry clear epoch at GET-dispatch time (same idiom as
+    // `saveEpochAtDispatch` above). The registry reducer compares it against
+    // the current `registryEpoch` and skips its write when a
+    // `clearAllNotificationRegistry` (tenant switch) has landed since — the
+    // GET is carrying the prior tenant's snapshot. Cursor Bugbot 67d6918e.
+    const registryEpochAtDispatch = state.notificationRegistryState.registryEpoch;
     return zeniAPI
         .getJSON((0, notificationPreferencesEndpoint_1.notificationPreferencesUrl)(zeniAPI))
         .pipe((0, operators_1.mergeMap)((response) => {
@@ -27,9 +33,16 @@ const fetchNotificationSettingsEpic = (actions$, state$, zeniAPI) => actions$.pi
             const updateActions = [
                 (0, settingsViewReducer_1.updateNotificationSettingsOnSuccess)(response.data, userEmail),
             ];
-            if (response.data.task_checklist_registry != null) {
-                updateActions.push((0, notificationRegistryReducer_1.updateNotificationRegistry)(response.data.task_checklist_registry));
-            }
+            // Always dispatch — an absent `task_checklist_registry` (gate
+            // off) must CLEAR the prior tenant's registry, not leave it in
+            // place. The reducer clears on `undefined` and full-replaces
+            // otherwise, both guarded by the registry epoch so a stale GET
+            // that lands after a tenant switch is skipped. Cursor Bugbot
+            // 67d6918e.
+            updateActions.push((0, notificationRegistryReducer_1.updateNotificationRegistry)({
+                registry: response.data.task_checklist_registry ?? undefined,
+                registryEpochAtDispatch,
+            }));
             if (response.data.task_checklist_preferences != null) {
                 updateActions.push((0, notificationPreferencesViewReducer_1.fetchNotificationPreferencesSuccess)({
                     preferences: response.data.task_checklist_preferences,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.1.60-betaDI0",
+  "version": "5.1.60-betaDI1",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",