@almadar/ui 2.29.0 → 2.30.0

package/dist/components/index.cjs

@@ -6059,43 +6059,43 @@ function useQuerySingleton(query) {
   if (!query) {
     return null;
   }
-  const store = React91.useMemo(() => getOrCreateStore(query), [query]);
+  const store2 = React91.useMemo(() => getOrCreateStore(query), [query]);
   React91.useMemo(() => {
     const listener = () => forceUpdate({});
-    store.listeners.add(listener);
+    store2.listeners.add(listener);
     return () => {
-      store.listeners.delete(listener);
+      store2.listeners.delete(listener);
     };
-  }, [store]);
+  }, [store2]);
   const notifyListeners = React91.useCallback(() => {
-    store.listeners.forEach((listener) => listener());
-  }, [store]);
+    store2.listeners.forEach((listener) => listener());
+  }, [store2]);
   const setSearch = React91.useCallback((value) => {
-    store.search = value;
+    store2.search = value;
     notifyListeners();
-  }, [store, notifyListeners]);
+  }, [store2, notifyListeners]);
   const setFilter = React91.useCallback((key, value) => {
-    store.filters = { ...store.filters, [key]: value };
+    store2.filters = { ...store2.filters, [key]: value };
     notifyListeners();
-  }, [store, notifyListeners]);
+  }, [store2, notifyListeners]);
   const clearFilters = React91.useCallback(() => {
-    store.filters = {};
-    store.search = "";
+    store2.filters = {};
+    store2.search = "";
     notifyListeners();
-  }, [store, notifyListeners]);
+  }, [store2, notifyListeners]);
   const setSort = React91.useCallback((field, direction) => {
-    store.sortField = field;
-    store.sortDirection = direction;
+    store2.sortField = field;
+    store2.sortDirection = direction;
     notifyListeners();
-  }, [store, notifyListeners]);
+  }, [store2, notifyListeners]);
   return {
-    search: store.search,
+    search: store2.search,
     setSearch,
-    filters: store.filters,
+    filters: store2.filters,
     setFilter,
     clearFilters,
-    sortField: store.sortField,
-    sortDirection: store.sortDirection,
+    sortField: store2.sortField,
+    sortDirection: store2.sortDirection,
     setSort
   };
 }
