@almadar/ui 6.28.0 → 6.29.0

package/dist/{EntityBindingContext-C6FgxdfG.d.cts → EntityBindingContext-UyeCfEBS.d.cts}

@@ -102,6 +102,17 @@ interface OrbitalEventResponse {
         source?: BusEventSource;
     }>;
     data?: Record<string, EntityRow[]>;
+    /**
+     * The entity row each trait's effects left behind THIS request, keyed by
+     * trait name (Fix C, the stateless entity round-trip). The stateless
+     * deployment holds no server-side memory across requests — a `set`-only
+     * field a trait wrote here would otherwise vanish on the client's next
+     * request, since `entityByTrait` in the REQUEST only ever reflects the
+     * client's own prior local writes. Undefined on a server that doesn't
+     * send it (older servers, the stateful path) — the client simply keeps
+     * behaving as it always has.
+     */
+    entityByTrait?: Record<string, EntityRow>;
     clientEffects?: ClientEffectTuple[];
     /**
      * Same effects as `clientEffects`, paired with the trait that produced
@@ -151,6 +162,8 @@ interface ServerResponseMeta {
     dataEntities: Record<string, number>;
     /** Raw entity data from server response (for EntityStore advancement) */
     data?: Record<string, EntityRow[]>;
+    /** See `OrbitalEventResponse.entityByTrait`'s doc. */
+    entityByTrait?: Record<string, EntityRow>;
     emittedEvents: string[];
     /** Server-side effect outcomes — see `OrbitalEventResponse.effectResults`. */
     effectResults?: ServerEffectResult[];

package/dist/{EntityBindingContext-C6FgxdfG.d.ts → EntityBindingContext-UyeCfEBS.d.ts}

@@ -102,6 +102,17 @@ interface OrbitalEventResponse {
         source?: BusEventSource;
     }>;
     data?: Record<string, EntityRow[]>;
+    /**
+     * The entity row each trait's effects left behind THIS request, keyed by
+     * trait name (Fix C, the stateless entity round-trip). The stateless
+     * deployment holds no server-side memory across requests — a `set`-only
+     * field a trait wrote here would otherwise vanish on the client's next
+     * request, since `entityByTrait` in the REQUEST only ever reflects the
+     * client's own prior local writes. Undefined on a server that doesn't
+     * send it (older servers, the stateful path) — the client simply keeps
+     * behaving as it always has.
+     */
+    entityByTrait?: Record<string, EntityRow>;
     clientEffects?: ClientEffectTuple[];
     /**
      * Same effects as `clientEffects`, paired with the trait that produced
@@ -151,6 +162,8 @@ interface ServerResponseMeta {
     dataEntities: Record<string, number>;
     /** Raw entity data from server response (for EntityStore advancement) */
     data?: Record<string, EntityRow[]>;
+    /** See `OrbitalEventResponse.entityByTrait`'s doc. */
+    entityByTrait?: Record<string, EntityRow>;
     emittedEvents: string[];
     /** Server-side effect outcomes — see `OrbitalEventResponse.effectResults`. */
     effectResults?: ServerEffectResult[];

package/dist/avl/index.cjs

@@ -6158,6 +6158,13 @@ var init_slot_types = __esm({
     nextRefId = 1;
   }
 });
