@almadar/ui 4.6.2 → 4.6.4

package/dist/avl/index.cjs

@@ -4094,6 +4094,7 @@ var init_ThemeContext = __esm({
 });
 function EntitySchemaProvider({
   entities,
+  traitLinkedEntities,
   children
 }) {
   const entitiesMap = React126.useMemo(() => {
@@ -4103,11 +4104,15 @@ function EntitySchemaProvider({
     }
     return map;
   }, [entities]);
+  const linkedMap = React126.useMemo(() => {
+    return traitLinkedEntities ?? /* @__PURE__ */ new Map();
+  }, [traitLinkedEntities]);
   const contextValue = React126.useMemo(
     () => ({
-      entities: entitiesMap
+      entities: entitiesMap,
+      traitLinkedEntities: linkedMap
     }),
-    [entitiesMap]
+    [entitiesMap, linkedMap]
   );
   return /* @__PURE__ */ jsxRuntime.jsx(EntitySchemaContext.Provider, { value: contextValue, children });
 }
@@ -31748,6 +31753,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluator.evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -31893,9 +31908,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React126__namespace.default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -31932,11 +31950,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React126__namespace.default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React126__namespace.default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;
@@ -46685,7 +46702,7 @@ function getToastPosition(position) {
       return "top-4 right-4";
   }
 }
-function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root") {
+function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root", sourceTrait) {
   if (!children || !Array.isArray(children) || children.length === 0) {
     return null;
   }
@@ -46712,7 +46729,11 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       pattern: child.type,
       props: resolvedProps,
       priority: 0,
-      nodeId: child._id
+      nodeId: child._id,
+      // Inherit sourceTrait from the parent slot so nested patterns
+      // (e.g. form-section inside a stack) can resolve entityDef via
+      // the trait's linkedEntity for form-field enrichment.
+      ...sourceTrait !== void 0 && { sourceTrait }
     };
     return /* @__PURE__ */ jsxRuntime.jsx(
       SlotContentRenderer,
@@ -46763,13 +46784,21 @@ function SlotContentRenderer({
     }
   }
   const schemaCtx = useEntitySchemaOptional();
-  const entityDef = typeof entityProp === "string" && entityProp.length > 0 && schemaCtx ? schemaCtx.entities.get(entityProp) : void 0;
+  let entityDef;
+  if (typeof entityProp === "string" && entityProp.length > 0 && schemaCtx) {
+    entityDef = schemaCtx.entities.get(entityProp);
+  } else if (schemaCtx && content.sourceTrait !== void 0) {
+    const linkedEntity = schemaCtx.traitLinkedEntities.get(content.sourceTrait);
+    if (linkedEntity !== void 0) {
+      entityDef = schemaCtx.entities.get(linkedEntity);
+    }
+  }
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0;
     const myPath = patternPath ?? "root";
-    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath) : void 0;
+    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
     const finalProps = renderedProps;
@@ -52250,20 +52279,39 @@ function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate, onLoc
     if (!orbitals) return [];
     return orbitals.filter((o) => typeof o.name === "string").map((o) => o.name);
   }, [schema]);