@@ -27493,7 +27493,7 @@ function SequencerBoard({
     setPlayState("playing");
     setCurrentStep(0);
     let step = 0;
-    const advance = () => {
+    const advance2 = () => {
       step++;
       if (step >= entity.maxSlots) {
         const playerSeq = slots.map((s) => s?.id);
@@ -27524,10 +27524,10 @@ function SequencerBoard({
         }
       } else {
         setCurrentStep(step);
-        timerRef.current = setTimeout(advance, stepDurationMs);
+        timerRef.current = setTimeout(advance2, stepDurationMs);
       }
     };
-    timerRef.current = setTimeout(advance, stepDurationMs);
+    timerRef.current = setTimeout(advance2, stepDurationMs);
   }, [canPlay, slots, entity.maxSlots, entity.solutions, stepDurationMs, playEvent, completeEvent, emit]);
   const machine = {
     name: entity.title,
@@ -29636,6 +29636,55 @@ function calculateDamage(attack, defense, isDefending = false, criticalChance =
 function generateCombatMessage(event) {
   return event.message;
 }
+var store = /* @__PURE__ */ new Map();
+var storeListeners = /* @__PURE__ */ new Set();
+var watchCallbacks = /* @__PURE__ */ new Map();
+function advance(entityType, data) {
+  const prev = store.get(entityType);
+  const oldData = prev?.data ?? [];
+  store.set(entityType, { data, version: (prev?.version ?? 0) + 1 });
+  for (const listener of storeListeners) {
+    listener();
+  }
+  const cbs = watchCallbacks.get(entityType);
+  if (cbs) {
+    for (const cb of cbs) {
+      try {
+        cb(oldData, data);
+      } catch {
+      }
+    }
+  }
+}
+function getSnapshot2(entityType) {
+  return store.get(entityType)?.data ?? [];
+}
+function getVersion(entityType) {
+  return store.get(entityType)?.version ?? 0;
+}
+function subscribeToStore(listener) {
+  storeListeners.add(listener);
+  return () => {
+    storeListeners.delete(listener);
+  };
+}
+function useEntityRef(entityType) {
+  const versionRef = React91.useRef(0);
+  const dataRef = React91.useRef([]);
+  const getSnapshotStable = React91__namespace.default.useCallback(() => {
+    const currentVersion = getVersion(entityType);
+    if (currentVersion !== versionRef.current) {
+      versionRef.current = currentVersion;
+      dataRef.current = getSnapshot2(entityType);
+    }
+    return dataRef.current;
+  }, [entityType]);
+  return React91.useSyncExternalStore(subscribeToStore, getSnapshotStable, () => []);
+}
+React91.createContext({
+  advance,
+  getSnapshot: getSnapshot2
+});
 var ClientEffectConfigContext = React91.createContext(null);
 ClientEffectConfigContext.Provider;
 
@@ -35036,6 +35085,9 @@ function SlotContentRenderer({
   content,
   onDismiss
 }) {
+  const entityProp = content.props.entity;
+  const entityType = typeof entityProp === "string" ? entityProp : "";
+  const storeData = useEntityRef(entityType);
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
@@ -35043,13 +35095,14 @@ function SlotContentRenderer({
     const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
+    const finalProps = entityType ? { ...renderedProps, entity: storeData } : renderedProps;
     return /* @__PURE__ */ jsxRuntime.jsx(
       Box,
       {
         className: "slot-content",
         "data-pattern": content.pattern,
         "data-id": content.id,
-        children: /* @__PURE__ */ jsxRuntime.jsx(PatternComponent, { ...renderedProps, children: renderedChildren })
+        children: /* @__PURE__ */ jsxRuntime.jsx(PatternComponent, { ...finalProps, children: renderedChildren })
       }
     );
   }
@@ -37604,13 +37657,13 @@ function clearEntities() {
   entities = /* @__PURE__ */ new Map();
   notify();
 }
-function getSnapshot2() {
+function getSnapshot3() {
   return entities;
 }
 
 // hooks/useEntities.ts
 function useEntities() {
-  const entities2 = React91.useSyncExternalStore(subscribe, getSnapshot2, getSnapshot2);
+  const entities2 = React91.useSyncExternalStore(subscribe, getSnapshot3, getSnapshot3);
   return {
     entities: entities2,
     getEntity,
@@ -37625,15 +37678,15 @@ function useEntities() {
   };
 }
 function useEntity2(id) {
-  const entities2 = React91.useSyncExternalStore(subscribe, getSnapshot2, getSnapshot2);
+  const entities2 = React91.useSyncExternalStore(subscribe, getSnapshot3, getSnapshot3);
   return entities2.get(id);
 }
 function useEntitiesByType(type) {
-  const entities2 = React91.useSyncExternalStore(subscribe, getSnapshot2, getSnapshot2);
+  const entities2 = React91.useSyncExternalStore(subscribe, getSnapshot3, getSnapshot3);
   return [...entities2.values()].filter((e) => e.type === type);
 }
 function useSingletonEntity(type) {
-  const entities2 = React91.useSyncExternalStore(subscribe, getSnapshot2, getSnapshot2);
+  const entities2 = React91.useSyncExternalStore(subscribe, getSnapshot3, getSnapshot3);
   return [...entities2.values()].find((e) => e.type === type);
 }
 function usePlayer() {

package/dist/components/index.js

@@ -6029,43 +6029,43 @@ function useQuerySingleton(query) {
   if (!query) {
     return null;
   }
-  const store = useMemo(() => getOrCreateStore(query), [query]);
+  const store2 = useMemo(() => getOrCreateStore(query), [query]);
   useMemo(() => {
     const listener = () => forceUpdate({});
-    store.listeners.add(listener);
+    store2.listeners.add(listener);
     return () => {
-      store.listeners.delete(listener);
+      store2.listeners.delete(listener);
     };
-  }, [store]);
+  }, [store2]);
   const notifyListeners = useCallback(() => {
-    store.listeners.forEach((listener) => listener());
-  }, [store]);
+    store2.listeners.forEach((listener) => listener());
+  }, [store2]);
   const setSearch = useCallback((value) => {
-    store.search = value;
+    store2.search = value;
     notifyListeners();
-  }, [store, notifyListeners]);
+  }, [store2, notifyListeners]);
   const setFilter = useCallback((key, value) => {
-    store.filters = { ...store.filters, [key]: value };
+    store2.filters = { ...store2.filters, [key]: value };
     notifyListeners();
-  }, [store, notifyListeners]);
+  }, [store2, notifyListeners]);
   const clearFilters = useCallback(() => {
-    store.filters = {};
-    store.search = "";
+    store2.filters = {};
+    store2.search = "";
     notifyListeners();
-  }, [store, notifyListeners]);
+  }, [store2, notifyListeners]);
   const setSort = useCallback((field, direction) => {
-    store.sortField = field;
-    store.sortDirection = direction;
+    store2.sortField = field;
+    store2.sortDirection = direction;
     notifyListeners();
-  }, [store, notifyListeners]);
+  }, [store2, notifyListeners]);
   return {
-    search: store.search,
+    search: store2.search,
     setSearch,
-    filters: store.filters,
+    filters: store2.filters,
     setFilter,
     clearFilters,
-    sortField: store.sortField,
-    sortDirection: store.sortDirection,
+    sortField: store2.sortField,
+    sortDirection: store2.sortDirection,
     setSort
   };
 }
