@almadar/ui 2.60.2 → 2.60.4

package/dist/avl/index.cjs

@@ -36416,7 +36416,7 @@ function VerifyModePanel({
   serverCount,
   localCount
 }) {
-  const [expanded, setExpanded] = React127__namespace.useState(false);
+  const [expanded, setExpanded] = React127__namespace.useState(true);
   const scrollRef = React127__namespace.useRef(null);
   const prevCountRef = React127__namespace.useRef(0);
   React127__namespace.useEffect(() => {
@@ -51675,19 +51675,18 @@ function ServerBridgeProvider({
         error: result.error
       };
       if (result.success) {
-        if (result.clientEffects) {
-          for (const effect of result.clientEffects) {
-            const arr = effect;
-            const effectType = arr[0];
-            if (effectType === "render-ui") {
-              const slot = arr[1];
-              const pattern = arr[2];
-              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") {
-              effects.push({ type: "notify", message: arr[1] });
-            }
+        const tagged = result.clientEffectsByTrait;
+        const tuples = tagged ? tagged.map((entry) => ({ effect: entry.effect, traitName: entry.traitName })) : (result.clientEffects ?? []).map((eff) => ({ effect: eff }));
+        for (const { effect, traitName } of tuples) {
+          const effectType = effect[0];
+          if (effectType === "render-ui") {
+            const slot = effect[1];
+            const pattern = effect[2];
+            effects.push({ type: "render-ui", slot, pattern: pattern ?? void 0, traitName });
+          } else if (effectType === "navigate") {
+            effects.push({ type: "navigate", route: effect[1], params: effect[2], traitName });
+          } else if (effectType === "notify") {
+            effects.push({ type: "notify", message: effect[1], traitName });
           }
         }
         if (result.emittedEvents) {
@@ -51853,9 +51852,30 @@ function SlotBridge() {
   }, [slots, render, clear]);
   return null;
 }
+function applyServerEffects(effects, uiSlots, onNavigate) {
+  for (const eff of effects) {
+    if (eff.type === "render-ui" && eff.slot && eff.pattern) {
+      const patternRecord = eff.pattern;
+      const { type: patternType, children, ...inlineProps } = patternRecord;
+      const normalizedChildren = Array.isArray(children) ? children.map((c) => normalizeChild(c)) : children;
+      uiSlots.render({
+        target: eff.slot,
+        pattern: patternType,
+        props: {
+          ...inlineProps,
+          ...normalizedChildren !== void 0 ? { children: normalizedChildren } : {}
+        },
+        sourceTrait: eff.traitName ?? "server"
+      });
+    } else if (eff.type === "navigate" && eff.route && onNavigate) {
+      onNavigate(eff.route, eff.params);
+    }
+  }
+}
 function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFallback }) {
   const slotsActions = useSlotsActions();
   const bridge = useServerBridge();
+  const uiSlots = useUISlots();
   const entityStore = useEntityStore();
   const onEventProcessed = React127.useCallback(async (event, payload) => {
     if (!bridge.connected || !orbitalNames?.length) return;
@@ -51870,19 +51890,9 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
           }
         }
       }
-      for (const eff of effects) {
-        if (eff.type === "render-ui" && eff.slot && eff.pattern) {
-          slotsActions.setSlotPatterns(
-            eff.slot,
-            [{ pattern: eff.pattern, props: {} }],
-            { trait: "server", state: "server", transition: "server-effect" }
-          );
-        } else if (eff.type === "navigate" && eff.route && onNavigate) {
-          onNavigate(eff.route, eff.params);
-        }
-      }
+      applyServerEffects(effects, uiSlots, onNavigate);
     }
-  }, [bridge.connected, bridge.sendEvent, orbitalNames, slotsActions, onNavigate, entityStore]);
+  }, [bridge.connected, bridge.sendEvent, orbitalNames, uiSlots, onNavigate, entityStore]);
   const opts = orbitalNames ? { onEventProcessed, navigate: onNavigate } : { navigate: onNavigate };
   const { sendEvent } = useTraitStateMachine(traits2, slotsActions, opts);
   const initSentRef = React127.useRef(false);
@@ -51930,18 +51940,10 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
             }
           }
         }
-        for (const eff of effects) {
-          if (eff.type === "render-ui" && eff.slot && eff.pattern) {
-            slotsActions.setSlotPatterns(
-              eff.slot,
-              [{ pattern: eff.pattern, props: {} }],
-              { trait: "server", state: "server", transition: "server-effect" }
-            );
-          }
-        }
+        applyServerEffects(effects, uiSlots, onNavigate);
       }
     })();