-  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,
-        onLocalFallback,
-        persistence
-      }
-    ),
-    /* @__PURE__ */ jsxRuntime.jsx(SlotBridge, {}),
-    /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "h-full p-4", children: /* @__PURE__ */ jsxRuntime.jsx(UISlotRenderer, { includeHud: true, hudMode: "inline", includeFloating: true }) })
-  ] }) }) });
+  const inner = /* @__PURE__ */ jsxRuntime.jsx(VerificationProvider, { enabled: true, children: /* @__PURE__ */ jsxRuntime.jsx(SlotsProvider, { children: /* @__PURE__ */ jsxRuntime.jsxs(
+    EntitySchemaProvider,
+    {
+      entities: Array.from(allEntities.values()),
+      traitLinkedEntities: (() => {
+        const map = /* @__PURE__ */ new Map();
+        if (ir) {
+          for (const page of ir.pages.values()) {
+            for (const binding of page.traits) {
+              if (binding.linkedEntity) {
+                map.set(binding.trait.name, binding.linkedEntity);
+              }
+            }
+          }
+        }
+        return map;
+      })(),
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          TraitInitializer,
+          {
+            traits: allPageTraits,
+            orbitalNames: serverUrl ? orbitalNames : void 0,
+            onNavigate,
+            onLocalFallback,
+            persistence
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx(SlotBridge, {}),
+        /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "h-full p-4", children: /* @__PURE__ */ jsxRuntime.jsx(UISlotRenderer, { includeHud: true, hudMode: "inline", includeFloating: true }) })
+      ]
+    }
+  ) }) });
   if (serverUrl) {
     return /* @__PURE__ */ jsxRuntime.jsx(ServerBridgeProvider, { schema, serverUrl, children: inner });
   }

package/dist/avl/index.js

@@ -4048,6 +4048,7 @@ var init_ThemeContext = __esm({
 });
 function EntitySchemaProvider({
   entities,
+  traitLinkedEntities,
   children
 }) {
   const entitiesMap = useMemo(() => {
@@ -4057,11 +4058,15 @@ function EntitySchemaProvider({
     }
     return map;
   }, [entities]);
+  const linkedMap = useMemo(() => {
+    return traitLinkedEntities ?? /* @__PURE__ */ new Map();
+  }, [traitLinkedEntities]);
   const contextValue = useMemo(
     () => ({
-      entities: entitiesMap
+      entities: entitiesMap,
+      traitLinkedEntities: linkedMap
     }),
-    [entitiesMap]
+    [entitiesMap, linkedMap]
   );
   return /* @__PURE__ */ jsx(EntitySchemaContext.Provider, { value: contextValue, children });
 }
@@ -31702,6 +31707,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -31847,9 +31862,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React126__default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -31886,11 +31904,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React126__default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React126__default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;
@@ -46639,7 +46656,7 @@ function getToastPosition(position) {
       return "top-4 right-4";
   }
 }
-function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root") {
+function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root", sourceTrait) {
   if (!children || !Array.isArray(children) || children.length === 0) {
     return null;
   }
@@ -46666,7 +46683,11 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       pattern: child.type,
       props: resolvedProps,
       priority: 0,
-      nodeId: child._id
+      nodeId: child._id,
+      // Inherit sourceTrait from the parent slot so nested patterns
+      // (e.g. form-section inside a stack) can resolve entityDef via
+      // the trait's linkedEntity for form-field enrichment.
+      ...sourceTrait !== void 0 && { sourceTrait }
     };
     return /* @__PURE__ */ jsx(
       SlotContentRenderer,
@@ -46717,13 +46738,21 @@ function SlotContentRenderer({
     }
   }
   const schemaCtx = useEntitySchemaOptional();
-  const entityDef = typeof entityProp === "string" && entityProp.length > 0 && schemaCtx ? schemaCtx.entities.get(entityProp) : void 0;
+  let entityDef;
+  if (typeof entityProp === "string" && entityProp.length > 0 && schemaCtx) {
+    entityDef = schemaCtx.entities.get(entityProp);
+  } else if (schemaCtx && content.sourceTrait !== void 0) {
+    const linkedEntity = schemaCtx.traitLinkedEntities.get(content.sourceTrait);
+    if (linkedEntity !== void 0) {
+      entityDef = schemaCtx.entities.get(linkedEntity);
+    }
+  }
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0;
     const myPath = patternPath ?? "root";
-    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath) : void 0;
+    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
     const finalProps = renderedProps;
@@ -52204,20 +52233,39 @@ function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate, onLoc
     if (!orbitals) return [];
     return orbitals.filter((o) => typeof o.name === "string").map((o) => o.name);
   }, [schema]);
