@almadar/ui 5.112.0 → 5.114.0

package/dist/runtime/index.cjs

@@ -11,6 +11,7 @@ var reactDom = require('react-dom');
 var hooks = require('@almadar/ui/hooks');
 var context = require('@almadar/ui/context');
 var evaluator = require('@almadar/evaluator');
+var ui = require('@almadar/runtime/ui');
 var reactRouterDom = require('react-router-dom');
 var ELK = require('elkjs/lib/elk.bundled.js');
 var SyntaxHighlighter = require('react-syntax-highlighter/dist/esm/prism-light.js');
@@ -43,6 +44,7 @@ var utilities = require('@dnd-kit/utilities');
 var react = require('@xyflow/react');
 var patterns = require('@almadar/core/patterns');
 var runtime = require('@almadar/runtime');
+var registry = require('@almadar/std/registry');
 var OrbitalServerRuntime = require('@almadar/runtime/OrbitalServerRuntime');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -1062,41 +1064,6 @@ function kebabToPascal(name) {
     return part.charAt(0).toUpperCase() + part.slice(1);
   }).join("");
 }
-function loadLib(key, importer) {
-  let p = libPromises.get(key);
-  if (!p) {
-    p = importer();
-    libPromises.set(key, p);
-  }
-  return p;
-}
-function lazyFamilyIcon(libKey, importer, pick, fallbackName, family) {
-  const Lazy = React81__namespace.default.lazy(async () => {
-    const lib = await loadLib(libKey, importer);
-    const Comp = pick(lib);
-    if (!Comp) {
-      warnFallback(fallbackName, family);
-      return { default: makeLucideAdapter(fallbackName, true) };
-    }
-    return { default: Comp };
-  });
-  const Wrapped = (props) => /* @__PURE__ */ jsxRuntime.jsx(
-    React81__namespace.default.Suspense,
-    {
-      fallback: /* @__PURE__ */ jsxRuntime.jsx(
-        "span",
-        {
-          "aria-hidden": true,
-          className: props.className,
-          style: { display: "inline-block", ...props.style }
-        }
-      ),
-      children: /* @__PURE__ */ jsxRuntime.jsx(Lazy, { ...props })
-    }
-  );
-  Wrapped.displayName = `Lazy.${libKey}.${fallbackName}`;
-  return Wrapped;
-}
 function isComponentLike(v) {
   return v != null && (typeof v === "function" || typeof v === "object");
 }
@@ -1110,146 +1077,32 @@ function resolveLucide(name) {
   if (isComponentLike(asIs)) return asIs;
   return LucideIcons2__namespace.HelpCircle;
 }
-function resolvePhosphor(name, weight, family) {
-  const target = phosphorAliases[name] ?? kebabToPascal(name);
-  return lazyFamilyIcon(
-    "phosphor",
-    () => import('@phosphor-icons/react'),
-    (lib) => {
-      const PhosphorComp = lib[target];
-      if (!PhosphorComp) return null;
-      const Component = PhosphorComp;
-      const Adapter = (props) => /* @__PURE__ */ jsxRuntime.jsx(
-        Component,
-        {
-          weight,
-          className: props.className,
-          style: props.style,
-          size: props.size ?? "1em"
-        }
-      );
-      Adapter.displayName = `Phosphor.${target}.${weight}`;
-      return Adapter;
-    },
-    name,
-    family
-  );
-}
-function resolveTabler(name, family) {
-  const suffix = tablerAliases[name] ?? kebabToPascal(name);
-  const target = `Icon${suffix}`;
-  return lazyFamilyIcon(
-    "tabler",
-    () => import('@tabler/icons-react'),
-    (lib) => {
-      const TablerComp = lib[target];
-      if (!TablerComp) return null;
-      const Component = TablerComp;
-      const Adapter = (props) => /* @__PURE__ */ jsxRuntime.jsx(
-        Component,
-        {
-          stroke: props.strokeWidth ?? 1.5,
-          className: props.className,
-          style: props.style,
-          size: props.size ?? 24
-        }
-      );
-      Adapter.displayName = `Tabler.${target}`;
-      return Adapter;
-    },
-    name,
-    family
-  );
-}
-function resolveFa(name, family) {
-  const suffix = faAliases[name] ?? kebabToPascal(name);
-  const target = `Fa${suffix}`;
-  return lazyFamilyIcon(
-    "fa",
-    () => import('react-icons/fa'),
-    (lib) => {
-      const FaComp = lib[target];
-      if (!FaComp) return null;
-      const Component = FaComp;
-      const Adapter = (props) => /* @__PURE__ */ jsxRuntime.jsx(
-        Component,
-        {
-          className: props.className,
-          style: props.style,
-          size: props.size ?? "1em"
-        }
-      );
-      Adapter.displayName = `Fa.${target}`;
-      return Adapter;
-    },
-    name,
-    family
-  );
-}
-function warnFallback(name, family) {
-  const key = `${family}::${name}`;
-  if (warned.has(key)) return;
-  warned.add(key);
-  if (typeof console !== "undefined") {
-    console.warn(
-      `[iconFamily] No '${name}' mapping in family '${family}'; falling back to lucide. Add an alias in lib/iconFamily.ts.`
-    );
-  }
-}
-function makeLucideAdapter(name, isFallback = false) {
+function makeLucideAdapter(name) {
   const LucideComp = resolveLucide(name);
-  const Adapter = (props) => {
-    const stroke = props.strokeWidth ?? (isFallback ? 2 : void 0);
-    const style = isFallback ? { ...props.style ?? {}, strokeWidth: stroke ?? 2 } : props.style;
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      LucideComp,
-      {
-        className: props.className,
-        strokeWidth: stroke,
-        style,
-        size: props.size
-      }
-    );
-  };
-  Adapter.displayName = `Lucide.${name}${isFallback ? ".fallback" : ""}`;
+  const Adapter = (props) => /* @__PURE__ */ jsxRuntime.jsx(
+    LucideComp,
+    {
+      className: props.className,
+      strokeWidth: props.strokeWidth,
+      style: props.style,
+      size: props.size
+    }
+  );
+  Adapter.displayName = `Lucide.${name}`;
   return Adapter;
 }