-  }, [bridge.connected, orbitalNames, bridge.sendEvent, slotsActions]);
+  }, [bridge.connected, orbitalNames, bridge.sendEvent, uiSlots, onNavigate]);
   return null;
 }
 function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate, onLocalFallback }) {

package/dist/avl/index.js

@@ -36370,7 +36370,7 @@ function VerifyModePanel({
   serverCount,
   localCount
 }) {
-  const [expanded, setExpanded] = React127.useState(false);
+  const [expanded, setExpanded] = React127.useState(true);
   const scrollRef = React127.useRef(null);
   const prevCountRef = React127.useRef(0);
   React127.useEffect(() => {
@@ -51629,19 +51629,18 @@ function ServerBridgeProvider({
         error: result.error
       };
       if (result.success) {
-        if (result.clientEffects) {
-          for (const effect of result.clientEffects) {
-            const arr = effect;
-            const effectType = arr[0];
-            if (effectType === "render-ui") {
-              const slot = arr[1];
-              const pattern = arr[2];
-              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") {
-              effects.push({ type: "notify", message: arr[1] });
-            }
+        const tagged = result.clientEffectsByTrait;
+        const tuples = tagged ? tagged.map((entry) => ({ effect: entry.effect, traitName: entry.traitName })) : (result.clientEffects ?? []).map((eff) => ({ effect: eff }));
+        for (const { effect, traitName } of tuples) {
+          const effectType = effect[0];
+          if (effectType === "render-ui") {
+            const slot = effect[1];
+            const pattern = effect[2];
+            effects.push({ type: "render-ui", slot, pattern: pattern ?? void 0, traitName });
+          } else if (effectType === "navigate") {
+            effects.push({ type: "navigate", route: effect[1], params: effect[2], traitName });
+          } else if (effectType === "notify") {
+            effects.push({ type: "notify", message: effect[1], traitName });
           }
         }
         if (result.emittedEvents) {
@@ -51807,9 +51806,30 @@ function SlotBridge() {
   }, [slots, render, clear]);
   return null;
 }
+function applyServerEffects(effects, uiSlots, onNavigate) {
+  for (const eff of effects) {
+    if (eff.type === "render-ui" && eff.slot && eff.pattern) {
+      const patternRecord = eff.pattern;
+      const { type: patternType, children, ...inlineProps } = patternRecord;
+      const normalizedChildren = Array.isArray(children) ? children.map((c) => normalizeChild(c)) : children;
+      uiSlots.render({
+        target: eff.slot,
+        pattern: patternType,
+        props: {
+          ...inlineProps,
+          ...normalizedChildren !== void 0 ? { children: normalizedChildren } : {}
+        },
+        sourceTrait: eff.traitName ?? "server"
+      });
+    } else if (eff.type === "navigate" && eff.route && onNavigate) {
+      onNavigate(eff.route, eff.params);
+    }
+  }
+}
 function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFallback }) {
   const slotsActions = useSlotsActions();
   const bridge = useServerBridge();
+  const uiSlots = useUISlots();
   const entityStore = useEntityStore();
   const onEventProcessed = useCallback(async (event, payload) => {
     if (!bridge.connected || !orbitalNames?.length) return;
@@ -51824,19 +51844,9 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
           }
         }
       }
-      for (const eff of effects) {
-        if (eff.type === "render-ui" && eff.slot && eff.pattern) {
-          slotsActions.setSlotPatterns(
-            eff.slot,
-            [{ pattern: eff.pattern, props: {} }],
-            { trait: "server", state: "server", transition: "server-effect" }
-          );
-        } else if (eff.type === "navigate" && eff.route && onNavigate) {
-          onNavigate(eff.route, eff.params);
-        }
-      }
+      applyServerEffects(effects, uiSlots, onNavigate);
     }
-  }, [bridge.connected, bridge.sendEvent, orbitalNames, slotsActions, onNavigate, entityStore]);
+  }, [bridge.connected, bridge.sendEvent, orbitalNames, uiSlots, onNavigate, entityStore]);
   const opts = orbitalNames ? { onEventProcessed, navigate: onNavigate } : { navigate: onNavigate };
   const { sendEvent } = useTraitStateMachine(traits2, slotsActions, opts);
   const initSentRef = useRef(false);
@@ -51884,18 +51894,10 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
             }
           }
         }