-  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,
-        onLocalFallback,
-        persistence
-      }
-    ),
-    /* @__PURE__ */ jsx(SlotBridge, {}),
-    /* @__PURE__ */ jsx(Box, { className: "h-full p-4", children: /* @__PURE__ */ jsx(UISlotRenderer, { includeHud: true, hudMode: "inline", includeFloating: true }) })
-  ] }) }) });
+  const inner = /* @__PURE__ */ jsx(VerificationProvider, { enabled: true, children: /* @__PURE__ */ jsx(SlotsProvider, { children: /* @__PURE__ */ jsxs(
+    EntitySchemaProvider,
+    {
+      entities: Array.from(allEntities.values()),
+      traitLinkedEntities: (() => {
+        const map = /* @__PURE__ */ new Map();
+        if (ir) {
+          for (const page of ir.pages.values()) {
+            for (const binding of page.traits) {
+              if (binding.linkedEntity) {
+                map.set(binding.trait.name, binding.linkedEntity);
+              }
+            }
+          }
+        }
+        return map;
+      })(),
+      children: [
+        /* @__PURE__ */ jsx(
+          TraitInitializer,
+          {
+            traits: allPageTraits,
+            orbitalNames: serverUrl ? orbitalNames : void 0,
+            onNavigate,
+            onLocalFallback,
+            persistence
+          }
+        ),
+        /* @__PURE__ */ jsx(SlotBridge, {}),
+        /* @__PURE__ */ jsx(Box, { className: "h-full p-4", children: /* @__PURE__ */ jsx(UISlotRenderer, { includeHud: true, hudMode: "inline", includeFloating: true }) })
+      ]
+    }
+  ) }) });
   if (serverUrl) {
     return /* @__PURE__ */ jsx(ServerBridgeProvider, { schema, serverUrl, children: inner });
   }

package/dist/components/index.cjs

@@ -27641,6 +27641,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluator.evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -27786,9 +27796,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React110__namespace.default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -27825,11 +27838,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React110__namespace.default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React110__namespace.default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;
@@ -37531,7 +37543,7 @@ function getToastPosition(position) {
       return "top-4 right-4";
   }
 }
-function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root") {
+function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root", sourceTrait) {
   if (!children || !Array.isArray(children) || children.length === 0) {
     return null;
   }
@@ -37558,7 +37570,11 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       pattern: child.type,
       props: resolvedProps,
       priority: 0,
-      nodeId: child._id
+      nodeId: child._id,
+      // Inherit sourceTrait from the parent slot so nested patterns
+      // (e.g. form-section inside a stack) can resolve entityDef via
+      // the trait's linkedEntity for form-field enrichment.
+      ...sourceTrait !== void 0 && { sourceTrait }
     };
     return /* @__PURE__ */ jsxRuntime.jsx(
       SlotContentRenderer,
@@ -37609,13 +37625,21 @@ function SlotContentRenderer({
     }
   }
   const schemaCtx = useEntitySchemaOptional();
-  const entityDef = typeof entityProp === "string" && entityProp.length > 0 && schemaCtx ? schemaCtx.entities.get(entityProp) : void 0;
+  let entityDef;
+  if (typeof entityProp === "string" && entityProp.length > 0 && schemaCtx) {
+    entityDef = schemaCtx.entities.get(entityProp);
+  } else if (schemaCtx && content.sourceTrait !== void 0) {
+    const linkedEntity = schemaCtx.traitLinkedEntities.get(content.sourceTrait);
+    if (linkedEntity !== void 0) {
+      entityDef = schemaCtx.entities.get(linkedEntity);
+    }
+  }
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0;
     const myPath = patternPath ?? "root";
-    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath) : void 0;
+    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
     const finalProps = renderedProps;

package/dist/components/index.js

@@ -27596,6 +27596,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -27741,9 +27751,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React110__default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -27780,11 +27793,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React110__default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React110__default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;
@@ -37486,7 +37498,7 @@ function getToastPosition(position) {
       return "top-4 right-4";
   }
 }
-function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root") {
+function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root", sourceTrait) {
   if (!children || !Array.isArray(children) || children.length === 0) {
     return null;
   }