@@ -27463,7 +27463,7 @@ function SequencerBoard({
     setPlayState("playing");
     setCurrentStep(0);
     let step = 0;
-    const advance = () => {
+    const advance2 = () => {
       step++;
       if (step >= entity.maxSlots) {
         const playerSeq = slots.map((s) => s?.id);
@@ -27494,10 +27494,10 @@ function SequencerBoard({
         }
       } else {
         setCurrentStep(step);
-        timerRef.current = setTimeout(advance, stepDurationMs);
+        timerRef.current = setTimeout(advance2, stepDurationMs);
       }
     };
-    timerRef.current = setTimeout(advance, stepDurationMs);
+    timerRef.current = setTimeout(advance2, stepDurationMs);
   }, [canPlay, slots, entity.maxSlots, entity.solutions, stepDurationMs, playEvent, completeEvent, emit]);
   const machine = {
     name: entity.title,
@@ -29606,6 +29606,55 @@ function calculateDamage(attack, defense, isDefending = false, criticalChance =
 function generateCombatMessage(event) {
   return event.message;
 }
+var store = /* @__PURE__ */ new Map();
+var storeListeners = /* @__PURE__ */ new Set();
+var watchCallbacks = /* @__PURE__ */ new Map();
+function advance(entityType, data) {
+  const prev = store.get(entityType);
+  const oldData = prev?.data ?? [];
+  store.set(entityType, { data, version: (prev?.version ?? 0) + 1 });
+  for (const listener of storeListeners) {
+    listener();
+  }
+  const cbs = watchCallbacks.get(entityType);
+  if (cbs) {
+    for (const cb of cbs) {
+      try {
+        cb(oldData, data);
+      } catch {
+      }
+    }
+  }
+}
+function getSnapshot2(entityType) {
+  return store.get(entityType)?.data ?? [];
+}
+function getVersion(entityType) {
+  return store.get(entityType)?.version ?? 0;
+}
+function subscribeToStore(listener) {
+  storeListeners.add(listener);
+  return () => {
+    storeListeners.delete(listener);
+  };
+}
+function useEntityRef(entityType) {
+  const versionRef = useRef(0);
+  const dataRef = useRef([]);
+  const getSnapshotStable = React91__default.useCallback(() => {
+    const currentVersion = getVersion(entityType);
+    if (currentVersion !== versionRef.current) {
+      versionRef.current = currentVersion;
+      dataRef.current = getSnapshot2(entityType);
+    }
+    return dataRef.current;
+  }, [entityType]);
+  return useSyncExternalStore(subscribeToStore, getSnapshotStable, () => []);
+}
+createContext({
+  advance,
+  getSnapshot: getSnapshot2
+});
 var ClientEffectConfigContext = createContext(null);
 ClientEffectConfigContext.Provider;
 
@@ -35006,6 +35055,9 @@ function SlotContentRenderer({
   content,
   onDismiss
 }) {
+  const entityProp = content.props.entity;
+  const entityType = typeof entityProp === "string" ? entityProp : "";
+  const storeData = useEntityRef(entityType);
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
@@ -35013,13 +35065,14 @@ function SlotContentRenderer({
     const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
+    const finalProps = entityType ? { ...renderedProps, entity: storeData } : renderedProps;
     return /* @__PURE__ */ jsx(
       Box,
       {
         className: "slot-content",
         "data-pattern": content.pattern,
         "data-id": content.id,
-        children: /* @__PURE__ */ jsx(PatternComponent, { ...renderedProps, children: renderedChildren })
+        children: /* @__PURE__ */ jsx(PatternComponent, { ...finalProps, children: renderedChildren })
       }
     );
   }
@@ -37574,13 +37627,13 @@ function clearEntities() {
   entities = /* @__PURE__ */ new Map();
   notify();
 }
-function getSnapshot2() {
+function getSnapshot3() {
   return entities;
 }
 
 // hooks/useEntities.ts
 function useEntities() {
-  const entities2 = useSyncExternalStore(subscribe, getSnapshot2, getSnapshot2);
+  const entities2 = useSyncExternalStore(subscribe, getSnapshot3, getSnapshot3);
   return {
     entities: entities2,
     getEntity,
@@ -37595,15 +37648,15 @@ function useEntities() {
   };
 }
 function useEntity2(id) {
-  const entities2 = useSyncExternalStore(subscribe, getSnapshot2, getSnapshot2);
+  const entities2 = useSyncExternalStore(subscribe, getSnapshot3, getSnapshot3);
   return entities2.get(id);
 }
 function useEntitiesByType(type) {
-  const entities2 = useSyncExternalStore(subscribe, getSnapshot2, getSnapshot2);
+  const entities2 = useSyncExternalStore(subscribe, getSnapshot3, getSnapshot3);
   return [...entities2.values()].filter((e) => e.type === type);
 }
 function useSingletonEntity(type) {
-  const entities2 = useSyncExternalStore(subscribe, getSnapshot2, getSnapshot2);
+  const entities2 = useSyncExternalStore(subscribe, getSnapshot3, getSnapshot3);
   return [...entities2.values()].find((e) => e.type === type);
 }
 function usePlayer() {

package/dist/providers/EntityStoreProvider.d.ts

@@ -12,7 +12,9 @@
  * @packageDocumentation
  */
 import React, { type ReactNode } from 'react';
+type StoreListener = () => void;
 type WatchCallback = (oldData: unknown[], newData: unknown[]) => void;
+export declare function subscribeToStore(listener: StoreListener): () => void;
 /**
  * Subscribe to an entity type's data reactively.
  * Re-renders only when the data for this specific entity type changes.

package/dist/runtime/ServerBridge.d.ts

@@ -12,6 +12,8 @@ export interface ServerResponseMeta {
     success: boolean;
     clientEffects: number;
     dataEntities: Record<string, number>;
+    /** Raw entity data from server response (for EntityStore advancement) */
+    data?: Record<string, unknown[]>;
     emittedEvents: string[];
     error?: string;
 }

package/dist/runtime/createClientEffectHandlers.d.ts

@@ -18,6 +18,5 @@ export interface CreateClientEffectHandlersOptions {
     slotSetter: SlotSetter;
     navigate?: (path: string, params?: Record<string, unknown>) => void;
     notify?: (message: string, type: 'success' | 'error' | 'warning' | 'info') => void;
-    enrichPattern?: (pattern: unknown) => unknown;
 }
 export declare function createClientEffectHandlers(options: CreateClientEffectHandlersOptions): EffectHandlers;

package/dist/runtime/index.cjs

@@ -685,7 +685,7 @@ typeof process !== "undefined" && process.env?.VITE_API_URL ? process.env.VITE_A
 
 // runtime/createClientEffectHandlers.ts
 function createClientEffectHandlers(options) {
-  const { eventBus, slotSetter, navigate, notify, enrichPattern } = options;
+  const { eventBus, slotSetter, navigate, notify } = options;
   return {
     emit: (event, payload) => {
       const prefixedEvent = event.startsWith("UI:") ? event : `UI:${event}`;
@@ -706,8 +706,7 @@ function createClientEffectHandlers(options) {
         slotSetter.clearSlot(slot);
         return;
       }
-      const enriched = enrichPattern ? enrichPattern(pattern) : pattern;
-      slotSetter.addPattern(slot, enriched, props);
+      slotSetter.addPattern(slot, pattern, props);
     },
     navigate: navigate ?? ((path) => {
       console.warn("[ClientEffectHandlers] No navigate handler, ignoring:", path);
@@ -2119,10 +2118,35 @@ function advance(entityType, data) {
 function getSnapshot3(entityType) {
   return store.get(entityType)?.data ?? [];
 }
+function getVersion(entityType) {
+  return store.get(entityType)?.version ?? 0;
+}
+function subscribeToStore(listener) {
+  storeListeners.add(listener);
+  return () => {
+    storeListeners.delete(listener);
+  };
+}
+function useEntityRef(entityType) {
+  const versionRef = React118.useRef(0);
+  const dataRef = React118.useRef([]);
+  const getSnapshotStable = React118__namespace.default.useCallback(() => {
+    const currentVersion = getVersion(entityType);
+    if (currentVersion !== versionRef.current) {
+      versionRef.current = currentVersion;
+      dataRef.current = getSnapshot3(entityType);
+    }
+    return dataRef.current;
+  }, [entityType]);
+  return React118.useSyncExternalStore(subscribeToStore, getSnapshotStable, () => []);
+}
 var EntityStoreContext = React118.createContext({
   advance,
   getSnapshot: getSnapshot3
 });
+function useEntityStore() {
+  return React118.useContext(EntityStoreContext);
+}
 function EntityStoreProvider({ children }) {
   return /* @__PURE__ */ jsxRuntime.jsx(EntityStoreContext.Provider, { value: { advance, getSnapshot: getSnapshot3 }, children });
 }
@@ -32324,6 +32348,9 @@ function SlotContentRenderer({
   content,
   onDismiss
 }) {
+  const entityProp = content.props.entity;
+  const entityType = typeof entityProp === "string" ? entityProp : "";
+  const storeData = useEntityRef(entityType);
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
@@ -32331,13 +32358,14 @@ function SlotContentRenderer({
     const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
+    const finalProps = entityType ? { ...renderedProps, entity: storeData } : renderedProps;
     return /* @__PURE__ */ jsxRuntime.jsx(
       Box,
       {
         className: "slot-content",
         "data-pattern": content.pattern,
         "data-id": content.id,
-        children: /* @__PURE__ */ jsxRuntime.jsx(PatternComponent, { ...renderedProps, children: renderedChildren })
+        children: /* @__PURE__ */ jsxRuntime.jsx(PatternComponent, { ...finalProps, children: renderedChildren })
       }
     );
   }
@@ -32620,41 +32648,6 @@ function OrbitalProvider({
   );
 }
 OrbitalProvider.displayName = "OrbitalProvider";
-function enrichFromResponse(node, data) {
-  if (!node || typeof node !== "object") return node ?? {};
-  let enriched = node;
-  if (Array.isArray(enriched.children)) {
-    enriched = {
-      ...enriched,
-      children: enriched.children.map(
-        (child) => {
-          if (!child || typeof child !== "object") return child;
-          return enrichFromResponse(child, data);
-        }
-      )
-    };
-  }
-  const nodeType = enriched.type;
-  if (nodeType && patterns.isEntityAwarePattern(nodeType) && typeof enriched.entity === "string") {
-    const entityName = enriched.entity;
-    const records = data[entityName];
-    if (records && records.length > 0) {
-      enriched = { ...enriched, entity: records };
-      if (!enriched.fields && !enriched.columns) {
-        const sample = records[0];
-        if (sample && typeof sample === "object") {
-          const keys = Object.keys(sample).filter((k) => k !== "id" && k !== "_id");
-          enriched = {
-            ...enriched,
-            fields: keys.map((k, i) => ({ name: k, variant: i === 0 ? "h4" : "body" })),
-            children: void 0
-          };
-        }
-      }
-    }
-  }
-  return enriched;
-}
 var ServerBridgeContext = React118.createContext(null);
 function useServerBridge() {
   const ctx = React118.useContext(ServerBridgeContext);
@@ -32711,6 +32704,7 @@ function ServerBridgeProvider({
         success: !!result.success,
         clientEffects: result.clientEffects?.length ?? 0,
         dataEntities,
+        data: responseData,
         emittedEvents: result.emittedEvents?.map((e) => e.event) ?? [],
         error: result.error
       };
@@ -32722,8 +32716,7 @@ function ServerBridgeProvider({
             if (effectType === "render-ui") {
               const slot = arr[1];
               const pattern = arr[2];
-              const enriched = pattern ? enrichFromResponse(pattern, responseData) : void 0;
-              effects.push({ type: "render-ui", slot, pattern: enriched });
+              effects.push({ type: "render-ui", slot, pattern: pattern ?? void 0 });
             } else if (effectType === "navigate") {
               effects.push({ type: "navigate", route: arr[1], params: arr[2] });
             } else if (effectType === "notify") {
@@ -32768,7 +32761,7 @@ function normalizeChild(child) {
     props: { ...rest, ...normalizedChildren !== void 0 ? { children: normalizedChildren } : {} }
   };
 }
-function SlotBridge({ mockData }) {
+function SlotBridge() {
   const slots = useSlots();
   const { render, clear } = context.useUISlots();
   React118.useEffect(() => {
@@ -32778,10 +32771,7 @@ function SlotBridge({ mockData }) {
         continue;
       }
       const entry = slotState.patterns[slotState.patterns.length - 1];
-      let patternRecord = entry.pattern;
-      if (mockData && Object.keys(mockData).length > 0) {
-        patternRecord = enrichFromResponse(patternRecord, mockData);
-      }
+      const patternRecord = entry.pattern;
       const { type: patternType, children, ...inlineProps } = patternRecord;
       const normalizedChildren = Array.isArray(children) ? children.map((c) => normalizeChild(c)) : children;
       render({
@@ -32795,17 +32785,26 @@ function SlotBridge({ mockData }) {
         sourceTrait: slotState.source?.trait
       });
     }
-  }, [slots, render, clear, mockData]);
+  }, [slots, render, clear]);
   return null;
 }
 function TraitInitializer({ traits: traits2, orbitalNames, onNavigate }) {
   const slotsActions = useSlotsActions();
   const bridge = useServerBridge();
+  const entityStore = useEntityStore();
   const onEventProcessed = React118.useCallback(async (event, payload) => {
     if (!bridge.connected || !orbitalNames?.length) return;
     for (const name of orbitalNames) {
       const { effects, meta } = await bridge.sendEvent(name, event, payload);
       recordServerResponse(name, event, meta);
+      const responseData = meta?.data;
+      if (responseData) {
+        for (const [entityType, records] of Object.entries(responseData)) {
+          if (Array.isArray(records)) {
+            entityStore.advance(entityType, records);
+          }
+        }
+      }
       for (const eff of effects) {
         if (eff.type === "render-ui" && eff.slot && eff.pattern) {
           slotsActions.setSlotPatterns(
@@ -32818,7 +32817,7 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate }) {
         }
       }
     }
-  }, [bridge.connected, bridge.sendEvent, orbitalNames, slotsActions, onNavigate]);
+  }, [bridge.connected, bridge.sendEvent, orbitalNames, slotsActions, onNavigate, entityStore]);
   const opts = orbitalNames ? { onEventProcessed, navigate: onNavigate } : { navigate: onNavigate };
   const { sendEvent } = useTraitStateMachine(traits2, slotsActions, opts);
   const initSentRef = React118.useRef(false);
@@ -32857,6 +32856,14 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate }) {
           effects: effectTraces,
           timestamp: Date.now()
         });
+        const initResponseData = meta?.data;
+        if (initResponseData) {
+          for (const [entityType, records] of Object.entries(initResponseData)) {
+            if (Array.isArray(records)) {
+              entityStore.advance(entityType, records);
+            }
+          }
+        }
         for (const eff of effects) {
           if (eff.type === "render-ui" && eff.slot && eff.pattern) {
             slotsActions.setSlotPatterns(
@@ -32897,9 +32904,19 @@ function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate }) {
     if (!orbitals) return [];
     return orbitals.filter((o) => typeof o.name === "string").map((o) => o.name);
   }, [schema]);
+  const entityStore = useEntityStore();
+  React118.useEffect(() => {
+    if (!serverUrl && mockData) {
+      for (const [entityType, records] of Object.entries(mockData)) {
+        if (Array.isArray(records)) {
+          entityStore.advance(entityType, records);
+        }
+      }
+    }
+  }, [mockData, serverUrl, entityStore]);
   const inner = /* @__PURE__ */ jsxRuntime.jsx(VerificationProvider, { enabled: true, children: /* @__PURE__ */ jsxRuntime.jsx(SlotsProvider, { children: /* @__PURE__ */ jsxRuntime.jsxs(EntitySchemaProvider, { entities: Array.from(allEntities.values()), children: [
     /* @__PURE__ */ jsxRuntime.jsx(TraitInitializer, { traits: allPageTraits, orbitalNames: serverUrl ? orbitalNames : void 0, onNavigate }),
-    /* @__PURE__ */ jsxRuntime.jsx(SlotBridge, { mockData: !serverUrl ? mockData : void 0 }),
+    /* @__PURE__ */ jsxRuntime.jsx(SlotBridge, {}),
     /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "min-h-full p-4", children: /* @__PURE__ */ jsxRuntime.jsx(UISlotRenderer, { includeHud: true, hudMode: "inline", includeFloating: true }) })
   ] }) }) });
   if (serverUrl) {
@@ -32982,7 +32999,6 @@ exports.TraitContext = TraitContext;
 exports.TraitProvider = TraitProvider;
 exports.clearSchemaCache = clearSchemaCache;
 exports.createClientEffectHandlers = createClientEffectHandlers;
-exports.enrichFromResponse = enrichFromResponse;
 exports.useEntityDefinition = useEntityDefinition;
 exports.useEntitySchema = useEntitySchema;
 exports.useResolvedSchema = useResolvedSchema;

package/dist/runtime/index.d.ts

@@ -14,5 +14,4 @@ export { SlotsProvider, useSlots, useSlotContent, useSlotsActions, type SlotsSta
 export { createClientEffectHandlers, type ClientEventBus, type SlotSetter, type CreateClientEffectHandlersOptions, } from './createClientEffectHandlers';
 export { OrbPreview, type OrbPreviewProps } from './OrbPreview';
 export { ServerBridgeProvider, useServerBridge, type ServerBridgeContextValue, type ServerClientEffect } from './ServerBridge';
-export { enrichFromResponse } from './enrichFromResponse';
 export type { ResolvedTraitBinding, ResolvedTrait, ResolvedEntity, ResolvedPage, ResolvedIR, } from './types';

package/dist/runtime/index.js

@@ -1,5 +1,5 @@
 import * as React118 from 'react';
-import React118__default, { createContext, useCallback, useState, useRef, useEffect, useLayoutEffect, lazy, useContext, useMemo, Suspense, useId } from 'react';
+import React118__default, { createContext, useCallback, useState, useRef, useEffect, useLayoutEffect, lazy, useContext, useMemo, Suspense, useSyncExternalStore, useId } from 'react';
 import { EventBusContext } from '@almadar/ui/providers';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import '@tanstack/react-query';
@@ -12,7 +12,7 @@ import { UISlotProvider, useUISlots } from '@almadar/ui/context';
 import * as LucideIcons from 'lucide-react';
 import { Loader2, ChevronDown, X, ArrowRight, TrendingDown, TrendingUp, Check, Copy, AlertCircle, AlertTriangle, Info, CheckCircle, ChevronLeft, ChevronRight, FileWarning, Upload, Circle, Clock, CheckCircle2, Sun, Moon, ArrowUp, ArrowDown, MoreVertical, Minus, Star, XCircle, Play, RotateCcw, Pause, SkipForward, Eraser, Search, HelpCircle, ChevronUp, ArrowLeft, Plus, Image as Image$1, ZoomIn, Package, Menu as Menu$1, ZoomOut, Filter, FileQuestion, Inbox, FileText, Download, Printer, Bug, Send, MoreHorizontal, Settings, Bell, LogOut, Trash2, Zap, Sword, Move, Heart, Shield, Code, WrapText, Wrench, List, Calendar, Pencil, Eye, User, Tag, DollarSign } from 'lucide-react';
 import { evaluate, createMinimalContext } from '@almadar/evaluator';
-import { isEntityAwarePattern, getComponentForPattern as getComponentForPattern$1 } from '@almadar/patterns';
+import { getComponentForPattern as getComponentForPattern$1 } from '@almadar/patterns';
 import { MapContainer, TileLayer, Marker, Popup, useMap } from 'react-leaflet';
 import L from 'leaflet';
 import 'leaflet/dist/leaflet.css';
@@ -655,7 +655,7 @@ typeof process !== "undefined" && process.env?.VITE_API_URL ? process.env.VITE_A
 
 // runtime/createClientEffectHandlers.ts
 function createClientEffectHandlers(options) {
-  const { eventBus, slotSetter, navigate, notify, enrichPattern } = options;
+  const { eventBus, slotSetter, navigate, notify } = options;
   return {
     emit: (event, payload) => {
       const prefixedEvent = event.startsWith("UI:") ? event : `UI:${event}`;
@@ -676,8 +676,7 @@ function createClientEffectHandlers(options) {
         slotSetter.clearSlot(slot);
         return;
       }
-      const enriched = enrichPattern ? enrichPattern(pattern) : pattern;
-      slotSetter.addPattern(slot, enriched, props);
+      slotSetter.addPattern(slot, pattern, props);
     },
     navigate: navigate ?? ((path) => {
       console.warn("[ClientEffectHandlers] No navigate handler, ignoring:", path);
@@ -2089,10 +2088,35 @@ function advance(entityType, data) {
 function getSnapshot3(entityType) {
   return store.get(entityType)?.data ?? [];
 }
+function getVersion(entityType) {
+  return store.get(entityType)?.version ?? 0;
+}
+function subscribeToStore(listener) {
+  storeListeners.add(listener);
+  return () => {
+    storeListeners.delete(listener);
+  };
+}
+function useEntityRef(entityType) {
+  const versionRef = useRef(0);
+  const dataRef = useRef([]);
+  const getSnapshotStable = React118__default.useCallback(() => {
+    const currentVersion = getVersion(entityType);
+    if (currentVersion !== versionRef.current) {
+      versionRef.current = currentVersion;
+      dataRef.current = getSnapshot3(entityType);
+    }
+    return dataRef.current;
+  }, [entityType]);
+  return useSyncExternalStore(subscribeToStore, getSnapshotStable, () => []);
+}
 var EntityStoreContext = createContext({
   advance,
   getSnapshot: getSnapshot3
 });
+function useEntityStore() {
+  return useContext(EntityStoreContext);
+}
 function EntityStoreProvider({ children }) {
   return /* @__PURE__ */ jsx(EntityStoreContext.Provider, { value: { advance, getSnapshot: getSnapshot3 }, children });
 }
@@ -32294,6 +32318,9 @@ function SlotContentRenderer({
   content,
   onDismiss
 }) {
+  const entityProp = content.props.entity;
+  const entityType = typeof entityProp === "string" ? entityProp : "";
+  const storeData = useEntityRef(entityType);
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
@@ -32301,13 +32328,14 @@ function SlotContentRenderer({
     const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
+    const finalProps = entityType ? { ...renderedProps, entity: storeData } : renderedProps;
     return /* @__PURE__ */ jsx(
       Box,
       {
         className: "slot-content",
         "data-pattern": content.pattern,
         "data-id": content.id,
-        children: /* @__PURE__ */ jsx(PatternComponent, { ...renderedProps, children: renderedChildren })
+        children: /* @__PURE__ */ jsx(PatternComponent, { ...finalProps, children: renderedChildren })
       }
     );
   }
@@ -32590,41 +32618,6 @@ function OrbitalProvider({
   );
 }
 OrbitalProvider.displayName = "OrbitalProvider";
-function enrichFromResponse(node, data) {
-  if (!node || typeof node !== "object") return node ?? {};
-  let enriched = node;
-  if (Array.isArray(enriched.children)) {
-    enriched = {
-      ...enriched,
-      children: enriched.children.map(
-        (child) => {
-          if (!child || typeof child !== "object") return child;
-          return enrichFromResponse(child, data);
-        }
-      )
-    };
-  }
-  const nodeType = enriched.type;
-  if (nodeType && isEntityAwarePattern(nodeType) && typeof enriched.entity === "string") {
-    const entityName = enriched.entity;
-    const records = data[entityName];
-    if (records && records.length > 0) {
-      enriched = { ...enriched, entity: records };
-      if (!enriched.fields && !enriched.columns) {
-        const sample = records[0];
-        if (sample && typeof sample === "object") {
-          const keys = Object.keys(sample).filter((k) => k !== "id" && k !== "_id");
-          enriched = {
-            ...enriched,
-            fields: keys.map((k, i) => ({ name: k, variant: i === 0 ? "h4" : "body" })),
-            children: void 0
-          };
-        }
-      }
-    }
-  }
-  return enriched;
-}
 var ServerBridgeContext = createContext(null);
 function useServerBridge() {
   const ctx = useContext(ServerBridgeContext);
@@ -32681,6 +32674,7 @@ function ServerBridgeProvider({
         success: !!result.success,
         clientEffects: result.clientEffects?.length ?? 0,
         dataEntities,
+        data: responseData,
         emittedEvents: result.emittedEvents?.map((e) => e.event) ?? [],
         error: result.error
       };
@@ -32692,8 +32686,7 @@ function ServerBridgeProvider({
             if (effectType === "render-ui") {
               const slot = arr[1];
               const pattern = arr[2];
-              const enriched = pattern ? enrichFromResponse(pattern, responseData) : void 0;
-              effects.push({ type: "render-ui", slot, pattern: enriched });
+              effects.push({ type: "render-ui", slot, pattern: pattern ?? void 0 });
             } else if (effectType === "navigate") {
               effects.push({ type: "navigate", route: arr[1], params: arr[2] });
             } else if (effectType === "notify") {
@@ -32738,7 +32731,7 @@ function normalizeChild(child) {
     props: { ...rest, ...normalizedChildren !== void 0 ? { children: normalizedChildren } : {} }
   };
 }
-function SlotBridge({ mockData }) {
+function SlotBridge() {
   const slots = useSlots();
   const { render, clear } = useUISlots();
   useEffect(() => {
@@ -32748,10 +32741,7 @@ function SlotBridge({ mockData }) {
         continue;
       }
       const entry = slotState.patterns[slotState.patterns.length - 1];
-      let patternRecord = entry.pattern;
-      if (mockData && Object.keys(mockData).length > 0) {
-        patternRecord = enrichFromResponse(patternRecord, mockData);
-      }
+      const patternRecord = entry.pattern;
       const { type: patternType, children, ...inlineProps } = patternRecord;
       const normalizedChildren = Array.isArray(children) ? children.map((c) => normalizeChild(c)) : children;
       render({
@@ -32765,17 +32755,26 @@ function SlotBridge({ mockData }) {
         sourceTrait: slotState.source?.trait
       });
     }
-  }, [slots, render, clear, mockData]);
+  }, [slots, render, clear]);
   return null;
 }
 function TraitInitializer({ traits: traits2, orbitalNames, onNavigate }) {
   const slotsActions = useSlotsActions();
   const bridge = useServerBridge();
+  const entityStore = useEntityStore();
   const onEventProcessed = useCallback(async (event, payload) => {
     if (!bridge.connected || !orbitalNames?.length) return;
     for (const name of orbitalNames) {
       const { effects, meta } = await bridge.sendEvent(name, event, payload);
       recordServerResponse(name, event, meta);
+      const responseData = meta?.data;
+      if (responseData) {
+        for (const [entityType, records] of Object.entries(responseData)) {
+          if (Array.isArray(records)) {
+            entityStore.advance(entityType, records);
+          }
+        }
+      }
       for (const eff of effects) {
         if (eff.type === "render-ui" && eff.slot && eff.pattern) {
           slotsActions.setSlotPatterns(
@@ -32788,7 +32787,7 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate }) {
         }
       }
     }
-  }, [bridge.connected, bridge.sendEvent, orbitalNames, slotsActions, onNavigate]);
+  }, [bridge.connected, bridge.sendEvent, orbitalNames, slotsActions, onNavigate, entityStore]);
   const opts = orbitalNames ? { onEventProcessed, navigate: onNavigate } : { navigate: onNavigate };
   const { sendEvent } = useTraitStateMachine(traits2, slotsActions, opts);
   const initSentRef = useRef(false);
@@ -32827,6 +32826,14 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate }) {
           effects: effectTraces,
           timestamp: Date.now()
         });
+        const initResponseData = meta?.data;
+        if (initResponseData) {
+          for (const [entityType, records] of Object.entries(initResponseData)) {
+            if (Array.isArray(records)) {
+              entityStore.advance(entityType, records);
+            }
+          }
+        }
         for (const eff of effects) {
           if (eff.type === "render-ui" && eff.slot && eff.pattern) {
             slotsActions.setSlotPatterns(
@@ -32867,9 +32874,19 @@ function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate }) {
     if (!orbitals) return [];
     return orbitals.filter((o) => typeof o.name === "string").map((o) => o.name);
   }, [schema]);
+  const entityStore = useEntityStore();
+  useEffect(() => {
+    if (!serverUrl && mockData) {
+      for (const [entityType, records] of Object.entries(mockData)) {
+        if (Array.isArray(records)) {
+          entityStore.advance(entityType, records);
+        }
+      }
+    }
+  }, [mockData, serverUrl, entityStore]);
   const inner = /* @__PURE__ */ jsx(VerificationProvider, { enabled: true, children: /* @__PURE__ */ jsx(SlotsProvider, { children: /* @__PURE__ */ jsxs(EntitySchemaProvider, { entities: Array.from(allEntities.values()), children: [
     /* @__PURE__ */ jsx(TraitInitializer, { traits: allPageTraits, orbitalNames: serverUrl ? orbitalNames : void 0, onNavigate }),
-    /* @__PURE__ */ jsx(SlotBridge, { mockData: !serverUrl ? mockData : void 0 }),
+    /* @__PURE__ */ jsx(SlotBridge, {}),
     /* @__PURE__ */ jsx(Box, { className: "min-h-full p-4", children: /* @__PURE__ */ jsx(UISlotRenderer, { includeHud: true, hudMode: "inline", includeFloating: true }) })
   ] }) }) });
   if (serverUrl) {
@@ -32944,4 +32961,4 @@ function OrbPreview({
 }
 OrbPreview.displayName = "OrbPreview";
 
-export { EntitySchemaProvider, OrbPreview, ServerBridgeProvider, SlotsProvider, TraitContext, TraitProvider, clearSchemaCache, createClientEffectHandlers, enrichFromResponse, useEntityDefinition, useEntitySchema, useResolvedSchema, useServerBridge, useSlotContent, useSlots, useSlotsActions, useTrait, useTraitContext, useTraitStateMachine };
+export { EntitySchemaProvider, OrbPreview, ServerBridgeProvider, SlotsProvider, TraitContext, TraitProvider, clearSchemaCache, createClientEffectHandlers, useEntityDefinition, useEntitySchema, useResolvedSchema, useServerBridge, useSlotContent, useSlots, useSlotsActions, useTrait, useTraitContext, useTraitStateMachine };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "2.29.0",
+  "version": "2.30.0",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "main": "./dist/components/index.js",

package/dist/runtime/enrichFromResponse.d.ts

@@ -1,21 +0,0 @@
-/**
- * enrichFromResponse
- *
- * Walks a pattern tree from a server response and injects entity data
- * into entity-aware patterns. Uses isEntityAwarePattern() from
- * @almadar/patterns (registry-driven, not a hardcoded list).
- *
- * This is the single place where entity data meets UI patterns.
- * Called by ServerBridge/ServerBridgeProvider when processing
- * clientEffects from the server response.
- *
- * @packageDocumentation
- */
-/**
- * Enrich a pattern tree with entity data from a server response.
- *
- * @param node - Pattern config node (from server clientEffects)
- * @param data - Entity records keyed by entity name (from server response.data)
- * @returns Enriched pattern with entity arrays injected
- */
-export declare function enrichFromResponse(node: Record<string, unknown> | null | undefined, data: Record<string, unknown[]>): Record<string, unknown>;