-        for (const eff of effects) {
-          if (eff.type === "render-ui" && eff.slot && eff.pattern) {
-            slotsActions.setSlotPatterns(
-              eff.slot,
-              [{ pattern: eff.pattern, props: {} }],
-              { trait: "server", state: "server", transition: "server-effect" }
-            );
-          }
-        }
+        applyServerEffects(effects, uiSlots, onNavigate);
       }
     })();
-  }, [bridge.connected, orbitalNames, bridge.sendEvent, slotsActions]);
+  }, [bridge.connected, orbitalNames, bridge.sendEvent, uiSlots, onNavigate]);
   return null;
 }
 function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate, onLocalFallback }) {

package/dist/components/index.cjs

@@ -32404,7 +32404,7 @@ function VerifyModePanel({
   serverCount,
   localCount
 }) {
-  const [expanded, setExpanded] = React110__namespace.useState(false);
+  const [expanded, setExpanded] = React110__namespace.useState(true);
   const scrollRef = React110__namespace.useRef(null);
   const prevCountRef = React110__namespace.useRef(0);
   React110__namespace.useEffect(() => {

package/dist/components/index.js

@@ -32359,7 +32359,7 @@ function VerifyModePanel({
   serverCount,
   localCount
 }) {
-  const [expanded, setExpanded] = React110.useState(false);
+  const [expanded, setExpanded] = React110.useState(true);
   const scrollRef = React110.useRef(null);
   const prevCountRef = React110.useRef(0);
   React110.useEffect(() => {

package/dist/providers/index.cjs

@@ -33214,7 +33214,7 @@ function VerifyModePanel({
   serverCount,
   localCount
 }) {
-  const [expanded, setExpanded] = React116__namespace.useState(false);
+  const [expanded, setExpanded] = React116__namespace.useState(true);
   const scrollRef = React116__namespace.useRef(null);
   const prevCountRef = React116__namespace.useRef(0);
   React116__namespace.useEffect(() => {

package/dist/providers/index.js

@@ -33169,7 +33169,7 @@ function VerifyModePanel({
   serverCount,
   localCount
 }) {
-  const [expanded, setExpanded] = React116.useState(false);
+  const [expanded, setExpanded] = React116.useState(true);
   const scrollRef = React116.useRef(null);
   const prevCountRef = React116.useRef(0);
   React116.useEffect(() => {

package/dist/runtime/ServerBridge.d.ts

@@ -6,6 +6,12 @@ export interface ServerClientEffect {
     route?: string;
     params?: Record<string, unknown>;
     message?: string;
+    /**
+     * Trait that emitted this effect. Used by `<TraitFrame>` to resolve
+     * `@trait.X` bindings. Undefined when the server didn't tag the effect
+     * (older servers that pre-date the per-trait sidecar).
+     */
+    traitName?: string;
 }
 /** Metadata about what the server returned, for debugger logging */
 export interface ServerResponseMeta {

package/dist/runtime/index.cjs

@@ -32787,7 +32787,7 @@ function VerifyModePanel({
   serverCount,
   localCount
 }) {
-  const [expanded, setExpanded] = React116__namespace.useState(false);
+  const [expanded, setExpanded] = React116__namespace.useState(true);
   const scrollRef = React116__namespace.useRef(null);
   const prevCountRef = React116__namespace.useRef(0);
   React116__namespace.useEffect(() => {
@@ -38451,19 +38451,18 @@ function ServerBridgeProvider({
         error: result.error
       };
       if (result.success) {
-        if (result.clientEffects) {
-          for (const effect of result.clientEffects) {
-            const arr = effect;
-            const effectType = arr[0];
-            if (effectType === "render-ui") {
-              const slot = arr[1];
-              const pattern = arr[2];
-              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") {
-              effects.push({ type: "notify", message: arr[1] });
-            }
+        const tagged = result.clientEffectsByTrait;
+        const tuples = tagged ? tagged.map((entry) => ({ effect: entry.effect, traitName: entry.traitName })) : (result.clientEffects ?? []).map((eff) => ({ effect: eff }));
+        for (const { effect, traitName } of tuples) {
+          const effectType = effect[0];
+          if (effectType === "render-ui") {
+            const slot = effect[1];
+            const pattern = effect[2];
+            effects.push({ type: "render-ui", slot, pattern: pattern ?? void 0, traitName });
+          } else if (effectType === "navigate") {
+            effects.push({ type: "navigate", route: effect[1], params: effect[2], traitName });
+          } else if (effectType === "notify") {
+            effects.push({ type: "notify", message: effect[1], traitName });
           }
         }
         if (result.emittedEvents) {
@@ -38628,9 +38627,30 @@ function SlotBridge() {
   }, [slots, render, clear]);
   return null;
 }
+function applyServerEffects(effects, uiSlots, onNavigate) {
+  for (const eff of effects) {
+    if (eff.type === "render-ui" && eff.slot && eff.pattern) {
+      const patternRecord = eff.pattern;
+      const { type: patternType, children, ...inlineProps } = patternRecord;
+      const normalizedChildren = Array.isArray(children) ? children.map((c) => normalizeChild(c)) : children;
+      uiSlots.render({
+        target: eff.slot,
+        pattern: patternType,
+        props: {
+          ...inlineProps,
+          ...normalizedChildren !== void 0 ? { children: normalizedChildren } : {}
+        },
+        sourceTrait: eff.traitName ?? "server"
+      });
+    } else if (eff.type === "navigate" && eff.route && onNavigate) {
+      onNavigate(eff.route, eff.params);
+    }
+  }
+}
 function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFallback }) {
   const slotsActions = useSlotsActions();
   const bridge = useServerBridge();
+  const uiSlots = context.useUISlots();
   const entityStore = providers.useEntityStore();
   const onEventProcessed = React116.useCallback(async (event, payload) => {
     if (!bridge.connected || !orbitalNames?.length) return;
@@ -38645,19 +38665,9 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
           }
         }
       }
-      for (const eff of effects) {
-        if (eff.type === "render-ui" && eff.slot && eff.pattern) {
-          slotsActions.setSlotPatterns(
-            eff.slot,
-            [{ pattern: eff.pattern, props: {} }],
-            { trait: "server", state: "server", transition: "server-effect" }
-          );
-        } else if (eff.type === "navigate" && eff.route && onNavigate) {
-          onNavigate(eff.route, eff.params);
-        }
-      }
+      applyServerEffects(effects, uiSlots, onNavigate);
     }
-  }, [bridge.connected, bridge.sendEvent, orbitalNames, slotsActions, onNavigate, entityStore]);
+  }, [bridge.connected, bridge.sendEvent, orbitalNames, uiSlots, onNavigate, entityStore]);
   const opts = orbitalNames ? { onEventProcessed, navigate: onNavigate } : { navigate: onNavigate };
   const { sendEvent } = useTraitStateMachine(traits2, slotsActions, opts);
   const initSentRef = React116.useRef(false);
@@ -38705,18 +38715,10 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
             }
           }
         }
-        for (const eff of effects) {
-          if (eff.type === "render-ui" && eff.slot && eff.pattern) {
-            slotsActions.setSlotPatterns(
-              eff.slot,
-              [{ pattern: eff.pattern, props: {} }],
-              { trait: "server", state: "server", transition: "server-effect" }
-            );
-          }
-        }
+        applyServerEffects(effects, uiSlots, onNavigate);
       }
     })();
-  }, [bridge.connected, orbitalNames, bridge.sendEvent, slotsActions]);
+  }, [bridge.connected, orbitalNames, bridge.sendEvent, uiSlots, onNavigate]);
   return null;
 }
 function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate, onLocalFallback }) {

package/dist/runtime/index.js

@@ -32742,7 +32742,7 @@ function VerifyModePanel({
   serverCount,
   localCount
 }) {
-  const [expanded, setExpanded] = React116.useState(false);
+  const [expanded, setExpanded] = React116.useState(true);
   const scrollRef = React116.useRef(null);
   const prevCountRef = React116.useRef(0);
   React116.useEffect(() => {
@@ -38406,19 +38406,18 @@ function ServerBridgeProvider({
         error: result.error
       };
       if (result.success) {
-        if (result.clientEffects) {
-          for (const effect of result.clientEffects) {
-            const arr = effect;
-            const effectType = arr[0];
-            if (effectType === "render-ui") {
-              const slot = arr[1];
-              const pattern = arr[2];
-              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") {
-              effects.push({ type: "notify", message: arr[1] });
-            }
+        const tagged = result.clientEffectsByTrait;
+        const tuples = tagged ? tagged.map((entry) => ({ effect: entry.effect, traitName: entry.traitName })) : (result.clientEffects ?? []).map((eff) => ({ effect: eff }));
+        for (const { effect, traitName } of tuples) {
+          const effectType = effect[0];
+          if (effectType === "render-ui") {
+            const slot = effect[1];
+            const pattern = effect[2];
+            effects.push({ type: "render-ui", slot, pattern: pattern ?? void 0, traitName });
+          } else if (effectType === "navigate") {
+            effects.push({ type: "navigate", route: effect[1], params: effect[2], traitName });
+          } else if (effectType === "notify") {
+            effects.push({ type: "notify", message: effect[1], traitName });
           }
         }
         if (result.emittedEvents) {
@@ -38583,9 +38582,30 @@ function SlotBridge() {
   }, [slots, render, clear]);
   return null;
 }
+function applyServerEffects(effects, uiSlots, onNavigate) {
+  for (const eff of effects) {
+    if (eff.type === "render-ui" && eff.slot && eff.pattern) {
+      const patternRecord = eff.pattern;
+      const { type: patternType, children, ...inlineProps } = patternRecord;
+      const normalizedChildren = Array.isArray(children) ? children.map((c) => normalizeChild(c)) : children;
+      uiSlots.render({
+        target: eff.slot,
+        pattern: patternType,
+        props: {
+          ...inlineProps,
+          ...normalizedChildren !== void 0 ? { children: normalizedChildren } : {}
+        },
+        sourceTrait: eff.traitName ?? "server"
+      });
+    } else if (eff.type === "navigate" && eff.route && onNavigate) {
+      onNavigate(eff.route, eff.params);
+    }
+  }
+}
 function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFallback }) {
   const slotsActions = useSlotsActions();
   const bridge = useServerBridge();
+  const uiSlots = useUISlots();
   const entityStore = useEntityStore();
   const onEventProcessed = useCallback(async (event, payload) => {
     if (!bridge.connected || !orbitalNames?.length) return;
@@ -38600,19 +38620,9 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
           }
         }
       }
-      for (const eff of effects) {
-        if (eff.type === "render-ui" && eff.slot && eff.pattern) {
-          slotsActions.setSlotPatterns(
-            eff.slot,
-            [{ pattern: eff.pattern, props: {} }],
-            { trait: "server", state: "server", transition: "server-effect" }
-          );
-        } else if (eff.type === "navigate" && eff.route && onNavigate) {
-          onNavigate(eff.route, eff.params);
-        }
-      }
+      applyServerEffects(effects, uiSlots, onNavigate);
     }
-  }, [bridge.connected, bridge.sendEvent, orbitalNames, slotsActions, onNavigate, entityStore]);
+  }, [bridge.connected, bridge.sendEvent, orbitalNames, uiSlots, onNavigate, entityStore]);
   const opts = orbitalNames ? { onEventProcessed, navigate: onNavigate } : { navigate: onNavigate };
   const { sendEvent } = useTraitStateMachine(traits2, slotsActions, opts);
   const initSentRef = useRef(false);