@@ -37513,7 +37525,11 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       pattern: child.type,
       props: resolvedProps,
       priority: 0,
-      nodeId: child._id
+      nodeId: child._id,
+      // Inherit sourceTrait from the parent slot so nested patterns
+      // (e.g. form-section inside a stack) can resolve entityDef via
+      // the trait's linkedEntity for form-field enrichment.
+      ...sourceTrait !== void 0 && { sourceTrait }
     };
     return /* @__PURE__ */ jsx(
       SlotContentRenderer,
@@ -37564,13 +37580,21 @@ function SlotContentRenderer({
     }
   }
   const schemaCtx = useEntitySchemaOptional();
-  const entityDef = typeof entityProp === "string" && entityProp.length > 0 && schemaCtx ? schemaCtx.entities.get(entityProp) : void 0;
+  let entityDef;
+  if (typeof entityProp === "string" && entityProp.length > 0 && schemaCtx) {
+    entityDef = schemaCtx.entities.get(entityProp);
+  } else if (schemaCtx && content.sourceTrait !== void 0) {
+    const linkedEntity = schemaCtx.traitLinkedEntities.get(content.sourceTrait);
+    if (linkedEntity !== void 0) {
+      entityDef = schemaCtx.entities.get(linkedEntity);
+    }
+  }
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0;
     const myPath = patternPath ?? "root";
-    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath) : void 0;
+    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
     const finalProps = renderedProps;

package/dist/providers/index.cjs

@@ -28588,6 +28588,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluator.evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -28733,9 +28743,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React115__namespace.default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -28772,11 +28785,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React115__namespace.default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React115__namespace.default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;
@@ -38040,7 +38052,7 @@ function getToastPosition(position) {
       return "top-4 right-4";
   }
 }
-function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root") {
+function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root", sourceTrait) {
   if (!children || !Array.isArray(children) || children.length === 0) {
     return null;
   }
@@ -38067,7 +38079,11 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       pattern: child.type,
       props: resolvedProps,
       priority: 0,
-      nodeId: child._id
+      nodeId: child._id,
+      // Inherit sourceTrait from the parent slot so nested patterns
+      // (e.g. form-section inside a stack) can resolve entityDef via
+      // the trait's linkedEntity for form-field enrichment.
+      ...sourceTrait !== void 0 && { sourceTrait }
     };
     return /* @__PURE__ */ jsxRuntime.jsx(
       SlotContentRenderer,
@@ -38118,13 +38134,21 @@ function SlotContentRenderer({
     }
   }
   const schemaCtx = useEntitySchemaOptional();
-  const entityDef = typeof entityProp === "string" && entityProp.length > 0 && schemaCtx ? schemaCtx.entities.get(entityProp) : void 0;
+  let entityDef;
+  if (typeof entityProp === "string" && entityProp.length > 0 && schemaCtx) {
+    entityDef = schemaCtx.entities.get(entityProp);
+  } else if (schemaCtx && content.sourceTrait !== void 0) {
+    const linkedEntity = schemaCtx.traitLinkedEntities.get(content.sourceTrait);
+    if (linkedEntity !== void 0) {
+      entityDef = schemaCtx.entities.get(linkedEntity);
+    }
+  }
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0;
     const myPath = patternPath ?? "root";
-    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath) : void 0;
+    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
     const finalProps = renderedProps;

package/dist/providers/index.js

@@ -28543,6 +28543,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -28688,9 +28698,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React115__default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -28727,11 +28740,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React115__default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React115__default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;
@@ -37995,7 +38007,7 @@ function getToastPosition(position) {
       return "top-4 right-4";
   }
 }
-function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root") {
+function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root", sourceTrait) {
   if (!children || !Array.isArray(children) || children.length === 0) {
     return null;
   }
@@ -38022,7 +38034,11 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       pattern: child.type,
       props: resolvedProps,
       priority: 0,