+var SlotContainedContext;
+var init_slotContained = __esm({
+  "lib/slotContained.ts"() {
+    "use client";
+    SlotContainedContext = React96.createContext(false);
+  }
+});
 function buildForkPaths(x, y, branches, scale) {
   const inLength = 30 * scale;
   const outLength = 30 * scale;
@@ -38470,7 +38477,6 @@ function TableView({
   columns,
   fields,
   itemActions,
-  maxInlineActions,
   itemClickEvent = "",
   selectable = false,
   selectEvent,
@@ -38504,8 +38510,7 @@ function TableView({
   const [localSelected, setLocalSelected] = React96__namespace.default.useState(/* @__PURE__ */ new Set());
   const colDefs = (Array.isArray(columns) ? columns : void 0) ?? (Array.isArray(fields) ? fields : void 0) ?? [];
   const actionDefs = Array.isArray(itemActions) ? itemActions : [];
-  const inlineActions = maxInlineActions != null ? actionDefs.slice(0, maxInlineActions) : [];
-  const overflowActions = maxInlineActions != null ? actionDefs.slice(maxInlineActions) : actionDefs;
+  const overflowActions = actionDefs;
   const fireAction = (action, row) => eventBus.emit(`UI:${action.event}`, {
     id: row.id,
     row
@@ -38687,7 +38692,7 @@ function TableView({
             }
             return /* @__PURE__ */ jsxRuntime.jsx(Box, { role: "cell", className: cellBase, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "truncate text-foreground", children: formatCell(raw, col.format, relationsData?.[col.field ?? col.key]) }) }, col.key);
           }),
-          hasActions && /* @__PURE__ */ jsxRuntime.jsxs(
+          hasActions && /* @__PURE__ */ jsxRuntime.jsx(
             HStack,
             {
               gap: "xs",
@@ -38701,38 +38706,20 @@ function TableView({
                 "border-l border-[var(--color-border)]",
                 lk.striped && index % 2 === 1 ? "bg-[var(--color-surface-subtle)]" : "bg-[var(--color-card)] group-hover:bg-[var(--color-surface-subtle)]"
               ),
-              children: [
-                inlineActions.map((action) => /* @__PURE__ */ jsxRuntime.jsxs(
-                  Button,
-                  {
-                    variant: action.variant ?? "ghost",
-                    size: "sm",
-                    onClick: () => fireAction(action, row),
-                    "data-testid": `action-${action.event}`,
-                    "data-row-id": String(row.id),
-                    className: cn(action.variant === "danger" && "text-error hover:bg-error/10"),
-                    children: [
-                      action.icon && renderIconInput3(action.icon, { size: "xs", className: "mr-1" }),
-                      action.label
-                    ]
-                  },
-                  action.event
-                )),
-                overflowActions.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(
-                  Menu,
-                  {
-                    position: "bottom-end",
-                    trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, { variant: "ghost", size: "sm", "aria-label": t("common.actions"), "data-testid": "action-overflow", "data-row-id": String(row.id), children: /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: "more-horizontal", size: "xs" }) }),
-                    items: overflowActions.map((action) => ({
-                      label: action.label,
-                      icon: action.icon,
-                      event: action.event,
-                      variant: action.variant === "danger" ? "danger" : "default",
-                      onClick: () => fireAction(action, row)
-                    }))
-                  }
-                )
-              ]
+              children: overflowActions.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(
+                Menu,
+                {
+                  position: "bottom-end",
+                  trigger: /* @__PURE__ */ jsxRuntime.jsx(Button, { variant: "ghost", size: "sm", "aria-label": t("common.actions"), "data-testid": "action-overflow", "data-row-id": String(row.id), children: /* @__PURE__ */ jsxRuntime.jsx(Icon, { name: "more-horizontal", size: "xs" }) }),
+                  items: overflowActions.map((action) => ({
+                    label: action.label,
+                    icon: action.icon,
+                    event: action.event,
+                    variant: action.variant === "danger" ? "danger" : "default",
+                    onClick: () => fireAction(action, row)
+                  }))
+                }
+              )
             }
           )
         ]
@@ -47749,6 +47736,7 @@ var init_DetailPanel = __esm({
     init_EmptyState();
     init_cn();
     init_portalRoot();
+    init_slotContained();
     init_format();
     init_getNestedValue();
     init_relationLabel();
@@ -47780,6 +47768,7 @@ var init_DetailPanel = __esm({
     }) => {
       const eventBus = useEventBus();
       const { t } = hooks.useTranslate();
+      const contained = React96.useContext(SlotContainedContext);
       const [titleDraft, setTitleDraft] = React96__namespace.default.useState(null);
       const isFieldDefArray = (arr) => {
         if (!arr || arr.length === 0) return false;
@@ -48167,8 +48156,9 @@ var init_DetailPanel = __esm({
       if (!slideOver) {
         return /* @__PURE__ */ jsxRuntime.jsx(Box, { className, children: content });
       }
-      const panel = /* @__PURE__ */ jsxRuntime.jsx(Box, { className: cn("fixed inset-y-0 right-0 w-full max-w-2xl bg-card shadow-lg z-50 overflow-y-auto p-6", className), children: content });
-      return typeof document === "undefined" ? panel : reactDom.createPortal(panel, getOrCreatePortalRoot());
+      const panel = /* @__PURE__ */ jsxRuntime.jsx(Box, { className: cn(contained ? "absolute" : "fixed", "inset-y-0 right-0 w-full max-w-2xl bg-card shadow-lg z-50 overflow-y-auto p-6", className), children: content });
+      if (contained || typeof document === "undefined") return panel;
+      return reactDom.createPortal(panel, getOrCreatePortalRoot());
     };
     DetailPanel.displayName = "DetailPanel";
   }
@@ -54665,6 +54655,7 @@ var init_component_registry_generated = __esm({
 // components/core/organisms/UISlotRenderer.tsx
 var UISlotRenderer_exports = {};
 __export(UISlotRenderer_exports, {
+  SlotContainedContext: () => SlotContainedContext,
   SlotContentRenderer: () => SlotContentRenderer,
   SuspenseConfigProvider: () => SuspenseConfigProvider,
   UISlotComponent: () => UISlotComponent,
@@ -54837,6 +54828,25 @@ function renderContainedPortal(t, slot, content, onDismiss) {
         }
       );
     case "drawer":
+      if (content.pattern === "detail-panel" && content.props.slideOver === true) {
+        return /* @__PURE__ */ jsxRuntime.jsx(
+          Box,
+          {
+            id: slotId,
+            className: "absolute inset-0 z-50 overflow-hidden",
+            style: { backgroundColor: "rgba(0, 0, 0, 0.5)" },
+            onClick: onDismiss,
+            children: /* @__PURE__ */ jsxRuntime.jsx(
+              Box,
+              {
+                className: "absolute inset-y-0 right-0 pointer-events-auto",
+                onClick: (e) => e.stopPropagation(),
+                children: slotContent
+              }
+            )
+          }
+        );
+      }
       return /* @__PURE__ */ jsxRuntime.jsx(
         Box,
         {
@@ -55688,7 +55698,7 @@ function UISlotRenderer({
   }
   return wrapped;
 }
-var scopeWrapLog, TRAIT_BINDING_RE, SuspenseConfigContext, SlotContainedContext, SLOT_SKELETON_MAP, CONTENT_NODE_SLOTS, PATTERNS_WITH_CHILDREN, traitRefPresenceCache;
+var scopeWrapLog, TRAIT_BINDING_RE, SuspenseConfigContext, SLOT_SKELETON_MAP, CONTENT_NODE_SLOTS, PATTERNS_WITH_CHILDREN, traitRefPresenceCache;
 var init_UISlotRenderer = __esm({
   "components/core/organisms/UISlotRenderer.tsx"() {
     "use client";
@@ -55703,6 +55713,7 @@ var init_UISlotRenderer = __esm({
     init_cn();
     init_format();
     init_portalRoot();
+    init_slotContained();
     init_ErrorBoundary();
     init_Skeleton();
     init_renderer();
@@ -55712,7 +55723,6 @@ var init_UISlotRenderer = __esm({
     scopeWrapLog = logger.createLogger("almadar:ui:scope-wrap");
     TRAIT_BINDING_RE = /^@trait\.([A-Z][A-Za-z0-9]*)$/;
     SuspenseConfigContext = React96.createContext({ enabled: false });
-    SlotContainedContext = React96.createContext(false);
     SuspenseConfigProvider.displayName = "SuspenseConfigProvider";
     SLOT_SKELETON_MAP = {
       main: "table",
@@ -60554,6 +60564,9 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     const normalizedEvent = normalizeEventKey(eventKey);
     return managerRef.current.canHandleEvent(traitName, normalizedEvent);
   }, []);
+  const commitServerEntity = React96.useCallback((traitName, entity) => {
+    traitFieldStatesRef.current.set(traitName, entity);
+  }, []);
   React96.useEffect(() => {
     const allEvents = /* @__PURE__ */ new Set();
     for (const binding of traitBindings) {
@@ -60717,7 +60730,8 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     sendEvent,
     getTraitState,
     canHandleEvent,
-    entityBindingSource
+    entityBindingSource,
+    commitServerEntity
   };
 }
 
@@ -60853,6 +60867,8 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
     [serverActiveTraits]
   );
   const uiSlots = context.useUISlots();
+  const commitServerEntityRef = React96.useRef(() => {
+  });
   const onEventProcessed = React96.useCallback((event, payload, dispatchedOrbitals, tick, sourceTrait, locallyEmitted, results, entityByTrait) => {
     if (!bridge.connected || !orbitalNames?.length) return;
     const targets = dispatchedOrbitals && dispatchedOrbitals.size > 0 ? orbitalNames.filter((n) => dispatchedOrbitals.has(n)) : orbitalNames;
@@ -60869,12 +60885,18 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
       }
       void bridge.sendEvent(name, event, withActiveTraits(payload), void 0, void 0, locallyEmitted, results, entityByTrait, user ?? void 0).then(({ effects, meta }) => {
         recordServerResponse(name, event, { ...meta, effectResults: effectResultsToTraces(meta.effectResults) });
+        if (meta.entityByTrait) {
+          for (const [traitName, entity] of Object.entries(meta.entityByTrait)) {
+            commitServerEntityRef.current(traitName, entity);
+          }
+        }
         applyServerEffects(effects, uiSlots, onNavigate, embeddedTraits, activeTraitNamesRef.current, onNavigateBack);
       });
     }
   }, [bridge.connected, bridge.sendEvent, orbitalNames, uiSlots, onNavigate, onNavigateBack, embeddedTraits, activeTraitNames, withActiveTraits, user]);
   const opts = orbitalNames ? { onEventProcessed, navigate: onNavigate, navigateBack: onNavigateBack, traitConfigsByName, orbitalsByTrait, embeddedTraits, callsiteCaptureChildrenByTrait, initPayload: routeParams } : { navigate: onNavigate, navigateBack: onNavigateBack, persistence, traitConfigsByName, orbitalsByTrait, embeddedTraits, callsiteCaptureChildrenByTrait, initPayload: routeParams };
-  const { sendEvent, entityBindingSource } = useTraitStateMachine(traits2, uiSlots, opts);
+  const { sendEvent, entityBindingSource, commitServerEntity } = useTraitStateMachine(traits2, uiSlots, opts);
+  commitServerEntityRef.current = commitServerEntity;
   const initSentRef = React96.useRef(false);
   const prevTraitsRef = React96.useRef(void 0);
   const paramsKey = JSON.stringify(routeParams ?? {});
@@ -60926,6 +60948,11 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
           user ?? void 0
         );
         recordServerResponse(name, "INIT", { ...meta, effectResults: effectResultsToTraces(meta.effectResults) });
+        if (meta.entityByTrait) {
+          for (const [traitName, entity] of Object.entries(meta.entityByTrait)) {
+            commitServerEntityRef.current(traitName, entity);
+          }
+        }
         const effectTraces = [
           { type: "fetch", args: [], status: "executed" },
           ...effects.map((eff) => ({

package/dist/avl/index.js

@@ -6082,6 +6082,13 @@ var init_slot_types = __esm({
     nextRefId = 1;
   }
 });
+var SlotContainedContext;
+var init_slotContained = __esm({
+  "lib/slotContained.ts"() {
+    "use client";
+    SlotContainedContext = createContext(false);
+  }
+});
 function buildForkPaths(x, y, branches, scale) {
   const inLength = 30 * scale;
   const outLength = 30 * scale;
@@ -38394,7 +38401,6 @@ function TableView({
   columns,
   fields,
   itemActions,
-  maxInlineActions,
   itemClickEvent = "",
   selectable = false,
   selectEvent,
@@ -38428,8 +38434,7 @@ function TableView({
   const [localSelected, setLocalSelected] = React96__default.useState(/* @__PURE__ */ new Set());
   const colDefs = (Array.isArray(columns) ? columns : void 0) ?? (Array.isArray(fields) ? fields : void 0) ?? [];
   const actionDefs = Array.isArray(itemActions) ? itemActions : [];
-  const inlineActions = maxInlineActions != null ? actionDefs.slice(0, maxInlineActions) : [];
-  const overflowActions = maxInlineActions != null ? actionDefs.slice(maxInlineActions) : actionDefs;
+  const overflowActions = actionDefs;
   const fireAction = (action, row) => eventBus.emit(`UI:${action.event}`, {
     id: row.id,
     row
@@ -38611,7 +38616,7 @@ function TableView({
             }
             return /* @__PURE__ */ jsx(Box, { role: "cell", className: cellBase, children: /* @__PURE__ */ jsx("span", { className: "truncate text-foreground", children: formatCell(raw, col.format, relationsData?.[col.field ?? col.key]) }) }, col.key);
           }),
-          hasActions && /* @__PURE__ */ jsxs(
+          hasActions && /* @__PURE__ */ jsx(
             HStack,
             {
               gap: "xs",
@@ -38625,38 +38630,20 @@ function TableView({
                 "border-l border-[var(--color-border)]",
                 lk.striped && index % 2 === 1 ? "bg-[var(--color-surface-subtle)]" : "bg-[var(--color-card)] group-hover:bg-[var(--color-surface-subtle)]"
               ),
-              children: [
-                inlineActions.map((action) => /* @__PURE__ */ jsxs(
-                  Button,
-                  {
-                    variant: action.variant ?? "ghost",
-                    size: "sm",
-                    onClick: () => fireAction(action, row),
-                    "data-testid": `action-${action.event}`,
-                    "data-row-id": String(row.id),
-                    className: cn(action.variant === "danger" && "text-error hover:bg-error/10"),
-                    children: [
-                      action.icon && renderIconInput3(action.icon, { size: "xs", className: "mr-1" }),
-                      action.label
-                    ]
-                  },
-                  action.event
-                )),
-                overflowActions.length > 0 && /* @__PURE__ */ jsx(
-                  Menu,
-                  {
-                    position: "bottom-end",
-                    trigger: /* @__PURE__ */ jsx(Button, { variant: "ghost", size: "sm", "aria-label": t("common.actions"), "data-testid": "action-overflow", "data-row-id": String(row.id), children: /* @__PURE__ */ jsx(Icon, { name: "more-horizontal", size: "xs" }) }),
-                    items: overflowActions.map((action) => ({
-                      label: action.label,
-                      icon: action.icon,
-                      event: action.event,
-                      variant: action.variant === "danger" ? "danger" : "default",
-                      onClick: () => fireAction(action, row)
-                    }))
-                  }
-                )
-              ]
+              children: overflowActions.length > 0 && /* @__PURE__ */ jsx(
+                Menu,
+                {
+                  position: "bottom-end",
+                  trigger: /* @__PURE__ */ jsx(Button, { variant: "ghost", size: "sm", "aria-label": t("common.actions"), "data-testid": "action-overflow", "data-row-id": String(row.id), children: /* @__PURE__ */ jsx(Icon, { name: "more-horizontal", size: "xs" }) }),
+                  items: overflowActions.map((action) => ({
+                    label: action.label,
+                    icon: action.icon,
+                    event: action.event,
+                    variant: action.variant === "danger" ? "danger" : "default",
+                    onClick: () => fireAction(action, row)
+                  }))
+                }
+              )
             }
           )
         ]
@@ -47673,6 +47660,7 @@ var init_DetailPanel = __esm({
     init_EmptyState();
     init_cn();
     init_portalRoot();
+    init_slotContained();
     init_format();
     init_getNestedValue();
     init_relationLabel();
@@ -47704,6 +47692,7 @@ var init_DetailPanel = __esm({
     }) => {
       const eventBus = useEventBus();
       const { t } = useTranslate();
+      const contained = useContext(SlotContainedContext);
       const [titleDraft, setTitleDraft] = React96__default.useState(null);
       const isFieldDefArray = (arr) => {
         if (!arr || arr.length === 0) return false;
@@ -48091,8 +48080,9 @@ var init_DetailPanel = __esm({
       if (!slideOver) {
         return /* @__PURE__ */ jsx(Box, { className, children: content });
       }
-      const panel = /* @__PURE__ */ jsx(Box, { className: cn("fixed inset-y-0 right-0 w-full max-w-2xl bg-card shadow-lg z-50 overflow-y-auto p-6", className), children: content });
-      return typeof document === "undefined" ? panel : createPortal(panel, getOrCreatePortalRoot());
+      const panel = /* @__PURE__ */ jsx(Box, { className: cn(contained ? "absolute" : "fixed", "inset-y-0 right-0 w-full max-w-2xl bg-card shadow-lg z-50 overflow-y-auto p-6", className), children: content });
+      if (contained || typeof document === "undefined") return panel;
+      return createPortal(panel, getOrCreatePortalRoot());
     };
     DetailPanel.displayName = "DetailPanel";
   }
@@ -54589,6 +54579,7 @@ var init_component_registry_generated = __esm({
 // components/core/organisms/UISlotRenderer.tsx
 var UISlotRenderer_exports = {};
 __export(UISlotRenderer_exports, {
+  SlotContainedContext: () => SlotContainedContext,
   SlotContentRenderer: () => SlotContentRenderer,
   SuspenseConfigProvider: () => SuspenseConfigProvider,
   UISlotComponent: () => UISlotComponent,
@@ -54761,6 +54752,25 @@ function renderContainedPortal(t, slot, content, onDismiss) {
         }
       );
     case "drawer":
+      if (content.pattern === "detail-panel" && content.props.slideOver === true) {
+        return /* @__PURE__ */ jsx(
+          Box,
+          {
+            id: slotId,
+            className: "absolute inset-0 z-50 overflow-hidden",
+            style: { backgroundColor: "rgba(0, 0, 0, 0.5)" },
+            onClick: onDismiss,
+            children: /* @__PURE__ */ jsx(
+              Box,
+              {
+                className: "absolute inset-y-0 right-0 pointer-events-auto",
+                onClick: (e) => e.stopPropagation(),
+                children: slotContent
+              }
+            )
+          }
+        );
+      }
       return /* @__PURE__ */ jsx(
         Box,
         {
@@ -55612,7 +55622,7 @@ function UISlotRenderer({
   }
   return wrapped;
 }
-var scopeWrapLog, TRAIT_BINDING_RE, SuspenseConfigContext, SlotContainedContext, SLOT_SKELETON_MAP, CONTENT_NODE_SLOTS, PATTERNS_WITH_CHILDREN, traitRefPresenceCache;
+var scopeWrapLog, TRAIT_BINDING_RE, SuspenseConfigContext, SLOT_SKELETON_MAP, CONTENT_NODE_SLOTS, PATTERNS_WITH_CHILDREN, traitRefPresenceCache;
 var init_UISlotRenderer = __esm({
   "components/core/organisms/UISlotRenderer.tsx"() {
     "use client";
@@ -55627,6 +55637,7 @@ var init_UISlotRenderer = __esm({
     init_cn();
     init_format();
     init_portalRoot();
+    init_slotContained();
     init_ErrorBoundary();
     init_Skeleton();
     init_renderer();
@@ -55636,7 +55647,6 @@ var init_UISlotRenderer = __esm({
     scopeWrapLog = createLogger("almadar:ui:scope-wrap");
     TRAIT_BINDING_RE = /^@trait\.([A-Z][A-Za-z0-9]*)$/;
     SuspenseConfigContext = createContext({ enabled: false });
-    SlotContainedContext = createContext(false);
     SuspenseConfigProvider.displayName = "SuspenseConfigProvider";
     SLOT_SKELETON_MAP = {
       main: "table",
@@ -60478,6 +60488,9 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     const normalizedEvent = normalizeEventKey(eventKey);
     return managerRef.current.canHandleEvent(traitName, normalizedEvent);
   }, []);
+  const commitServerEntity = useCallback((traitName, entity) => {
+    traitFieldStatesRef.current.set(traitName, entity);
+  }, []);
   useEffect(() => {
     const allEvents = /* @__PURE__ */ new Set();
     for (const binding of traitBindings) {
@@ -60641,7 +60654,8 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     sendEvent,
     getTraitState,
     canHandleEvent,
-    entityBindingSource
+    entityBindingSource,
+    commitServerEntity
   };
 }
 
@@ -60777,6 +60791,8 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
     [serverActiveTraits]
   );
   const uiSlots = useUISlots();
+  const commitServerEntityRef = useRef(() => {
+  });
   const onEventProcessed = useCallback((event, payload, dispatchedOrbitals, tick, sourceTrait, locallyEmitted, results, entityByTrait) => {
     if (!bridge.connected || !orbitalNames?.length) return;
     const targets = dispatchedOrbitals && dispatchedOrbitals.size > 0 ? orbitalNames.filter((n) => dispatchedOrbitals.has(n)) : orbitalNames;
@@ -60793,12 +60809,18 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
       }
       void bridge.sendEvent(name, event, withActiveTraits(payload), void 0, void 0, locallyEmitted, results, entityByTrait, user ?? void 0).then(({ effects, meta }) => {
         recordServerResponse(name, event, { ...meta, effectResults: effectResultsToTraces(meta.effectResults) });
+        if (meta.entityByTrait) {
+          for (const [traitName, entity] of Object.entries(meta.entityByTrait)) {
+            commitServerEntityRef.current(traitName, entity);
+          }
+        }
         applyServerEffects(effects, uiSlots, onNavigate, embeddedTraits, activeTraitNamesRef.current, onNavigateBack);
       });
     }
   }, [bridge.connected, bridge.sendEvent, orbitalNames, uiSlots, onNavigate, onNavigateBack, embeddedTraits, activeTraitNames, withActiveTraits, user]);
   const opts = orbitalNames ? { onEventProcessed, navigate: onNavigate, navigateBack: onNavigateBack, traitConfigsByName, orbitalsByTrait, embeddedTraits, callsiteCaptureChildrenByTrait, initPayload: routeParams } : { navigate: onNavigate, navigateBack: onNavigateBack, persistence, traitConfigsByName, orbitalsByTrait, embeddedTraits, callsiteCaptureChildrenByTrait, initPayload: routeParams };
-  const { sendEvent, entityBindingSource } = useTraitStateMachine(traits2, uiSlots, opts);
+  const { sendEvent, entityBindingSource, commitServerEntity } = useTraitStateMachine(traits2, uiSlots, opts);
+  commitServerEntityRef.current = commitServerEntity;
   const initSentRef = useRef(false);
   const prevTraitsRef = useRef(void 0);
   const paramsKey = JSON.stringify(routeParams ?? {});
@@ -60850,6 +60872,11 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
           user ?? void 0
         );
         recordServerResponse(name, "INIT", { ...meta, effectResults: effectResultsToTraces(meta.effectResults) });
+        if (meta.entityByTrait) {
+          for (const [traitName, entity] of Object.entries(meta.entityByTrait)) {
+            commitServerEntityRef.current(traitName, entity);
+          }
+        }
         const effectTraces = [
           { type: "fetch", args: [], status: "executed" },
           ...effects.map((eff) => ({