@@ -38660,18 +38670,10 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
             }
           }
         }
-        for (const eff of effects) {
-          if (eff.type === "render-ui" && eff.slot && eff.pattern) {
-            slotsActions.setSlotPatterns(
-              eff.slot,
-              [{ pattern: eff.pattern, props: {} }],
-              { trait: "server", state: "server", transition: "server-effect" }
-            );
-          }
-        }
+        applyServerEffects(effects, uiSlots, onNavigate);
       }
     })();
-  }, [bridge.connected, orbitalNames, bridge.sendEvent, slotsActions]);
+  }, [bridge.connected, orbitalNames, bridge.sendEvent, uiSlots, onNavigate]);
   return null;
 }
 function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate, onLocalFallback }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "2.60.2",
+  "version": "2.60.4",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "main": "./dist/components/index.js",
@@ -121,19 +121,19 @@
     "@almadar/core": ">=4.8.2",
     "@almadar/evaluator": ">=2.8.1",
     "@almadar/patterns": ">=2.14.1",
+    "@almadar/runtime": ">=3.2.6",
     "@almadar/std": ">=6.4.1",
     "@almadar/syntax": ">=1.3.1",
-    "@almadar/runtime": ">=3.2.2",
     "@xyflow/react": "12.10.1",
     "clsx": "^2.1.0",
     "elkjs": "0.11.1",
+    "hastscript": "^9.0.0",
     "leaflet": "1.9.4",
     "lucide-react": "^0.344.0",
+    "parse-entities": "^4.0.0",
     "react-leaflet": "^4.2.1",
     "react-markdown": "^9.0.0",
     "react-syntax-highlighter": "^16.1.0",
-    "hastscript": "^9.0.0",
-    "parse-entities": "^4.0.0",
     "refractor": "^5.0.0",
     "rehype-katex": "^7.0.0",
     "remark-gfm": "^4.0.0",