-      nodeId: child._id
+      nodeId: child._id,
+      // Inherit sourceTrait from the parent slot so nested patterns
+      // (e.g. form-section inside a stack) can resolve entityDef via
+      // the trait's linkedEntity for form-field enrichment.
+      ...sourceTrait !== void 0 && { sourceTrait }
     };
     return /* @__PURE__ */ jsx(
       SlotContentRenderer,
@@ -38073,13 +38089,21 @@ function SlotContentRenderer({
     }
   }
   const schemaCtx = useEntitySchemaOptional();
-  const entityDef = typeof entityProp === "string" && entityProp.length > 0 && schemaCtx ? schemaCtx.entities.get(entityProp) : void 0;
+  let entityDef;
+  if (typeof entityProp === "string" && entityProp.length > 0 && schemaCtx) {
+    entityDef = schemaCtx.entities.get(entityProp);
+  } else if (schemaCtx && content.sourceTrait !== void 0) {
+    const linkedEntity = schemaCtx.traitLinkedEntities.get(content.sourceTrait);
+    if (linkedEntity !== void 0) {
+      entityDef = schemaCtx.entities.get(linkedEntity);
+    }
+  }
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0;
     const myPath = patternPath ?? "root";
-    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath) : void 0;
+    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
     const finalProps = renderedProps;

package/dist/runtime/EntitySchemaContext.d.ts

@@ -15,10 +15,31 @@ import type { ResolvedEntity } from '@almadar/core';
 export interface EntitySchemaContextValue {
     /** Entity definitions (schema metadata only) */
     entities: Map<string, ResolvedEntity>;
+    /**
+     * Per-trait linkedEntity name. `ResolvedTrait` itself doesn't carry
+     * linkedEntity (it lives on `ResolvedTraitBinding` at the page-binding
+     * level), so OrbPreview pre-projects every page's trait bindings into
+     * a flat `traitName → entityName` map for the slot renderer.
+     *
+     * Used by SlotContentRenderer to resolve `entityDef` via
+     * `traitLinkedEntities.get(sourceTrait) → entities.get(...)` when the
+     * rendered pattern's `entity:` prop is a resolved value (V2 path)
+     * rather than a string entity-name. Without this lookup, form-section
+     * can't enrich its fields with entity field metadata (values enum,
+     * etc.) and an enum field renders as a plain text input. Closes VR3.
+     */
+    traitLinkedEntities: ReadonlyMap<string, string>;
 }
 export interface EntitySchemaProviderProps {
     /** Entity definitions from resolved schema */
     entities: ResolvedEntity[];
+    /**
+     * Per-trait linkedEntity name, projected from every page's
+     * ResolvedTraitBinding. Optional for back-compat; when omitted,
+     * SlotContentRenderer's enrichment path can only follow the
+     * legacy V1 string-entity-name lookup.
+     */
+    traitLinkedEntities?: ReadonlyMap<string, string>;
     /** Children */
     children: React.ReactNode;
 }
@@ -29,7 +50,7 @@ export interface EntitySchemaProviderProps {
  * Actual entity rows arrive via `@payload.data` on the rendering trait's
  * success transition — they do NOT live in this context.
  */
-export declare function EntitySchemaProvider({ entities, children, }: EntitySchemaProviderProps): React.ReactElement;
+export declare function EntitySchemaProvider({ entities, traitLinkedEntities, children, }: EntitySchemaProviderProps): React.ReactElement;
 /**
  * Access entity schema definitions.
  * Use this for field metadata (form building, filter enrichment).

package/dist/runtime/index.cjs

@@ -784,6 +784,7 @@ var init_usePullToRefresh = __esm({
 });
 function EntitySchemaProvider({
   entities,
+  traitLinkedEntities,
   children
 }) {
   const entitiesMap = React115.useMemo(() => {
@@ -793,11 +794,15 @@ function EntitySchemaProvider({
     }
     return map;
   }, [entities]);
+  const linkedMap = React115.useMemo(() => {
+    return traitLinkedEntities ?? /* @__PURE__ */ new Map();
+  }, [traitLinkedEntities]);
   const contextValue = React115.useMemo(
     () => ({
-      entities: entitiesMap
+      entities: entitiesMap,
+      traitLinkedEntities: linkedMap
     }),
-    [entitiesMap]
+    [entitiesMap, linkedMap]
   );
   return /* @__PURE__ */ jsxRuntime.jsx(EntitySchemaContext.Provider, { value: contextValue, children });
 }