-function resolveIconForFamily(name, family) {
-  switch (family) {
-    case "lucide":
-      return makeLucideAdapter(name, false);
-    // Non-lucide families resolve to a lazy, Suspense-wrapped component that
-    // dynamic-imports the library on first render and falls back to lucide
-    // internally when the family lacks the icon (see lazyFamilyIcon).
-    case "phosphor-outline":
-      return resolvePhosphor(name, "regular", family);
-    case "phosphor-fill":
-      return resolvePhosphor(name, "fill", family);
-    case "phosphor-duotone":
-      return resolvePhosphor(name, "duotone", family);
-    case "tabler":
-      return resolveTabler(name, family);
-    case "fa-solid":
-      return resolveFa(name, family);
-  }
-}
-var DEFAULT_FAMILY, VALID_FAMILIES, cachedFamily, listeners, observer, libPromises, lucideAliases, phosphorAliases, tablerAliases, faAliases, warned;
+function resolveIconForFamily(name, _family) {
+  return makeLucideAdapter(name);
+}
+var DEFAULT_FAMILY, VALID_FAMILIES, cachedFamily, listeners, observer, lucideAliases;
 var init_iconFamily = __esm({
   "lib/iconFamily.tsx"() {
     "use client";
     DEFAULT_FAMILY = "lucide";
-    VALID_FAMILIES = [
-      "lucide",
-      "phosphor-outline",
-      "phosphor-fill",
-      "phosphor-duotone",
-      "tabler",
-      "fa-solid"
-    ];
+    VALID_FAMILIES = [DEFAULT_FAMILY];
     cachedFamily = null;
     listeners = /* @__PURE__ */ new Set();
     observer = null;
-    libPromises = /* @__PURE__ */ new Map();
     lucideAliases = {
       close: LucideIcons2__namespace.X,
       trash: LucideIcons2__namespace.Trash2,
@@ -1262,478 +1115,6 @@ var init_iconFamily = __esm({
       "sort-asc": LucideIcons2__namespace.ArrowUpNarrowWide,
       "sort-desc": LucideIcons2__namespace.ArrowDownNarrowWide
     };
-    phosphorAliases = {
-      // lucide name → phosphor PascalCase name
-      // Actions
-      plus: "Plus",
-      minus: "Minus",
-      x: "X",
-      check: "Check",
-      close: "X",
-      edit: "PencilSimple",
-      pencil: "PencilSimple",
-      trash: "Trash",
-      save: "FloppyDisk",
-      copy: "Copy",
-      share: "Share",
-      send: "PaperPlaneRight",
-      download: "DownloadSimple",
-      upload: "UploadSimple",
-      archive: "Archive",
-      refresh: "ArrowsClockwise",
-      loader: "CircleNotch",
-      link: "Link",
-      paperclip: "Paperclip",
-      // Navigation
-      "chevron-down": "CaretDown",
-      "chevron-up": "CaretUp",
-      "chevron-left": "CaretLeft",
-      "chevron-right": "CaretRight",
-      "arrow-up": "ArrowUp",
-      "arrow-down": "ArrowDown",
-      "arrow-left": "ArrowLeft",
-      "arrow-right": "ArrowRight",
-      menu: "List",
-      more: "DotsThree",
-      "more-vertical": "DotsThreeVertical",
-      "more-horizontal": "DotsThree",
-      external: "ArrowSquareOut",
-      "external-link": "ArrowSquareOut",
-      // Files
-      file: "File",
-      "file-text": "FileText",
-      "file-plus": "FilePlus",
-      "file-minus": "FileMinus",
-      folder: "Folder",
-      "folder-open": "FolderOpen",
-      document: "FileText",
-      // Charts
-      "bar-chart": "ChartBar",
-      "bar-chart-2": "ChartBar",
-      "bar-chart-3": "ChartBar",
-      "line-chart": "ChartLine",
-      "pie-chart": "ChartPie",
-      activity: "Pulse",
-      "trending-up": "TrendUp",
-      "trending-down": "TrendDown",
-      // Messages
-      message: "ChatCircle",
-      "message-circle": "ChatCircle",
-      "message-square": "ChatText",
-      "messages-square": "ChatsCircle",
-      comment: "ChatCircle",
-      comments: "ChatsCircle",
-      inbox: "Tray",
-      mail: "Envelope",
-      envelope: "Envelope",
-      // Status
-      "alert-circle": "WarningCircle",
-      "alert-triangle": "Warning",
-      "check-circle": "CheckCircle",
-      "x-circle": "XCircle",
-      info: "Info",
-      "help-circle": "Question",
-      "life-buoy": "Lifebuoy",
-      lifebuoy: "Lifebuoy",
-      warning: "Warning",
-      error: "WarningCircle",
-      // Media
-      image: "Image",
-      video: "VideoCamera",
-      film: "FilmStrip",
-      camera: "Camera",
-      music: "MusicNote",
-      play: "Play",
-      pause: "Pause",
-      stop: "Stop",
-      "skip-forward": "SkipForward",
-      "skip-back": "SkipBack",
-      volume: "SpeakerHigh",
-      "volume-2": "SpeakerHigh",
-      "volume-x": "SpeakerX",
-      mic: "Microphone",
-      "mic-off": "MicrophoneSlash",
-      // People
-      user: "User",
-      users: "Users",
-      "user-plus": "UserPlus",
-      "user-check": "UserCheck",
-      // Time
-      calendar: "Calendar",
-      clock: "Clock",
-      timer: "Timer",
-      // Location
-      map: "MapTrifold",
-      "map-pin": "MapPin",
-      navigation: "NavigationArrow",
-      compass: "Compass",
-      globe: "Globe",
-      target: "Target",
-      // Project / layout
-      kanban: "Kanban",
-      list: "List",
-      table: "Table",
-      grid: "GridFour",
-      layout: "Layout",
-      columns: "Columns",
-      rows: "Rows",
-      // Misc
-      bell: "Bell",
-      bookmark: "Bookmark",
-      briefcase: "Briefcase",
-      flag: "Flag",
-      tag: "Tag",
-      tags: "Tag",
-      star: "Star",
-      heart: "Heart",
-      home: "House",
-      settings: "Gear",
-      eye: "Eye",
-      "eye-off": "EyeSlash",
-      lock: "Lock",
-      unlock: "LockOpen",
-      key: "Key",
-      shield: "Shield",
-      search: "MagnifyingGlass",
-      filter: "Funnel",
-      "sort-asc": "SortAscending",
-      "sort-desc": "SortDescending",
-      zap: "Lightning",
-      sparkles: "Sparkle",
-      // Code
-      code: "Code",
-      terminal: "Terminal",
-      database: "Database",
-      server: "HardDrives",
-      cloud: "Cloud",
-      wifi: "WifiHigh",
-      package: "Package",
-      box: "Package",
-      // Theme
-      sun: "Sun",
-      moon: "Moon",
-      // Phone
-      phone: "Phone",
-      printer: "Printer",
-      // Hierarchy
-      tree: "Tree",
-      network: "Network"
-    };
-    tablerAliases = {
-      // lucide name → tabler suffix (after the `Icon` prefix)
-      // Actions
-      plus: "Plus",
-      minus: "Minus",
-      x: "X",
-      check: "Check",
-      close: "X",
-      edit: "Pencil",
-      pencil: "Pencil",
-      trash: "Trash",
-      save: "DeviceFloppy",
-      copy: "Copy",
-      share: "Share",
-      send: "Send",
-      download: "Download",
-      upload: "Upload",
-      archive: "Archive",
-      refresh: "Refresh",
-      loader: "Loader2",
-      link: "Link",
-      paperclip: "Paperclip",
-      external: "ExternalLink",
-      "external-link": "ExternalLink",
-      // Navigation
-      "chevron-down": "ChevronDown",
-      "chevron-up": "ChevronUp",
-      "chevron-left": "ChevronLeft",
-      "chevron-right": "ChevronRight",
-      "arrow-down": "ArrowDown",
-      "arrow-up": "ArrowUp",
-      "arrow-left": "ArrowLeft",
-      "arrow-right": "ArrowRight",
-      menu: "Menu2",
-      more: "Dots",
-      "more-vertical": "DotsVertical",
-      // Files
-      file: "File",
-      "file-text": "FileText",
-      "file-plus": "FilePlus",
-      "file-check": "FileCheck",
-      "file-minus": "FileMinus",
-      folder: "Folder",
-      "folder-open": "FolderOpen",
-      document: "FileText",
-      // Charts
-      "bar-chart": "ChartBar",
-      "bar-chart-2": "ChartBar",
-      "bar-chart-3": "ChartBar",
-      "line-chart": "ChartLine",
-      "pie-chart": "ChartPie",
-      activity: "Activity",
-      "trending-up": "TrendingUp",
-      "trending-down": "TrendingDown",
-      // Messages
-      message: "Message",
-      "message-circle": "MessageCircle",
-      "message-square": "Message2",
-      "messages-square": "Messages",
-      comment: "Message",
-      comments: "Messages",
-      inbox: "Inbox",
-      mail: "Mail",
-      envelope: "Mail",
-      // Status
-      "alert-circle": "AlertCircle",
-      "alert-triangle": "AlertTriangle",
-      "check-circle": "CircleCheck",
-      "x-circle": "CircleX",
-      info: "InfoCircle",
-      "help-circle": "HelpCircle",
-      "life-buoy": "Lifebuoy",
-      warning: "AlertTriangle",
-      error: "AlertOctagon",
-      // Media
-      image: "Photo",
-      video: "Video",
-      camera: "Camera",
-      music: "Music",
-      play: "PlayerPlay",
-      pause: "PlayerPause",
-      stop: "PlayerStop",
-      "skip-forward": "PlayerSkipForward",
-      "skip-back": "PlayerSkipBack",
-      volume: "Volume",
-      "volume-2": "Volume",
-      "volume-x": "VolumeOff",
-      mic: "Microphone",
-      "mic-off": "MicrophoneOff",
-      // People
-      user: "User",
-      users: "Users",
-      "user-plus": "UserPlus",
-      "user-check": "UserCheck",
-      // Time
-      calendar: "Calendar",
-      clock: "Clock",
-      timer: "Hourglass",
-      // Location
-      map: "Map",
-      "map-pin": "MapPin",
-      navigation: "Navigation",
-      compass: "Compass",
-      globe: "World",
-      target: "Target",
-      // Project / layout
-      kanban: "LayoutKanban",
-      list: "List",
-      table: "Table",
-      grid: "LayoutGrid",
-      layout: "Layout",
-      columns: "LayoutColumns",
-      rows: "LayoutRows",
-      // Misc
-      bell: "Bell",
-      bookmark: "Bookmark",
-      briefcase: "Briefcase",
-      flag: "Flag",
-      tag: "Tag",
-      tags: "Tags",
-      star: "Star",
-      heart: "Heart",
-      home: "Home",
-      settings: "Settings",
-      eye: "Eye",
-      "eye-off": "EyeOff",
-      lock: "Lock",
-      unlock: "LockOpen",
-      key: "Key",
-      shield: "Shield",
-      search: "Search",
-      filter: "Filter",
-      "sort-asc": "SortAscending",
-      "sort-desc": "SortDescending",
-      zap: "Bolt",
-      sparkles: "Sparkles",
-      // Code / data
-      code: "Code",
-      terminal: "Terminal",
-      database: "Database",
-      server: "Server",
-      cloud: "Cloud",
-      wifi: "Wifi",
-      package: "Package",
-      box: "Box",
-      // Theme
-      sun: "Sun",
-      moon: "Moon",
-      // Phone
-      phone: "Phone",
-      printer: "Printer",
-      // Hierarchy
-      tree: "Hierarchy",
-      network: "Network"
-    };
-    faAliases = {
-      // lucide name → fa-solid suffix (after the `Fa` prefix).
-      // react-icons/fa ships FontAwesome 5 — names like `FaFileText` don't exist
-      // (FA renamed to `FaFileAlt`). When you see a console.warn from
-      // [iconFamily] about an unmapped lucide name in this family, add the
-      // closest FA5 sibling here so the fallback stays in-family.
-      search: "Search",
-      close: "Times",
-      x: "Times",
-      loader: "Spinner",
-      refresh: "Sync",
-      "sort-asc": "SortAmountUp",
-      "sort-desc": "SortAmountDown",
-      "chevron-down": "ChevronDown",
-      "chevron-up": "ChevronUp",
-      "chevron-left": "ChevronLeft",
-      "chevron-right": "ChevronRight",
-      "help-circle": "QuestionCircle",
-      "alert-triangle": "ExclamationTriangle",
-      "alert-circle": "ExclamationCircle",
-      "check-circle": "CheckCircle",
-      "x-circle": "TimesCircle",
-      edit: "Edit",
-      pencil: "PencilAlt",
-      trash: "Trash",
-      send: "PaperPlane",
-      share: "ShareAlt",
-      external: "ExternalLinkAlt",
-      plus: "Plus",
-      minus: "Minus",
-      check: "Check",
-      star: "Star",
-      heart: "Heart",
-      home: "Home",
-      user: "User",
-      users: "Users",
-      "user-plus": "UserPlus",
-      "user-check": "UserCheck",
-      settings: "Cog",
-      menu: "Bars",
-      "arrow-up": "ArrowUp",
-      "arrow-down": "ArrowDown",
-      "arrow-left": "ArrowLeft",
-      "arrow-right": "ArrowRight",
-      copy: "Copy",
-      download: "Download",
-      upload: "Upload",
-      filter: "Filter",
-      calendar: "Calendar",
-      clock: "Clock",
-      bell: "Bell",
-      mail: "Envelope",
-      envelope: "Envelope",
-      lock: "Lock",
-      unlock: "LockOpen",
-      eye: "Eye",
-      "eye-off": "EyeSlash",
-      more: "EllipsisH",
-      "more-vertical": "EllipsisV",
-      info: "InfoCircle",
-      warning: "ExclamationTriangle",
-      error: "ExclamationCircle",
-      // Time
-      timer: "Hourglass",
-      // Files (FA renamed FileText → FileAlt)
-      file: "File",
-      "file-text": "FileAlt",
-      "file-plus": "FileMedical",
-      "file-minus": "FileExcel",
-      "file-check": "FileSignature",
-      document: "FileAlt",
-      // Charts (lucide BarChart2 / BarChart3 → FA ChartBar)
-      "bar-chart": "ChartBar",
-      "bar-chart-2": "ChartBar",
-      "bar-chart-3": "ChartBar",
-      "line-chart": "ChartLine",
-      "pie-chart": "ChartPie",
-      activity: "ChartLine",
-      "trending-up": "ChartLine",
-      "trending-down": "ChartLine",
-      // Messages (lucide MessageCircle/MessageSquare → FA CommentDots/CommentAlt)
-      message: "Comment",
-      "message-circle": "CommentDots",
-      "message-square": "CommentAlt",
-      "messages-square": "Comments",
-      comment: "Comment",
-      comments: "Comments",
-      inbox: "Inbox",
-      // Support / help
-      "life-buoy": "LifeRing",
-      lifebuoy: "LifeRing",
-      // Project / kanban (FA has no kanban; closest semantic is Tasks/Columns)
-      kanban: "Tasks",
-      columns: "Columns",
-      rows: "Bars",
-      layout: "ThLarge",
-      grid: "Th",
-      list: "List",
-      table: "Table",
-      // Storage / folders
-      folder: "Folder",
-      "folder-open": "FolderOpen",
-      archive: "Archive",
-      bookmark: "Bookmark",
-      briefcase: "Briefcase",
-      package: "Box",
-      box: "Box",
-      // Map / location
-      map: "Map",
-      "map-pin": "MapMarkerAlt",
-      navigation: "LocationArrow",
-      compass: "Compass",
-      globe: "Globe",
-      target: "Bullseye",
-      // Media
-      image: "Image",
-      video: "Video",
-      film: "Film",
-      camera: "Camera",
-      music: "Music",
-      play: "Play",
-      pause: "Pause",
-      stop: "Stop",
-      "skip-forward": "Forward",
-      "skip-back": "Backward",
-      volume: "VolumeUp",
-      "volume-2": "VolumeUp",
-      "volume-x": "VolumeMute",
-      mic: "Microphone",
-      "mic-off": "MicrophoneSlash",
-      phone: "Phone",
-      // Code / data
-      code: "Code",
-      terminal: "Terminal",
-      database: "Database",
-      server: "Server",
-      cloud: "Cloud",
-      wifi: "Wifi",
-      // Security
-      shield: "ShieldAlt",
-      key: "Key",
-      // Misc actions
-      printer: "Print",
-      save: "Save",
-      link: "Link",
-      unlink: "Unlink",
-      paperclip: "Paperclip",
-      flag: "Flag",
-      tag: "Tag",
-      tags: "Tags",
-      zap: "Bolt",
-      sparkles: "Magic",
-      // Theme
-      sun: "Sun",
-      moon: "Moon",
-      // Hierarchy (FA has no Tree icon for hierarchies; Sitemap is the org-chart icon)
-      tree: "Sitemap",
-      network: "NetworkWired"
-    };
-    warned = /* @__PURE__ */ new Set();
   }
 });
 function kebabToPascal2(name) {
@@ -1814,7 +1195,7 @@ var init_Icon = __esm({
       const family = useIconFamily();
       const RenderedComponent = React81__namespace.default.useMemo(() => {
         if (directIcon) return null;
-        return effectiveName ? resolveIconForFamily(effectiveName, family) : null;
+        return effectiveName ? resolveIconForFamily(effectiveName) : null;
       }, [directIcon, effectiveName, family]);
       const effectiveStrokeWidth = strokeWidth ?? void 0;
       const inlineStyle = {
@@ -2193,7 +1574,7 @@ var init_Button = __esm({
             ref,
             disabled: disabled || isLoading,
             className: cn(
-              "inline-flex items-center justify-center gap-2",
+              "relative inline-flex items-center justify-center gap-2",
               "font-medium",
               "rounded-sm",
               "cursor-pointer",
@@ -3961,6 +3342,7 @@ var init_Input = __esm({
         icon: iconProp,
         clearable,
         onClear,
+        action,
         value,
         options,
         rows = 3,
@@ -4010,6 +3392,11 @@ var init_Input = __esm({
             onClear?.();
           }
         };
+        const handleKeyDown = (e) => {
+          if (action && e.key === "Enter") {
+            eventBus.emit(`UI:${action}`, { value: e.currentTarget.value });
+          }
+        };
         const wrapField = (field) => /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "w-full", children: [
           label && /* @__PURE__ */ jsxRuntime.jsx("label", { className: "block text-sm font-medium text-foreground mb-1", children: label }),
           field,
@@ -4083,6 +3470,7 @@ var init_Input = __esm({
                 type,
                 value,
                 onChange: handleChange,
+                onKeyDown: handleKeyDown,
                 className: baseClassName,
                 ...props
               }
@@ -4615,7 +4003,7 @@ var init_Card = __esm({
 });
 function GameIcon({ assetUrl, icon, size = "md", alt, className }) {
   const px = typeof size === "number" ? size : sizeMap[size];
-  const family = useIconFamily();
+  useIconFamily();
   if (assetUrl?.url) {
     return /* @__PURE__ */ jsxRuntime.jsx(
       AtlasImage,
@@ -4627,7 +4015,7 @@ function GameIcon({ assetUrl, icon, size = "md", alt, className }) {
       }
     );
   }
-  const I = typeof icon === "string" ? resolveIconForFamily(icon, family) : icon;
+  const I = typeof icon === "string" ? resolveIconForFamily(icon) : icon;
   return /* @__PURE__ */ jsxRuntime.jsx(I, { width: px, height: px, className: cn("flex-shrink-0", className) });
 }
 var sizeMap;
@@ -7024,8 +6412,8 @@ function Seigaiha({ size, color, strokeWidth }) {
     [s, s * 0.1]
   ];
   for (const [cx, cy] of centers) {
-    for (let ring2 = 1; ring2 <= 3; ring2++) {
-      const cr = r * (ring2 / 3);
+    for (let ring = 1; ring <= 3; ring++) {
+      const cr = r * (ring / 3);
       paths.push(
         `M ${f(cx - cr)},${f(cy)} A ${f(cr)} ${f(cr)} 0 0 1 ${f(cx + cr)},${f(cy)}`
       );
@@ -7122,8 +6510,8 @@ function Arch({ size, color, strokeWidth }) {
   const h = size * 1.5;
   const cx = w / 2;
   const paths = [];
-  for (let ring2 = 0; ring2 < 4; ring2++) {
-    const scale = 1 - ring2 * 0.2;
+  for (let ring = 0; ring < 4; ring++) {
+    const scale = 1 - ring * 0.2;
     const archW = w * 0.48 * scale;
     const archH = h * 0.7 * scale;
     const baseY = h * 0.85;
@@ -7138,7 +6526,7 @@ function Arch({ size, color, strokeWidth }) {
     paths.push(
       `M ${f(lx)},${f(baseY)} A ${f(radius)} ${f(radius)} 0 0 1 ${f(cx)},${f(tipY)} A ${f(radius)} ${f(radius)} 0 0 1 ${f(rx)},${f(baseY)}`
     );
-    if (ring2 === 0) {
+    if (ring === 0) {
       paths.push(`M ${f(lx)},${f(baseY)} L ${f(rx)},${f(baseY)}`);
     }
   }
@@ -9546,9 +8934,9 @@ var init_webPainter2d = __esm({
 // lib/drawable/projector.ts
 function create2DProjector(opts) {
   const { scale, baseOffsetX, layout } = opts;
-  const tileWidth = TILE_WIDTH * scale;
-  const floorHeight = FLOOR_HEIGHT * scale;
-  const diamondTopY = (opts.diamondTopY ?? DIAMOND_TOP_Y) * scale;
+  const tileWidth = layout === "free" ? 1 : TILE_WIDTH * scale;
+  const floorHeight = layout === "free" ? 1 : FLOOR_HEIGHT * scale;
+  const diamondTopY = layout === "free" ? 0 : (opts.diamondTopY ?? DIAMOND_TOP_Y) * scale;
   const squareGrid = layout === "flat" || layout === "free";
   const project = (pos) => layout === "free" ? { x: pos.x, y: pos.y } : isoToScreen(pos.x, pos.y, scale, baseOffsetX, layout);
   const anchorPoint = (pos, anchor) => {
@@ -9589,6 +8977,15 @@ var init_projector = __esm({
   }
 });
 
+// lib/drawable/contract.ts
+function isValidScenePos(pos) {
+  return Number.isFinite(pos?.x) && Number.isFinite(pos?.y);
+}
+var init_contract = __esm({
+  "lib/drawable/contract.ts"() {
+  }
+});
+
 // components/game/atoms/DrawSprite.tsx
 function DrawSprite(_props) {
   return null;
@@ -9598,10 +8995,12 @@ var init_DrawSprite = __esm({
   "components/game/atoms/DrawSprite.tsx"() {
     "use client";
     init_atlasSlice();
+    init_contract();
     paintSprite = (painter, node, dctx) => {
+      if (!node.asset?.url || !isValidScenePos(node.position)) return;
       const tex = painter.resolveTexture(node.asset.url);
       if (!tex) return;
-      let src = node.frame;
+      let src = typeof node.frame === "object" ? node.frame : void 0;
       if (!src && isAtlasAsset(node.asset)) {
         const atlas = getAtlas(node.asset.atlas, dctx.invalidate);
         if (!atlas) return;
@@ -9646,7 +9045,9 @@ var paintShape;
 var init_DrawShape = __esm({
   "components/game/atoms/DrawShape.tsx"() {
     "use client";
+    init_contract();
     paintShape = (painter, node, dctx) => {
+      if (!isValidScenePos(node.position)) return;
       painter.save();
       if (node.opacity !== void 0 && node.opacity !== 1) painter.setAlpha(node.opacity);
       switch (node.shape) {
@@ -9700,7 +9101,9 @@ var paintText;
 var init_DrawText = __esm({
   "components/game/atoms/DrawText.tsx"() {
     "use client";
+    init_contract();
     paintText = (painter, node, dctx) => {
+      if (!isValidScenePos(node.position)) return;
       const p = dctx.projector.anchorPoint(node.position, node.anchor ?? "center");
       const x = p.x + (node.offsetX ?? 0);
       const y = p.y + (node.offsetY ?? 0);
@@ -9805,12 +9208,14 @@ function collectDrawnItems(nodes) {
       case "draw-sprite":
       case "draw-shape":
       case "draw-text":
-        out.push({ pos: n.position, id: n.id });
+        if (isValidScenePos(n.position)) out.push({ pos: n.position, id: n.id });
         break;
       case "draw-sprite-layer":
       case "draw-shape-layer":
       case "draw-text-layer":
-        for (const it of n.items) out.push({ pos: it.position, id: it.id });
+        for (const it of n.items) {
+          if (isValidScenePos(it.position)) out.push({ pos: it.position, id: it.id });
+        }
         break;
     }
   }
@@ -9825,6 +9230,7 @@ function buildHitIndex(items) {
 }
 var init_hitTest = __esm({
   "lib/drawable/hitTest.ts"() {
+    init_contract();
   }
 });
 function normalizeBackdrop(bg) {
@@ -9850,14 +9256,16 @@ function Canvas2D({
   cameraPos,
   bgColor
 }) {
+  const instanceId = React81.useMemo(() => Math.random().toString(36).slice(2, 8), []);
+  function isDrawableLayer(node) {
+    return node.type === "draw-sprite-layer" || node.type === "draw-shape-layer" || node.type === "draw-text-layer";
+  }
   const layerSummaries = drawables?.map((d) => {
-    if (!d || typeof d !== "object") return d;
-    const rec = d;
-    return { type: rec.type, itemsLen: Array.isArray(rec.items) ? rec.items.length : void 0, firstItem: Array.isArray(rec.items) ? rec.items[0] : void 0 };
+    if (!isDrawableLayer(d)) return { type: d.type };
+    return { type: d.type, itemsLen: d.items.length, firstItem: d.items[0] };
   });
-  console.error("[debug:Canvas2D] " + JSON.stringify({ projection, scale, cameraMode: camera, cameraPos, drawablesCount: drawables?.length, layerSummaries }));
+  canvas2DLog.debug("Canvas2D render", { instanceId, projection, scale, cameraMode: camera, cameraPos: cameraPos ? JSON.stringify(cameraPos) : void 0, drawablesCount: drawables?.length, layerSummaries: layerSummaries ? JSON.stringify(layerSummaries) : void 0 });
   const backgroundImage = normalizeBackdrop(backgroundImageRaw);
-  const instanceId = React81.useMemo(() => Math.random().toString(36).slice(2, 8), []);
   const isFree = projection === "free";
   const squareGrid = projection === "flat" || isFree || projection === "side";
   const layout = projection === "side" ? "free" : projection;
@@ -9992,7 +9400,7 @@ function Canvas2D({
     }
     const containerRect = containerRef.current?.getBoundingClientRect();
     const canvasRect = canvas.getBoundingClientRect();
-    console.error("[debug:Canvas2D:draw:" + instanceId + "] " + JSON.stringify({ viewportSize, baseOffsetX, cam: { x: cam.x, y: cam.y, zoom: cam.zoom }, cameraPos, containerRect: containerRect ? { width: containerRect.width, height: containerRect.height } : null, canvasRect: canvasRect ? { width: canvasRect.width, height: canvasRect.height } : null }));
+    canvas2DLog.debug("Canvas2D draw", { instanceId, viewportSize, baseOffsetX, cam: { x: cam.x, y: cam.y, zoom: cam.zoom }, cameraPos: cameraPos ? JSON.stringify(cameraPos) : void 0, containerRect: containerRect ? { width: containerRect.width, height: containerRect.height } : null, canvasRect: canvasRect ? { width: canvasRect.width, height: canvasRect.height } : null });
     const painter = createWebPainter(ctx, bumpAtlas);
     painter.save();
     painter.translate(viewportSize.width / 2, viewportSize.height / 2);
@@ -10204,6 +9612,7 @@ function Canvas2D({
     }
   );
 }
+var canvas2DLog;
 var init_Canvas2D = __esm({
   "components/game/molecules/Canvas2D.tsx"() {
     "use client";
@@ -10225,6 +9634,7 @@ var init_Canvas2D = __esm({
     init_paintDispatch();
     init_hitTest();
     init_isometric();
+    canvas2DLog = logger.createLogger("almadar:ui:game-canvas");
     Canvas2D.displayName = "Canvas2D";
   }
 });
@@ -10263,7 +9673,7 @@ function Canvas({
   keyMap,
   keyUpMap
 }) {
-  console.error("[debug:Canvas] " + JSON.stringify({ mode, drawablesCount: drawables?.length, projection, camera }));
+  canvasLog.debug("Canvas render", { mode, drawablesCount: drawables?.length, projection, camera: camera ? JSON.stringify(camera) : void 0 });
   const zoom = camera?.zoom;
   if (mode === "3d") {
     const props3d = {
@@ -10316,7 +9726,7 @@ function Canvas({
     }
   );
 }
-var Canvas3DHost;
+var Canvas3DHost, canvasLog;
 var init_Canvas = __esm({
   "components/game/molecules/Canvas.tsx"() {
     "use client";
@@ -10324,6 +9734,7 @@ var init_Canvas = __esm({
     Canvas3DHost = React81.lazy(
       () => import('@almadar/ui/components/molecules/game/three').then((m) => ({ default: m.Canvas3DHost }))
     );
+    canvasLog = logger.createLogger("almadar:ui:game-canvas");
     Canvas.displayName = "Canvas";
   }
 });
@@ -11859,21 +11270,6 @@ var init_renderer = __esm({
     init_slot_definitions();
   }
 });
-
-// lib/wrapCallbackForEvent.ts
-function wrapCallbackForEvent(qualifiedEvent, callbackArgs, emit) {
-  const argNames = (callbackArgs ?? []).map((a) => a.name);
-  if (argNames.length === 0) {
-    return () => emit(qualifiedEvent);
-  }
-  return (...args) => {
-    const payload = {};
-    for (let i = 0; i < argNames.length; i += 1) {
-      payload[argNames[i]] = args[i];
-    }
-    emit(qualifiedEvent, payload);
-  };
-}
 var init_wrapCallbackForEvent = __esm({
   "lib/wrapCallbackForEvent.ts"() {
   }
@@ -22764,7 +22160,8 @@ function DataGrid({
   const { t } = hooks.useTranslate();
   const [selectedIds, setSelectedIds] = React81.useState(/* @__PURE__ */ new Set());
   const [visibleCount, setVisibleCount] = React81.useState(pageSize || Infinity);
-  const fieldDefs = fields ?? columns ?? [];
+  const fieldDefs = (Array.isArray(fields) ? fields : void 0) ?? (Array.isArray(columns) ? columns : void 0) ?? [];
+  const actionDefs = Array.isArray(itemActions) ? itemActions : [];
   const allDataRaw = Array.isArray(entity) ? entity : entity ? [entity] : [];
   const dnd = useDataDnd({
     items: allDataRaw,
@@ -22808,8 +22205,8 @@ function DataGrid({
   const titleField = fieldDefs.find((f3) => f3.variant === "h3" || f3.variant === "h4") ?? fieldDefs[0];
   const badgeFields = fieldDefs.filter((f3) => f3.variant === "badge" && f3 !== titleField);
   const bodyFields = fieldDefs.filter((f3) => f3 !== titleField && !badgeFields.includes(f3));
-  const primaryActions = itemActions?.filter((a) => a.variant !== "danger") ?? [];
-  const dangerActions = itemActions?.filter((a) => a.variant === "danger") ?? [];
+  const primaryActions = actionDefs.filter((a) => a.variant !== "danger");
+  const dangerActions = actionDefs.filter((a) => a.variant === "danger");
   const handleActionClick = (action, itemData) => (e) => {
     e.stopPropagation();
     const payload = {
@@ -35339,7 +34736,7 @@ function measureLabelWidth(text) {
   if (typeof document === "undefined") return text.length * 6;
   if (!labelMeasureCtx) labelMeasureCtx = document.createElement("canvas").getContext("2d");
   if (!labelMeasureCtx) return text.length * 6;
-  labelMeasureCtx.font = "10px system-ui";
+  labelMeasureCtx.font = "12px system-ui";
   return labelMeasureCtx.measureText(text).width;
 }
 function getGroupColor(group, groups) {
@@ -35385,6 +34782,7 @@ var init_GraphCanvas = __esm({
       actions,
       onNodeClick,
       onNodeDoubleClick,
+      onBadgeClick,
       nodeClickEvent,
       selectedNodeId,
       repulsion = 800,
@@ -35532,7 +34930,9 @@ var init_GraphCanvas = __esm({
               const dx = target.x - source.x;
               const dy = target.y - source.y;
               const dist = Math.sqrt(dx * dx + dy * dy) || 1;
-              const force = (dist - linkDistance) * 0.05;
+              const w2 = edge.weight ?? 1;
+              const linkTarget = linkDistance * (1 + (1 - Math.min(1, Math.max(0, w2))) * 1.5);
+              const force = (dist - linkTarget) * 0.05;
               const fx = dx / dist * force;
               const fy = dy / dist * force;
               source.fx += fx;
@@ -35554,7 +34954,7 @@ var init_GraphCanvas = __esm({
               node.y = Math.max(30, Math.min(h - 30, node.y));
             }
             const LABEL_GAP = 12;
-            const LABEL_H = 12;
+            const LABEL_H = 16;
             const pad = nodeSpacing / 2;
             for (let i = 0; i < nodes.length; i++) {
               for (let j = i + 1; j < nodes.length; j++) {
@@ -35575,13 +34975,13 @@ var init_GraphCanvas = __esm({
                 const overlapY = Math.min(aBot, bBot) - Math.max(aTop, bTop);
                 if (overlapX > 0 && overlapY > 0) {
                   if (overlapX <= overlapY) {
-                    const push2 = overlapX / 2 * (b.x >= a.x ? 1 : -1);
-                    a.x = Math.max(30, Math.min(w - 30, a.x - push2));
-                    b.x = Math.max(30, Math.min(w - 30, b.x + push2));
+                    const push = overlapX / 2 * (b.x >= a.x ? 1 : -1);
+                    a.x = Math.max(30, Math.min(w - 30, a.x - push));
+                    b.x = Math.max(30, Math.min(w - 30, b.x + push));
                   } else {
-                    const push2 = overlapY / 2 * (bTop + bBot >= aTop + aBot ? 1 : -1);
-                    a.y = Math.max(30, Math.min(h - 30, a.y - push2));
-                    b.y = Math.max(30, Math.min(h - 30, b.y + push2));
+                    const push = overlapY / 2 * (bTop + bBot >= aTop + aBot ? 1 : -1);
+                    a.y = Math.max(30, Math.min(h - 30, a.y - push));
+                    b.y = Math.max(30, Math.min(h - 30, b.y + push));
                   }
                 }
               }
@@ -35609,6 +35009,11 @@ var init_GraphCanvas = __esm({
         const h = height;
         const nodes = nodesRef.current;
         const accentColor = resolveColor3("var(--color-accent)", canvas);
+        const fontFamily = resolveColor3("var(--font-family)", canvas) || "system-ui";
+        const fgColor = resolveColor3("var(--color-foreground)", canvas);
+        const mutedColor = resolveColor3("var(--color-muted-foreground)", canvas) || fgColor;
+        const bgColor = resolveColor3("var(--color-background)", canvas) || "#ffffff";
+        const accentFg = resolveColor3("var(--color-accent-foreground)", canvas) || "#ffffff";
         const dpr = typeof window !== "undefined" && window.devicePixelRatio || 1;
         ctx.setTransform(dpr, 0, 0, dpr, 0, 0);
         ctx.clearRect(0, 0, w, h);
@@ -35628,19 +35033,21 @@ var init_GraphCanvas = __esm({
           const target = nodes.find((n) => n.id === edge.target);
           if (!source || !target) continue;
           const incident = !!hoveredNode && (edge.source === hoveredNode || edge.target === hoveredNode);
-          ctx.globalAlpha = hoveredNode ? incident ? 1 : 0.05 : linkOpacity;
+          const w2 = edge.weight ?? 1;
+          ctx.globalAlpha = hoveredNode ? incident ? 1 : 0.05 : linkOpacity * w2;
           ctx.beginPath();
           ctx.moveTo(source.x, source.y);
           ctx.lineTo(target.x, target.y);
           ctx.strokeStyle = incident ? accentColor : edge.color || "#888888";
-          ctx.lineWidth = incident ? 2 : edge.weight ? Math.max(1, edge.weight) : 1;
+          ctx.lineWidth = incident ? 2 : Math.max(0.75, w2);
           ctx.stroke();
           if (edge.label && showLabels) {
             const mx = (source.x + target.x) / 2;
             const my = (source.y + target.y) / 2;
-            ctx.fillStyle = "#888888";
-            ctx.font = "9px system-ui";
+            ctx.fillStyle = mutedColor;
+            ctx.font = `9px ${fontFamily}`;
             ctx.textAlign = "center";
+            ctx.textBaseline = "alphabetic";
             ctx.fillText(edge.label, mx, my - 4);
           }
         }
@@ -35665,10 +35072,33 @@ var init_GraphCanvas = __esm({
           }
           ctx.stroke();
           if (showLabels && node.label) {
-            ctx.fillStyle = "#666666";
-            ctx.font = `${isSelected || isHovered ? "bold " : ""}10px system-ui`;
+            ctx.font = `${isSelected || isHovered ? "600" : "500"} 12px ${fontFamily}`;
+            ctx.textAlign = "center";
+            ctx.textBaseline = "middle";
+            const ly = node.y + radius + 14;
+            ctx.lineWidth = 3;
+            ctx.lineJoin = "round";
+            ctx.strokeStyle = bgColor;
+            ctx.strokeText(node.label, node.x, ly);
+            ctx.fillStyle = isSelected || isHovered ? fgColor : mutedColor;
+            ctx.fillText(node.label, node.x, ly);
+          }
+          if (node.badge && node.badge > 1) {
+            const bx = node.x + radius * 0.7;
+            const by = node.y - radius * 0.7;
+            const br = Math.max(7, Math.min(11, radius * 0.45));
+            ctx.beginPath();
+            ctx.arc(bx, by, br, 0, Math.PI * 2);
+            ctx.fillStyle = accentColor;
+            ctx.fill();
+            ctx.strokeStyle = bgColor;
+            ctx.lineWidth = 2;
+            ctx.stroke();
+            ctx.fillStyle = accentFg;
+            ctx.font = `600 9px ${fontFamily}`;
             ctx.textAlign = "center";
-            ctx.fillText(node.label, node.x, node.y + radius + 12);
+            ctx.textBaseline = "middle";
+            ctx.fillText(String(node.badge), bx, by + 0.5);
           }
         }
         ctx.restore();
@@ -35761,11 +35191,21 @@ var init_GraphCanvas = __esm({
             if (!coords) return;
             const node = nodeAt(coords.graphX, coords.graphY);
             if (node) {
+              if (node.badge && node.badge > 1 && onBadgeClick) {
+                const r = (node.size || 8) + (selectedNodeId === node.id ? 4 : 0);
+                const bx = node.x + r * 0.7;
+                const by = node.y - r * 0.7;
+                const br = Math.max(7, Math.min(11, r * 0.45)) + 3;
+                if (Math.hypot(coords.graphX - bx, coords.graphY - by) <= br) {
+                  onBadgeClick(node);
+                  return;
+                }
+              }
               handleNodeClick(node);
             }
           }
         },
-        [toCoords, nodeAt, handleNodeClick]
+        [toCoords, nodeAt, handleNodeClick, onBadgeClick, selectedNodeId]
       );
       const handlePointerLeave = React81.useCallback(() => {
         setHoveredNode(null);
@@ -40286,7 +39726,7 @@ function getAllEvents(traits2) {
 function EventDispatcherTab({ traits: traits2, schema }) {
   const eventBus = useEventBus();
   const { t } = hooks.useTranslate();
-  const [log10, setLog] = React81__namespace.useState([]);
+  const [log9, setLog] = React81__namespace.useState([]);
   const prevStatesRef = React81__namespace.useRef(/* @__PURE__ */ new Map());
   React81__namespace.useEffect(() => {
     for (const trait of traits2) {
@@ -40350,9 +39790,9 @@ function EventDispatcherTab({ traits: traits2, schema }) {
       /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "small", weight: "medium", className: "text-gray-500 mb-1", children: t("debug.otherEvents") }),
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-wrap gap-1", children: unavailableEvents.map((event) => /* @__PURE__ */ jsxRuntime.jsx(Badge, { variant: "default", size: "sm", className: "opacity-50", children: event }, event)) })
     ] }),
-    log10.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+    log9.length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
       /* @__PURE__ */ jsxRuntime.jsx(Typography, { variant: "small", weight: "medium", className: "text-gray-500 mb-1", children: t("debug.recentTransitions") }),
-      /* @__PURE__ */ jsxRuntime.jsx(Stack, { gap: "xs", children: log10.map((entry, i) => /* @__PURE__ */ jsxRuntime.jsxs(Typography, { variant: "small", className: "font-mono text-xs", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(Stack, { gap: "xs", children: log9.map((entry, i) => /* @__PURE__ */ jsxRuntime.jsxs(Typography, { variant: "small", className: "font-mono text-xs", children: [
         /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-purple-400", children: entry.traitName }),
         " ",
         /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-gray-500", children: entry.from }),
@@ -43754,7 +43194,7 @@ function SlotContentRenderer({
         if (typeof propValue !== "string") continue;
         const propDef = propsSchema[propKey];
         if (!propDef || propDef.kind !== "callback") continue;
-        renderedProps[propKey] = wrapCallbackForEvent(
+        renderedProps[propKey] = ui.wrapCallbackForEvent(
           `UI:${propValue}`,
           propDef.callbackArgs,
           (eventKey, payload) => eventBus.emit(eventKey, payload)
@@ -43989,27 +43429,27 @@ var log2 = logger.createLogger("almadar:ui:shared-entity-store");
 var EMPTY_ENTITY_STATE = {};
 function createSharedEntityStore() {
   const states = /* @__PURE__ */ new Map();
-  const subscribers2 = /* @__PURE__ */ new Map();
-  const getSnapshot3 = (entityId) => states.get(entityId) ?? EMPTY_ENTITY_STATE;
-  const subscribe2 = (entityId, callback) => {
-    let set = subscribers2.get(entityId);
+  const subscribers = /* @__PURE__ */ new Map();
+  const getSnapshot2 = (entityId) => states.get(entityId) ?? EMPTY_ENTITY_STATE;
+  const subscribe = (entityId, callback) => {
+    let set = subscribers.get(entityId);
     if (!set) {
       set = /* @__PURE__ */ new Set();
-      subscribers2.set(entityId, set);
+      subscribers.set(entityId, set);
     }
     set.add(callback);
     return () => {
-      const current = subscribers2.get(entityId);
+      const current = subscribers.get(entityId);
       if (!current) return;
       current.delete(callback);
       if (current.size === 0) {
-        subscribers2.delete(entityId);
+        subscribers.delete(entityId);
       }
     };
   };
   const commit = (entityId, nextState) => {
     states.set(entityId, nextState);
-    const set = subscribers2.get(entityId);
+    const set = subscribers.get(entityId);
     if (!set) return;
     set.forEach((callback) => {
       try {
@@ -44027,7 +43467,7 @@ function createSharedEntityStore() {
       states.set(entityId, initialState);
     }
   };
-  return { getSnapshot: getSnapshot3, subscribe: subscribe2, commit, seed };
+  return { getSnapshot: getSnapshot2, subscribe, commit, seed };
 }
 function useSharedEntityStore() {
   const storeRef = React81.useRef(null);
@@ -44103,6 +43543,11 @@ function createClientEffectHandlers(options) {
   };
 }
 var lambdaLog = logger.createLogger("almadar:ui:fn-form-lambda");
+function isOperatorCall(value) {
+  const first = value[0];
+  if (typeof first !== "string") return false;
+  return registry.isKnownStdOperator(first) || first.includes("/") || first === "lambda" || first === "let";
+}
 function isFnFormLambda(value) {
   if (!Array.isArray(value)) return false;
   const arr = value;
@@ -44142,7 +43587,14 @@ function resolveLambdaBindings(body, params, item, index) {
     return body;
   }
   if (Array.isArray(body)) {
-    return body.map((b) => recur(b));
+    if (isFnFormLambda(body)) return body;
+    const arr = body;
+    const substituted = arr.map((b) => recur(b));
+    if (isOperatorCall(substituted) && core.isSExpr(substituted)) {
+      const evaluated = evaluator.evaluate(substituted, evaluator.createMinimalContext());
+      return core.isEventPayloadValue(evaluated) ? evaluated : String(evaluated);
+    }
+    return substituted;
   }
   if (body !== null && typeof body === "object" && !React81__namespace.default.isValidElement(body) && !(body instanceof Date) && typeof body !== "function") {
     const out = {};
@@ -44237,6 +43689,8 @@ var flushLog = logger.createLogger("almadar:ui:slot-flush");
 var stateLog = logger.createLogger("almadar:ui:state-transitions");
 var tickLog = logger.createLogger("almadar:ui:tick-effects");
 logger.setNamespaceLevel("almadar:ui:tick-effects", "WARN");
+var sharedEntityLog = logger.createLogger("almadar:ui:shared-entity");
+logger.setNamespaceLevel("almadar:ui:shared-entity", "WARN");
 var SYNC_TICK_OPERATORS = /* @__PURE__ */ new Set([
   "set",
   "emit",
@@ -44331,14 +43785,14 @@ function createSharedEntityWriter(binding, tick, traitStatesRef, emit) {
 function getBindingConfig(binding) {
   const raw = binding.config;
   const normalized = runtime.normalizeCallSiteConfigToValues(raw);
-  console.log("[debug:getBindingConfig]", binding.trait.name, "raw keys=", raw ? Object.keys(raw) : "undefined", "has tiles=", raw ? "tiles" in raw : false);
+  sharedEntityLog.debug("getBindingConfig", { traitName: binding.trait.name, rawKeys: raw ? Object.keys(raw) : void 0, hasTiles: raw ? "tiles" in raw : false });
   return normalized;
 }
 function evalFieldDefault(value) {
   if (!Array.isArray(value) || value.length === 0) return value;
   const head = value[0];
-  const isSExpr = typeof head === "string" && (head.includes("/") || head === "let" || head === "if" || head === "lambda");
-  if (!isSExpr) return value;
+  const isSExpr2 = typeof head === "string" && (head.includes("/") || head === "let" || head === "if" || head === "lambda");
+  if (!isSExpr2) return value;
   try {
     return evaluator.evaluate(value, evaluator.createMinimalContext({}, {}, ""));
   } catch {
@@ -44346,7 +43800,7 @@ function evalFieldDefault(value) {
   }
 }
 function useTraitStateMachine(traitBindings, uiSlots, options) {
-  console.log("[debug:useTraitStateMachine] start, traitBindings count=", traitBindings.length, "names=", traitBindings.map((b) => b.trait.name).join(","));
+  sharedEntityLog.debug("useTraitStateMachine start", { traitBindingsCount: traitBindings.length, traitNames: traitBindings.map((b) => b.trait.name) });
   const eventBus = useEventBus();
   const { entities } = providers.useEntitySchema();
   const traitConfigsByName = options?.traitConfigsByName;
@@ -44365,10 +43819,15 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       if (!group) {
         let defaults;
         for (const field of entityDef.fields) {
-          if (field.default !== void 0) {
+          if (field.default !== void 0 && field.default !== null) {
             const evaluated = evalFieldDefault(field.default);
             if (field.name === "tiles") {
-              console.log(`[debug:seed] ${linkedEntityName}.tiles seed type=`, typeof evaluated, Array.isArray(evaluated) ? "len=" + evaluated?.length : "", "head=", Array.isArray(evaluated) && evaluated.length > 0 ? JSON.stringify(evaluated[0]).slice(0, 80) : "n/a");
+              sharedEntityLog.debug("seed tiles", {
+                linkedEntityName,
+                type: typeof evaluated,
+                length: Array.isArray(evaluated) ? evaluated?.length : void 0,
+                head: Array.isArray(evaluated) && evaluated.length > 0 ? JSON.stringify(evaluated[0]).slice(0, 80) : void 0
+              });
             }
             (defaults ?? (defaults = {}))[field.name] = evaluated;
           }
@@ -44385,7 +43844,12 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
   for (const group of sharedGroups.values()) {
     if (group.defaults) {
       sharedEntityStore.seed(group.storeKey, group.defaults);
-      console.log("[debug:shared-seed]", group.storeKey, "writers=", group.writerBindings.map((b) => b.trait.name).join(","), "renderers=", group.renderBindings.map((b) => b.trait.name).join(","), "defaults.tiles=", Array.isArray(group.defaults.tiles) ? group.defaults.tiles.length : group.defaults.tiles);
+      sharedEntityLog.debug("shared-seed", {
+        storeKey: group.storeKey,
+        writers: group.writerBindings.map((b) => b.trait.name),
+        renderers: group.renderBindings.map((b) => b.trait.name),
+        tilesLength: Array.isArray(group.defaults.tiles) ? group.defaults.tiles.length : group.defaults.tiles
+      });
     }
   }
   const sharedKeyByTraitNameRef = React81.useRef(/* @__PURE__ */ new Map());
@@ -44396,13 +43860,15 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       for (const binding of group.renderBindings) map.set(binding.trait.name, group.storeKey);
     }
     sharedKeyByTraitNameRef.current = map;
-    console.log("[debug:shared-map]", Array.from(map.entries()).map(([k, v]) => `${k}->${v}`).join(","));
+    sharedEntityLog.debug("shared-map", { map: Array.from(map.entries()).map(([k, v]) => `${k}->${v}`) });
   }, [sharedGroups]);
   const manager = React81.useMemo(() => {
     const traitDefs = traitBindings.map(toTraitDefinition);
     const m = new runtime.StateMachineManager(traitDefs);
     for (const binding of traitBindings) {
-      const cfg = getBindingConfig(binding) ?? traitConfigsByName?.[binding.trait.name];
+      const rawCfg = getBindingConfig(binding);
+      const resolvedCfg = traitConfigsByName?.[binding.trait.name];
+      const cfg = rawCfg || resolvedCfg ? { ...rawCfg ?? {}, ...resolvedCfg ?? {} } : void 0;
       if (cfg !== void 0) {
         m.setTraitConfig(binding.trait.name, cfg);
       }
@@ -44580,13 +44046,13 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     };
   }, [traitBindings]);
   const executeTransitionEffects = React81.useCallback(async (params) => {
-    const { binding, previousState, newState, payload, flushEvent, syncOnly, log: log10 } = params;
+    const { binding, previousState, newState, payload, flushEvent, syncOnly, log: log9 } = params;
     const traitName = binding.trait.name;
     const linkedEntity = binding.linkedEntity || "";
     const entityId = payload?.entityId;
     const sharedKey = sharedKeyByTraitNameRef.current.get(traitName);
     if (traitName === "Hero" || traitName === "Authority") {
-      console.log(`[debug:executeTransitionEffects] ${traitName} sharedKey=`, sharedKey, "store tiles=", sharedKey ? sharedEntityStore.getSnapshot(sharedKey).tiles?.length : "n/a");
+      sharedEntityLog.debug("executeTransitionEffects sharedKey", { traitName, sharedKey, storeTilesLength: sharedKey ? sharedEntityStore.getSnapshot(sharedKey).tiles?.length : void 0 });
     }
     let liveEntity;
     if (sharedKey !== void 0) {
@@ -44613,10 +44079,15 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         addPattern: (slot, pattern, props) => {
           if (traitName === "Hero" && slot === "main" && props && typeof props === "object") {
             const canvasChild = Array.isArray(props.children) ? props.children[0] : null;
-            const grandChildren = canvasChild && typeof canvasChild === "object" ? canvasChild.children : null;
+            const grandChildren = canvasChild && typeof canvasChild === "object" && !Array.isArray(canvasChild) ? canvasChild.children : null;
             const firstLayer = Array.isArray(grandChildren) && grandChildren.length > 0 ? grandChildren[0] : null;
-            const firstLayerItems = firstLayer && typeof firstLayer === "object" ? firstLayer.items : null;
-            console.log(`[debug:render-ui] ${traitName} slot=${slot} canvasChild=`, canvasChild ? canvasChild.type : "none", "firstLayerItems=", Array.isArray(firstLayerItems) ? firstLayerItems.length : firstLayerItems);
+            const firstLayerItems = firstLayer && typeof firstLayer === "object" && !Array.isArray(firstLayer) ? firstLayer.items : null;
+            sharedEntityLog.debug("render-ui main slot", {
+              traitName,
+              slot,
+              canvasChildType: canvasChild && typeof canvasChild === "object" && !Array.isArray(canvasChild) ? canvasChild.type : "none",
+              firstLayerItemsLength: Array.isArray(firstLayerItems) ? firstLayerItems.length : firstLayerItems
+            });
           }
           const existing = pendingSlots.get(slot) || [];
           existing.push({ pattern, props: props || {} });
@@ -44649,10 +44120,20 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         state: previousState
       };
       const sharedDeclared = runtime.collectDeclaredConfigDefaults(binding.trait);
-      const sharedCallSite = getBindingConfig(binding);
-      if (sharedDeclared || sharedCallSite) {
+      const sharedResolved = traitConfigsByName?.[traitName];
+      const sharedCallSiteRaw = getBindingConfig(binding);
+      const sharedCallSite = sharedCallSiteRaw ? runtime.resolveCallSitePayloadCaptures(
+        Object.fromEntries(
+          Object.entries(sharedCallSiteRaw).filter(
+            ([, v]) => !(typeof v === "string" && v.startsWith("@config."))
+          )
+        ),
+        payload || {}
+      ) : void 0;
+      if (sharedDeclared || sharedResolved || sharedCallSite) {
         sharedBindings.config = {
           ...sharedDeclared ?? {},
+          ...sharedResolved ?? {},
           ...sharedCallSite ?? {}
         };
       }
@@ -44686,7 +44167,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       ...handlers,
       set: async (targetId, field, value) => {
         if (baseSet) await baseSet(targetId, field, value);
-        log10.debug("set:write", {
+        log9.debug("set:write", {
           traitName,
           field,
           value: JSON.stringify(value),
@@ -44700,15 +44181,30 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       state: previousState
     };
     const declaredDefaults = runtime.collectDeclaredConfigDefaults(binding.trait);
+    const resolvedDefaults = traitConfigsByName?.[traitName];
     const callSiteConfig = getBindingConfig(binding);
-    if (declaredDefaults || callSiteConfig) {
+    const callSiteOverrides = callSiteConfig ? runtime.resolveCallSitePayloadCaptures(
+      Object.fromEntries(
+        Object.entries(callSiteConfig).filter(
+          ([, v]) => !(typeof v === "string" && v.startsWith("@config."))
+        )
+      ),
+      payload || {}
+    ) : void 0;
+    if (declaredDefaults || resolvedDefaults || callSiteOverrides) {
       bindingCtx.config = {
         ...declaredDefaults ?? {},
-        ...callSiteConfig ?? {}
+        ...resolvedDefaults ?? {},
+        ...callSiteOverrides ?? {}
       };
     }
     if (traitName === "Authority" || traitName === "Hero") {
-      console.log(`[debug:executeTransitionEffects] ${traitName} config tiles type=`, typeof bindingCtx.config?.tiles, Array.isArray(bindingCtx.config?.tiles) ? "len=" + bindingCtx.config?.tiles?.length : "", "keys=", bindingCtx.config ? Object.keys(bindingCtx.config) : "none");
+      sharedEntityLog.debug("executeTransitionEffects config tiles", {
+        traitName,
+        tilesType: typeof bindingCtx.config?.tiles,
+        tilesLength: Array.isArray(bindingCtx.config?.tiles) ? bindingCtx.config?.tiles?.length : void 0,
+        configKeys: bindingCtx.config ? Object.keys(bindingCtx.config) : void 0
+      });
     }
     const effectContext = {
       traitName,
@@ -44727,18 +44223,28 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       }
     };
     if (traitName === "Hero") {
-      console.log(`[debug:executeTransitionEffects] ${traitName} effects count=${effects.length} hasRenderUI=${typeof handlers.renderUI === "function"} effect heads=${effects.map((e) => Array.isArray(e) ? String(e[0]) : "??").join(",")}`);
+      sharedEntityLog.debug("executeTransitionEffects effects summary", {
+        traitName,
+        effectsCount: effects.length,
+        hasRenderUI: typeof handlers.renderUI === "function",
+        effectHeads: effects.map((e) => Array.isArray(e) ? String(e[0]) : "??")
+      });
     }
     const executor = new runtime.EffectExecutor({ handlers: trackingHandlers, bindings: bindingCtx, context: effectContext });
     try {
       await executor.executeAll(effects);
       if (traitName === "Authority" || traitName === "Hero") {
-        console.log(`[debug:executeTransitionEffects] ${traitName} after executeAll liveEntity.tiles type=`, typeof liveEntity.tiles, Array.isArray(liveEntity.tiles) ? "len=" + liveEntity.tiles?.length : "", "firstTilePos=", Array.isArray(liveEntity.tiles) && liveEntity.tiles.length > 0 ? JSON.stringify(liveEntity.tiles[0]).slice(0, 120) : "n/a");
+        sharedEntityLog.debug("executeTransitionEffects after executeAll", {
+          traitName,
+          tilesType: typeof liveEntity.tiles,
+          tilesLength: Array.isArray(liveEntity.tiles) ? liveEntity.tiles?.length : void 0,
+          firstTilePos: Array.isArray(liveEntity.tiles) && liveEntity.tiles.length > 0 ? JSON.stringify(liveEntity.tiles[0]).slice(0, 120) : void 0
+        });
       }
       if (sharedKey !== void 0) {
         sharedEntityStore.commit(sharedKey, liveEntity);
       }
-      log10.debug("effects:executed", () => ({
+      log9.debug("effects:executed", () => ({
         traitName,
         transition: `${previousState}->${newState}`,
         event: flushEvent,
@@ -44748,7 +44254,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         slotsTouched: Array.from(pendingSlots.keys()).join(",")
       }));
       for (const [slot, patterns] of pendingSlots) {
-        log10.debug("flush:slot", {
+        log9.debug("flush:slot", {
           traitName,
           slot,
           patternCount: patterns.length,
@@ -44763,7 +44269,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         });
       }
     } catch (error) {
-      log10.error("effects:error", {
+      log9.error("effects:error", {
         traitName,
         transition: `${previousState}->${newState}`,
         event: flushEvent,
@@ -44785,7 +44291,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         payload: {},
         state: currentState
       };
-      const bindingCfg = getBindingConfig(binding);
+      const bindingCfg = getBindingConfig(binding) ?? traitConfigsByName?.[traitName];
       if (bindingCfg) {
         guardCtx.config = bindingCfg;
       }
@@ -45148,17 +44654,19 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
   }, [traitBindings, eventBus, enqueueAndDrain]);
   React81.useEffect(() => {
     const mgr = managerRef.current;
-    const inited = initedTraitsRef.current;
+    const eventsToFire = /* @__PURE__ */ new Set();
     for (const binding of traitBindings) {
       const traitName = binding.trait.name;
-      if (inited.has(traitName)) continue;
       const lifecycleEvent = LIFECYCLE_EVENTS.find(
         (evt) => mgr.canHandleEvent(traitName, evt)
       );
-      if (lifecycleEvent === void 0) continue;
-      inited.add(traitName);
-      stateLog.debug("mount:fire-lifecycle", { traitName, event: lifecycleEvent });
-      enqueueAndDrain(lifecycleEvent, {});
+      if (lifecycleEvent !== void 0) {
+        eventsToFire.add(lifecycleEvent);
+      }
+    }
+    for (const event of eventsToFire) {
+      stateLog.debug("mount:fire-lifecycle", { event, traitCount: traitBindings.length });
+      enqueueAndDrain(event, {});
     }
     return () => {
       initedTraitsRef.current = /* @__PURE__ */ new Set();
@@ -45273,343 +44781,8 @@ init_Typography();
 init_UISlotRenderer();
 init_useEventBus();
 
-// lib/embedded-traits.ts
-var TRAIT_BINDING_PREFIX = "@trait.";
-function collectTraitRefsFromValue(value, into) {
-  if (value === null || value === void 0) return;
-  if (typeof value === "string") {
-    if (value.startsWith(TRAIT_BINDING_PREFIX)) {
-      const rest = value.slice(TRAIT_BINDING_PREFIX.length);
-      const dot = rest.indexOf(".");
-      const traitName = dot === -1 ? rest : rest.slice(0, dot);
-      if (traitName.length > 0) into.add(traitName);
-    }
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) collectTraitRefsFromValue(item, into);
-    return;
-  }
-  if (typeof value === "object") {
-    for (const v of Object.values(value)) {
-      collectTraitRefsFromValue(v, into);
-    }
-  }
-}
-function collectTraitRefsFromEffects(effects, into) {
-  if (!effects) return;
-  for (const effect of effects) {
-    if (!Array.isArray(effect)) continue;
-    if (effect[0] === "render-ui" && effect.length >= 3) {
-      collectTraitRefsFromValue(effect[2], into);
-      continue;
-    }
-    for (let i = 1; i < effect.length; i++) {
-      const arg = effect[i];
-      if (Array.isArray(arg)) collectTraitRefsFromEffects([arg], into);
-      else collectTraitRefsFromValue(arg, into);
-    }
-  }
-}
-function collectTraitRefsFromResolvedTrait(trait) {
-  const out = /* @__PURE__ */ new Set();
-  for (const transition of trait.transitions ?? []) {
-    collectTraitRefsFromEffects(transition.effects, out);
-  }
-  for (const tick of trait.ticks ?? []) {
-    collectTraitRefsFromEffects(tick.effects, out);
-  }
-  return out;
-}
-function collectEmbeddedTraits(schema) {
-  const out = /* @__PURE__ */ new Set();
-  if (!schema?.orbitals) return out;
-  for (const orbital of schema.orbitals) {
-    const traits2 = orbital.traits;
-    if (!Array.isArray(traits2)) continue;
-    for (const traitRef of traits2) {
-      if (!traitRef || typeof traitRef !== "object") continue;
-      const resolved = traitRef._resolved;
-      const target = resolved && typeof resolved === "object" ? resolved : traitRef;
-      if (target.config) {
-        collectTraitRefsFromValue(target.config, out);
-      }
-      const transitions = target.stateMachine?.transitions;
-      if (!Array.isArray(transitions)) continue;
-      for (const t of transitions) {
-        collectTraitRefsFromEffects(t.effects, out);
-      }
-      collectTraitRefsFromEffects(target.initialEffects, out);
-      const ticks2 = target.ticks;
-      if (Array.isArray(ticks2)) {
-        for (const tick of ticks2) {
-          collectTraitRefsFromEffects(tick.effects, out);
-        }
-      }
-    }
-  }
-  return out;
-}
-
-// lib/orbitalsByTrait.ts
-function buildOrbitalsByTrait(schema, resolvedPages = []) {
-  const map = {};
-  if (!schema?.orbitals) return map;
-  const pagePathToOrbital = {};
-  for (const orb of schema.orbitals) {
-    for (const traitRef of orb.traits ?? []) {
-      let traitName;
-      if (typeof traitRef === "string") {
-        const parts = traitRef.split(".");
-        traitName = parts[parts.length - 1];
-      } else if (typeof traitRef.ref === "string") {
-        const parts = traitRef.ref.split(".");
-        traitName = traitRef.name ?? parts[parts.length - 1];
-      } else if (typeof traitRef.name === "string") {
-        traitName = traitRef.name;
-      }
-      if (traitName) map[traitName] = orb.name;
-    }
-    for (const pg of orb.pages ?? []) {
-      const path = typeof pg === "string" ? pg : pg?.path;
-      if (path) pagePathToOrbital[path] = orb.name;
-    }
-  }
-  for (const page of resolvedPages) {
-    const orbital = page.path ? pagePathToOrbital[page.path] : void 0;
-    if (!orbital) continue;
-    for (const traitName of page.traitNames) {
-      if (traitName && !(traitName in map)) map[traitName] = orbital;
-    }
-  }
-  return map;
-}
-
 // runtime/OrbPreview.tsx
 init_verificationRegistry();
-var PERF_NAMESPACE = "almadar:perf:canvas";
-var log9 = logger.createLogger(PERF_NAMESPACE);
-var RING_SIZE = 50;
-var ring = [];
-var writeIdx = 0;
-var subscribers = /* @__PURE__ */ new Set();
-var notifyScheduled = false;
-var revision = 0;
-var cachedSnapshot = [];
-var cachedRevision = -1;
-function scheduleNotify() {
-  if (notifyScheduled) return;
-  notifyScheduled = true;
-  queueMicrotask(() => {
-    notifyScheduled = false;
-    revision++;
-    for (const fn of subscribers) fn();
-  });
-}
-function push(entry) {
-  if (ring.length < RING_SIZE) {
-    ring.push(entry);
-  } else {
-    ring[writeIdx] = entry;
-  }
-  writeIdx = (writeIdx + 1) % RING_SIZE;
-  scheduleNotify();
-}
-function isEnabled() {
-  return logger.isLogLevelEnabled("DEBUG", PERF_NAMESPACE);
-}
-function now() {
-  return typeof performance !== "undefined" && typeof performance.now === "function" ? performance.now() : Date.now();
-}
-function perfStart(name) {
-  if (!isEnabled()) return -1;
-  if (typeof performance !== "undefined" && typeof performance.mark === "function") {
-    try {
-      performance.mark(`${name}-start`);
-    } catch {
-    }
-  }
-  return now();
-}
-function perfEnd(name, startToken, detail) {
-  if (startToken < 0 || !isEnabled()) return;
-  const endTs = now();
-  const durationMs = endTs - startToken;
-  if (typeof performance !== "undefined" && typeof performance.measure === "function") {
-    try {
-      performance.mark(`${name}-end`);
-      performance.measure(name, `${name}-start`, `${name}-end`);
-    } catch {
-    }
-  }
-  push({ name, durationMs, ts: endTs, detail });
-  log9.debug(name, () => ({ durationMs, ...detail ?? {} }));
-}
-function perfTime(name, fn, detail) {
-  const t = perfStart(name);
-  try {
-    return fn();
-  } finally {
-    perfEnd(name, t, detail);
-  }
-}
-var profilerOnRender = (id, phase, actualDuration, baseDuration, _startTime, commitTime) => {
-  if (!isEnabled()) return;
-  push({
-    name: `profiler:${id}:${phase}`,
-    durationMs: actualDuration,
-    ts: commitTime,
-    detail: { baseDuration }
-  });
-  log9.debug(`profiler:${id}:${phase}`, () => ({ actualDuration, baseDuration }));
-};
-function getPerfSnapshot() {
-  if (ring.length < RING_SIZE) return ring.slice();
-  return [...ring.slice(writeIdx), ...ring.slice(0, writeIdx)];
-}
-function getSnapshot2() {
-  if (cachedRevision !== revision) {
-    cachedSnapshot = getPerfSnapshot();
-    cachedRevision = revision;
-  }
-  return cachedSnapshot;
-}
-function subscribe(fn) {
-  subscribers.add(fn);
-  return () => {
-    subscribers.delete(fn);
-  };
-}
-function usePerfBuffer() {
-  return React81.useSyncExternalStore(subscribe, getSnapshot2, getSnapshot2);
-}
-function clearPerf() {
-  ring.length = 0;
-  writeIdx = 0;
-  scheduleNotify();
-}
-
-// lib/prepareSchemaForPreview.ts
-function generateEntityRow(entity, idx) {
-  const row = { id: String(idx) };
-  for (const f3 of entity.fields) {
-    if (f3.name === void 0 || f3.name === "id") continue;
-    row[f3.name] = generateFieldValue(entity.name, f3, idx);
-  }
-  return row;
-}
-function generateFieldValue(entityName, field, idx) {
-  if ("values" in field && field.values && field.values.length > 0) {
-    return field.values[(idx - 1) % field.values.length];
-  }
-  const fieldName = field.name ?? "";
-  switch (field.type) {
-    case "string":
-      return `${entityName} ${fieldName.charAt(0).toUpperCase() + fieldName.slice(1)} ${idx}`;
-    case "number":
-      return idx * 10;
-    case "boolean":
-      return idx % 2 === 0;
-    default:
-      return field.default ?? null;
-  }
-}
-function buildMockData(schema) {
-  const t = perfStart("build-mock-data");
-  const result = {};
-  for (const orbital of schema.orbitals) {
-    const entity = orbital.entity;
-    if (!entity || typeof entity === "string") continue;
-    if (core.isEntityCall(entity)) continue;
-    const entityName = entity.name;
-    if (!entityName) continue;
-    if (entity.instances && entity.instances.length > 0) {
-      result[entityName] = entity.instances;
-      continue;
-    }
-    const rows = Array.from(
-      { length: 10 },
-      (_, i) => generateEntityRow(entity, i + 1)
-    );
-    result[entityName] = rows;
-  }
-  for (const orbital of schema.orbitals) {
-    for (const traitRef of orbital.traits ?? []) {
-      if (!isInlineTrait3(traitRef)) continue;
-      const trait = traitRef;
-      const sourceEntity = trait.sourceEntityDefinition;
-      if (!sourceEntity || core.isEntityCall(sourceEntity)) continue;
-      const sourceName = sourceEntity.name;
-      if (!sourceName) continue;
-      if (!result[sourceName]) {
-        result[sourceName] = sourceEntity.instances && sourceEntity.instances.length > 0 ? sourceEntity.instances : Array.from(
-          { length: 10 },
-          (_, i) => generateEntityRow(sourceEntity, i + 1)
-        );
-      }
-      const reboundName = trait.linkedEntity;
-      if (!reboundName || reboundName === sourceName) continue;
-      const reboundRows = result[reboundName];
-      if (!reboundRows || reboundRows.length === 0) continue;
-      reboundRows.forEach((row, i) => {
-        for (const f3 of sourceEntity.fields) {
-          if (f3.name === void 0 || f3.name === "id") continue;
-          if (row[f3.name] !== void 0) continue;
-          row[f3.name] = generateFieldValue(sourceName, f3, i + 1);
-        }
-      });
-    }
-  }
-  perfEnd("build-mock-data", t, { orbitalCount: schema.orbitals.length, entityCount: Object.keys(result).length });
-  return result;
-}
-function isInlineTrait3(traitRef) {
-  return typeof traitRef === "object" && traitRef !== null && "stateMachine" in traitRef;
-}
-function findDataState(sm, initialStateName) {
-  return sm.states.find((s) => {
-    if (s.name === initialStateName) return false;
-    return sm.transitions.some(
-      (t) => t.event === "INIT" && (t.from === s.name || Array.isArray(t.from) && t.from.includes(s.name))
-    );
-  });
-}
-function rewriteTraitInitialState(trait, mockData) {
-  const sm = trait.stateMachine;
-  if (!sm) return trait;
-  const linkedEntity = trait.linkedEntity;
-  if (!linkedEntity || !mockData[linkedEntity]?.length) return trait;
-  const initialStateName = sm.states.find((s) => s.isInitial)?.name ?? sm.states[0]?.name;
-  if (!initialStateName) return trait;
-  const dataState = findDataState(sm, initialStateName);
-  if (!dataState) return trait;
-  const updatedStates = sm.states.map((s) => {
-    if (s.name === initialStateName) return { ...s, isInitial: false };
-    if (s.name === dataState.name) return { ...s, isInitial: true };
-    return s;
-  });
-  return { ...trait, stateMachine: { ...sm, states: updatedStates } };
-}
-function adjustSchemaForMockData(schema, mockData) {
-  let changed = false;
-  const updatedOrbitals = schema.orbitals.map((orbital) => {
-    const traits2 = orbital.traits ?? [];
-    const updatedTraits = traits2.map((traitRef) => {
-      if (!isInlineTrait3(traitRef)) return traitRef;
-      const updated = rewriteTraitInitialState(traitRef, mockData);
-      if (updated !== traitRef) changed = true;
-      return updated;
-    });
-    return changed ? { ...orbital, traits: updatedTraits } : orbital;
-  });
-  return changed ? { ...schema, orbitals: updatedOrbitals } : schema;
-}
-function prepareSchemaForPreview(input) {
-  const parsed = typeof input === "string" ? JSON.parse(input) : input;
-  const mockData = buildMockData(parsed);
-  const schema = adjustSchemaForMockData(parsed, mockData);
-  return { schema, mockData };
-}
 var xOrbitalLog = logger.createLogger("almadar:runtime:cross-orbital");
 var navLog = logger.createLogger("almadar:runtime:navigation");
 function normalizeChild(child) {
@@ -45697,6 +44870,7 @@ function TraitInitializer({ traits: traits2, orbitalNames, onNavigate, onLocalFa
       hadPrev: prevTraitsRef.current !== void 0
     }));
     if (refChanged) {
+      navLog.info("page:traits-reset", { traitsCount: Array.isArray(traits2) ? traits2.length : -1 });
       uiSlots.clearAll();
       initSentRef.current = false;
     }
@@ -45775,7 +44949,7 @@ function SchemaRunner({ schema, serverUrl, transport, mockData, pageName, onNavi
     while (queue.length > 0) {
       const binding = queue.shift();
       if (!binding) continue;
-      for (const refName of collectTraitRefsFromResolvedTrait(binding.trait)) {
+      for (const refName of ui.collectTraitRefsFromResolvedTrait(binding.trait)) {
         if (byName.has(refName)) continue;
         const rt = allTraits.get(refName);
         if (!rt) continue;
@@ -45793,7 +44967,7 @@ function SchemaRunner({ schema, serverUrl, transport, mockData, pageName, onNavi
     return orbitals.map((o) => o.name);
   }, [schema]);
   const orbitalsByTrait = React81.useMemo(
-    () => buildOrbitalsByTrait(
+    () => ui.buildOrbitalsByTrait(
       schema,
       ir ? Array.from(ir.pages.values()).map((p) => ({
         path: p.path,
@@ -45842,26 +45016,12 @@ function SchemaRunner({ schema, serverUrl, transport, mockData, pageName, onNavi
       pageOrbitalNames: pageOrbitalNames.join(",")
     });
   }, [pageName, allPageTraits, orbitalsByTrait, pageOrbitalNames]);
-  const traitConfigsByName = React81.useMemo(() => {
-    const map = {};
-    const orbitals = schema?.orbitals;
-    if (!orbitals) return map;
-    for (const orb of orbitals) {
-      const traitRefs = orb.traits;
-      if (!traitRefs) continue;
-      for (const t of traitRefs) {
-        if (typeof t === "string") continue;
-        const name = t.name ?? t.ref;
-        const config = t.config;
-        if (typeof name === "string" && config !== void 0) {
-          map[name] = config;
-        }
-      }
-    }
-    return map;
-  }, [schema]);
+  const traitConfigsByName = React81.useMemo(
+    () => core.buildResolvedTraitConfigs(schema),
+    [schema]
+  );
   const embeddedTraits = React81.useMemo(() => {
-    const set = collectEmbeddedTraits(schema);
+    const set = ui.collectEmbeddedTraits(schema);
     xOrbitalLog.info("SchemaRunner:embeddedTraits", {
       pageName,
       embedded: Array.from(set),
@@ -45946,7 +45106,7 @@ function OrbPreview({
       parsed = schema;
     }
     if (autoMock && !serverUrl && !transport) {
-      const prepared = prepareSchemaForPreview(parsed);
+      const prepared = ui.prepareSchemaForPreview(parsed);
       return { ok: true, schema: prepared.schema, mockData: prepared.mockData };
     }
     return { ok: true, schema: parsed, mockData: mockData ?? {} };
@@ -46121,6 +45281,17 @@ function BrowserPlayground({
     }
   );
 }
+function usePerfBuffer() {
+  return React81.useSyncExternalStore(ui.perfStore.subscribe, ui.perfStore.getSnapshot, ui.perfStore.getSnapshot);
+}
+var profilerOnRender = (id, phase, actualDuration, baseDuration, _startTime, commitTime) => {
+  ui.pushPerfEntry({
+    name: `profiler:${id}:${phase}`,
+    durationMs: actualDuration,
+    ts: commitTime,
+    detail: { baseDuration }
+  });
+};
 
 Object.defineProperty(exports, "EntitySchemaProvider", {
   enumerable: true,
@@ -46158,20 +45329,47 @@ Object.defineProperty(exports, "useTraitContext", {
   enumerable: true,
   get: function () { return providers.useTraitContext; }
 });
+Object.defineProperty(exports, "PERF_NAMESPACE", {
+  enumerable: true,
+  get: function () { return ui.PERF_NAMESPACE; }
+});
+Object.defineProperty(exports, "adjustSchemaForMockData", {
+  enumerable: true,
+  get: function () { return ui.adjustSchemaForMockData; }
+});
+Object.defineProperty(exports, "buildMockData", {
+  enumerable: true,
+  get: function () { return ui.buildMockData; }
+});
+Object.defineProperty(exports, "clearPerf", {
+  enumerable: true,
+  get: function () { return ui.clearPerf; }
+});
+Object.defineProperty(exports, "perfEnd", {
+  enumerable: true,
+  get: function () { return ui.perfEnd; }
+});
+Object.defineProperty(exports, "perfStart", {
+  enumerable: true,
+  get: function () { return ui.perfStart; }
+});
+Object.defineProperty(exports, "perfTime", {
+  enumerable: true,
+  get: function () { return ui.perfTime; }
+});
+Object.defineProperty(exports, "prepareSchemaForPreview", {
+  enumerable: true,
+  get: function () { return ui.prepareSchemaForPreview; }
+});
+Object.defineProperty(exports, "wrapCallbackForEvent", {
+  enumerable: true,
+  get: function () { return ui.wrapCallbackForEvent; }
+});
 exports.BrowserPlayground = BrowserPlayground;
 exports.OrbPreview = OrbPreview;
-exports.PERF_NAMESPACE = PERF_NAMESPACE;
-exports.adjustSchemaForMockData = adjustSchemaForMockData;
-exports.buildMockData = buildMockData;
-exports.clearPerf = clearPerf;
 exports.clearSchemaCache = clearSchemaCache;
 exports.createClientEffectHandlers = createClientEffectHandlers;
-exports.perfEnd = perfEnd;
-exports.perfStart = perfStart;
-exports.perfTime = perfTime;
-exports.prepareSchemaForPreview = prepareSchemaForPreview;
 exports.profilerOnRender = profilerOnRender;
 exports.usePerfBuffer = usePerfBuffer;
 exports.useResolvedSchema = useResolvedSchema;
 exports.useTraitStateMachine = useTraitStateMachine;
-exports.wrapCallbackForEvent = wrapCallbackForEvent;