@@ -28190,6 +28195,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluator.evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -28335,9 +28350,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React115__namespace.default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -28374,11 +28392,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React115__namespace.default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React115__namespace.default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;
@@ -37626,7 +37643,7 @@ function getToastPosition(position) {
       return "top-4 right-4";
   }
 }
-function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root") {
+function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root", sourceTrait) {
   if (!children || !Array.isArray(children) || children.length === 0) {
     return null;
   }
@@ -37653,7 +37670,11 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       pattern: child.type,
       props: resolvedProps,
       priority: 0,
-      nodeId: child._id
+      nodeId: child._id,
+      // Inherit sourceTrait from the parent slot so nested patterns
+      // (e.g. form-section inside a stack) can resolve entityDef via
+      // the trait's linkedEntity for form-field enrichment.
+      ...sourceTrait !== void 0 && { sourceTrait }
     };
     return /* @__PURE__ */ jsxRuntime.jsx(
       SlotContentRenderer,
@@ -37704,13 +37725,21 @@ function SlotContentRenderer({
     }
   }
   const schemaCtx = useEntitySchemaOptional();
-  const entityDef = typeof entityProp === "string" && entityProp.length > 0 && schemaCtx ? schemaCtx.entities.get(entityProp) : void 0;
+  let entityDef;
+  if (typeof entityProp === "string" && entityProp.length > 0 && schemaCtx) {
+    entityDef = schemaCtx.entities.get(entityProp);
+  } else if (schemaCtx && content.sourceTrait !== void 0) {
+    const linkedEntity = schemaCtx.traitLinkedEntities.get(content.sourceTrait);
+    if (linkedEntity !== void 0) {
+      entityDef = schemaCtx.entities.get(linkedEntity);
+    }
+  }
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0;
     const myPath = patternPath ?? "root";
-    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath) : void 0;
+    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
     const finalProps = renderedProps;
@@ -39090,20 +39119,39 @@ function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate, onLoc
     if (!orbitals) return [];
     return orbitals.filter((o) => typeof o.name === "string").map((o) => o.name);
   }, [schema]);
-  const inner = /* @__PURE__ */ jsxRuntime.jsx(providers.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,
-        onLocalFallback,
-        persistence
-      }
-    ),
-    /* @__PURE__ */ jsxRuntime.jsx(SlotBridge, {}),
-    /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "h-full p-4", children: /* @__PURE__ */ jsxRuntime.jsx(UISlotRenderer, { includeHud: true, hudMode: "inline", includeFloating: true }) })
-  ] }) }) });
+  const inner = /* @__PURE__ */ jsxRuntime.jsx(providers.VerificationProvider, { enabled: true, children: /* @__PURE__ */ jsxRuntime.jsx(SlotsProvider, { children: /* @__PURE__ */ jsxRuntime.jsxs(
+    EntitySchemaProvider,
+    {
+      entities: Array.from(allEntities.values()),
+      traitLinkedEntities: (() => {
+        const map = /* @__PURE__ */ new Map();
+        if (ir) {
+          for (const page of ir.pages.values()) {
+            for (const binding of page.traits) {
+              if (binding.linkedEntity) {
+                map.set(binding.trait.name, binding.linkedEntity);
+              }
+            }
+          }
+        }
+        return map;
+      })(),
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx(
+          TraitInitializer,
+          {
+            traits: allPageTraits,
+            orbitalNames: serverUrl ? orbitalNames : void 0,
+            onNavigate,
+            onLocalFallback,
+            persistence
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsx(SlotBridge, {}),
+        /* @__PURE__ */ jsxRuntime.jsx(Box, { className: "h-full p-4", children: /* @__PURE__ */ jsxRuntime.jsx(UISlotRenderer, { includeHud: true, hudMode: "inline", includeFloating: true }) })
+      ]
+    }
+  ) }) });
   if (serverUrl) {
     return /* @__PURE__ */ jsxRuntime.jsx(ServerBridgeProvider, { schema, serverUrl, children: inner });
   }

package/dist/runtime/index.js

@@ -739,6 +739,7 @@ var init_usePullToRefresh = __esm({
 });
 function EntitySchemaProvider({
   entities,
+  traitLinkedEntities,
   children
 }) {
   const entitiesMap = useMemo(() => {
@@ -748,11 +749,15 @@ function EntitySchemaProvider({
     }
     return map;
   }, [entities]);
+  const linkedMap = useMemo(() => {
+    return traitLinkedEntities ?? /* @__PURE__ */ new Map();
+  }, [traitLinkedEntities]);
   const contextValue = useMemo(
     () => ({
-      entities: entitiesMap
+      entities: entitiesMap,
+      traitLinkedEntities: linkedMap
     }),
-    [entitiesMap]
+    [entitiesMap, linkedMap]
   );
   return /* @__PURE__ */ jsx(EntitySchemaContext.Provider, { value: contextValue, children });
 }
@@ -28145,6 +28150,16 @@ function evaluateFormExpression(expr, formCtx) {
   const ctx = toSharedContext2(formCtx);
   return evaluate(expr, ctx);
 }
+function isOrbitalEntitySchema(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return Array.isArray(fields);
+}
+function isPlainEntityRow(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return false;
+  const fields = value.fields;
+  return !Array.isArray(fields);
+}
 function getEnumOptions(field) {
   if (field.options && field.options.length > 0) {
     return [...field.options];
@@ -28290,9 +28305,12 @@ var init_Form = __esm({
       const { t } = useTranslate();
       const resolvedSubmitLabel = submitLabel ?? t("common.save");
       const resolvedCancelLabel = cancelLabel ?? t("common.cancel");
-      const normalizedInitialData = initialData ?? {};
-      const resolvedEntity = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
+      const isSchemaEntity = isOrbitalEntitySchema(entity);
+      const resolvedEntity = isSchemaEntity ? entity : void 0;
       const entityName = typeof entity === "string" ? entity : resolvedEntity?.name;
+      const entityRowAsInitial = isPlainEntityRow(entity) ? entity : void 0;
+      const callerInitial = initialData !== null && typeof initialData === "object" && !Array.isArray(initialData) ? initialData : {};
+      const normalizedInitialData = entityRowAsInitial !== void 0 ? { ...entityRowAsInitial, ...callerInitial } : callerInitial;
       const entityDerivedFields = React115__default.useMemo(() => {
         if (fields && fields.length > 0) return void 0;
         if (!resolvedEntity) return void 0;
@@ -28329,11 +28347,10 @@ var init_Form = __esm({
         [formData, externalContext]
       );
       React115__default.useEffect(() => {
-        const data = initialData;
-        if (data && Object.keys(data).length > 0) {
-          setFormData(data);
+        if (Object.keys(normalizedInitialData).length > 0) {
+          setFormData(normalizedInitialData);
         }
-      }, [initialData]);
+      }, [normalizedInitialData]);
       const processCalculations = React115__default.useCallback(
         (changedFieldId, newFormData) => {
           if (!hiddenCalculations.length) return;
@@ -37581,7 +37598,7 @@ function getToastPosition(position) {
       return "top-4 right-4";
   }
 }
-function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root") {
+function renderPatternChildren(children, onDismiss, parentId = "root", parentPath = "root", sourceTrait) {
   if (!children || !Array.isArray(children) || children.length === 0) {
     return null;
   }
@@ -37608,7 +37625,11 @@ function renderPatternChildren(children, onDismiss, parentId = "root", parentPat
       pattern: child.type,
       props: resolvedProps,
       priority: 0,
-      nodeId: child._id
+      nodeId: child._id,
+      // Inherit sourceTrait from the parent slot so nested patterns
+      // (e.g. form-section inside a stack) can resolve entityDef via
+      // the trait's linkedEntity for form-field enrichment.
+      ...sourceTrait !== void 0 && { sourceTrait }
     };
     return /* @__PURE__ */ jsx(
       SlotContentRenderer,
@@ -37659,13 +37680,21 @@ function SlotContentRenderer({
     }
   }
   const schemaCtx = useEntitySchemaOptional();
-  const entityDef = typeof entityProp === "string" && entityProp.length > 0 && schemaCtx ? schemaCtx.entities.get(entityProp) : void 0;
+  let entityDef;
+  if (typeof entityProp === "string" && entityProp.length > 0 && schemaCtx) {
+    entityDef = schemaCtx.entities.get(entityProp);
+  } else if (schemaCtx && content.sourceTrait !== void 0) {
+    const linkedEntity = schemaCtx.traitLinkedEntities.get(content.sourceTrait);
+    if (linkedEntity !== void 0) {
+      entityDef = schemaCtx.entities.get(linkedEntity);
+    }
+  }
   const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
     const hasChildren = PATTERNS_WITH_CHILDREN.has(content.pattern) || Array.isArray(childrenConfig) && childrenConfig.length > 0;
     const myPath = patternPath ?? "root";
-    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath) : void 0;
+    const renderedChildren = hasChildren ? renderPatternChildren(childrenConfig, onDismiss, content.id, myPath, content.sourceTrait) : void 0;
     const { children: _childrenConfig, ...restProps } = content.props;
     const renderedProps = renderPatternProps(restProps, onDismiss);
     const finalProps = renderedProps;
@@ -39045,20 +39074,39 @@ function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate, onLoc
     if (!orbitals) return [];
     return orbitals.filter((o) => typeof o.name === "string").map((o) => o.name);
   }, [schema]);
-  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,
-        onLocalFallback,
-        persistence
-      }
-    ),
-    /* @__PURE__ */ jsx(SlotBridge, {}),
-    /* @__PURE__ */ jsx(Box, { className: "h-full p-4", children: /* @__PURE__ */ jsx(UISlotRenderer, { includeHud: true, hudMode: "inline", includeFloating: true }) })
-  ] }) }) });
+  const inner = /* @__PURE__ */ jsx(VerificationProvider, { enabled: true, children: /* @__PURE__ */ jsx(SlotsProvider, { children: /* @__PURE__ */ jsxs(
+    EntitySchemaProvider,
+    {
+      entities: Array.from(allEntities.values()),
+      traitLinkedEntities: (() => {
+        const map = /* @__PURE__ */ new Map();
+        if (ir) {
+          for (const page of ir.pages.values()) {
+            for (const binding of page.traits) {
+              if (binding.linkedEntity) {
+                map.set(binding.trait.name, binding.linkedEntity);
+              }
+            }
+          }
+        }
+        return map;
+      })(),
+      children: [
+        /* @__PURE__ */ jsx(
+          TraitInitializer,
+          {
+            traits: allPageTraits,
+            orbitalNames: serverUrl ? orbitalNames : void 0,
+            onNavigate,
+            onLocalFallback,
+            persistence
+          }
+        ),
+        /* @__PURE__ */ jsx(SlotBridge, {}),
+        /* @__PURE__ */ jsx(Box, { className: "h-full p-4", children: /* @__PURE__ */ jsx(UISlotRenderer, { includeHud: true, hudMode: "inline", includeFloating: true }) })
+      ]
+    }
+  ) }) });
   if (serverUrl) {
     return /* @__PURE__ */ jsx(ServerBridgeProvider, { schema, serverUrl, children: inner });
   }

package/package.json

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