@almadar/ui 5.79.2 → 5.81.0

package/dist/components/index.js

@@ -40,8 +40,8 @@ import { isInlineTrait } from '@almadar/core';
 import { DndContext, useSensors, useSensor, PointerSensor, KeyboardSensor, useDroppable, pointerWithin, rectIntersection, closestCorners } from '@dnd-kit/core';
 import { useSortable, arrayMove, sortableKeyboardCoordinates, SortableContext, rectSortingStrategy, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { getPatternDefinition as getPatternDefinition$1, getComponentForPattern } from '@almadar/patterns';
 import { useNodeId, ReactFlowProvider, Handle, Position } from '@xyflow/react';
+import { getPatternDefinition as getPatternDefinition$1, getComponentForPattern as getComponentForPattern$1 } from '@almadar/patterns';
 import { useQuery, useQueryClient, useMutation } from '@tanstack/react-query';
 
 var __defProp = Object.defineProperty;
@@ -7926,6 +7926,38 @@ var init_Accordion = __esm({
     Accordion.displayName = "Accordion";
   }
 });
+function GameIcon({ assetUrl, icon, size = "md", alt, className }) {
+  const px = typeof size === "number" ? size : sizeMap[size];
+  if (assetUrl?.url) {
+    return /* @__PURE__ */ jsx(
+      "img",
+      {
+        src: assetUrl.url,
+        alt: alt ?? assetUrl.category ?? "",
+        width: px,
+        height: px,
+        style: { imageRendering: "pixelated", objectFit: "contain", width: px, height: px },
+        className: cn("flex-shrink-0", className)
+      }
+    );
+  }
+  const I = typeof icon === "string" ? resolveIcon(icon) : icon;
+  return /* @__PURE__ */ jsx(I, { width: px, height: px, className: cn("flex-shrink-0", className) });
+}
+var sizeMap;
+var init_GameIcon = __esm({
+  "components/game/2d/atoms/GameIcon.tsx"() {
+    "use client";
+    init_cn();
+    init_Icon();
+    sizeMap = {
+      sm: 16,
+      md: 24,
+      lg: 32
+    };
+    GameIcon.displayName = "GameIcon";
+  }
+});
 function ActionButton({
   assetUrl = DEFAULT_ASSET_URL,
   label = "Attack",
@@ -7936,18 +7968,23 @@ function ActionButton({
   size = "md",
   variant = "primary",
   onClick,
+  action,
   className
 }) {
-  const sizes = sizeMap[size];
+  const eventBus = useEventBus();
+  const sizes = sizeMap2[size];
   const onCooldown = cooldown > 0;
   const isDisabled = disabled || onCooldown;
   const cooldownDeg = Math.round(cooldown * 360);
   return /* @__PURE__ */ jsxs(
-    "button",
+    Button,
     {
-      type: "button",
+      variant: variant === "danger" ? "danger" : variant === "secondary" ? "secondary" : "primary",
       disabled: isDisabled,
-      onClick,
+      onClick: () => {
+        if (action) eventBus.emit(`UI:${action}`, {});
+        onClick?.();
+      },
       className: cn(
         "relative inline-flex items-center gap-1.5 rounded-interactive border font-medium overflow-hidden transition-colors duration-150",
         sizes.button,
@@ -7957,9 +7994,10 @@ function ActionButton({
       ),
       children: [
         onCooldown && /* @__PURE__ */ jsx(
-          "div",
+          Box,
           {
-            className: "absolute inset-0 bg-foreground/40 pointer-events-none",
+            position: "absolute",
+            className: "inset-0 bg-foreground/40 pointer-events-none",
             style: {
               clipPath: `conic-gradient(from 0deg, transparent ${360 - cooldownDeg}deg, black ${360 - cooldownDeg}deg)`,
               WebkitClipPath: `conic-gradient(from 0deg, transparent ${360 - cooldownDeg}deg, black ${360 - cooldownDeg}deg)`,
@@ -7967,27 +8005,18 @@ function ActionButton({
             }
           }
         ),
-        assetUrl ? /* @__PURE__ */ jsx(
-          "img",
-          {
-            src: assetUrl.url,
-            alt: "",
-            width: 16,
-            height: 16,
-            style: { imageRendering: "pixelated", objectFit: "contain" },
-            className: cn("flex-shrink-0", sizes.icon)
-          }
-        ) : icon ? /* @__PURE__ */ jsx("span", { className: cn("flex-shrink-0", sizes.icon), children: typeof icon === "string" ? (() => {
+        assetUrl ? /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: 16, className: cn("flex-shrink-0", sizes.icon) }) : icon ? /* @__PURE__ */ jsx(Box, { as: "span", className: cn("flex-shrink-0", sizes.icon), children: typeof icon === "string" ? (() => {
           const I = resolveIcon(icon);
           return I ? /* @__PURE__ */ jsx(I, { className: "w-4 h-4" }) : null;
         })() : /* @__PURE__ */ (() => {
           const I = icon;
           return /* @__PURE__ */ jsx(I, { className: "w-4 h-4" });
         })() }) : null,
-        /* @__PURE__ */ jsx("span", { className: "relative z-10", children: label }),
+        /* @__PURE__ */ jsx(Typography, { as: "span", className: "relative z-10", children: label }),
         hotkey && /* @__PURE__ */ jsx(
-          "span",
+          Typography,
           {
+            as: "span",
             className: cn(
               "absolute top-0.5 right-0.5 bg-foreground/30 text-primary-foreground rounded font-mono leading-tight",
               sizes.hotkey
@@ -7999,12 +8028,17 @@ function ActionButton({
     }
   );
 }
-var sizeMap, variantStyles7, DEFAULT_ASSET_URL;
+var sizeMap2, variantStyles7, DEFAULT_ASSET_URL;
 var init_ActionButton = __esm({
   "components/game/2d/atoms/ActionButton.tsx"() {
     init_cn();
     init_Icon();
-    sizeMap = {
+    init_useEventBus();
+    init_Button();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
+    sizeMap2 = {
       sm: { button: "h-button-sm px-3 text-xs", hotkey: "text-[9px] px-1", icon: "text-xs" },
       md: { button: "h-button-md px-4 text-sm", hotkey: "text-xs px-1.5", icon: "text-sm" },
       lg: { button: "h-button-lg px-5 text-base", hotkey: "text-xs px-2", icon: "text-base" }
@@ -8057,7 +8091,7 @@ function ActionTile({
       draggable: !disabled,
       onDragStart: handleDragStart,
       children: [
-        action.iconUrl ? /* @__PURE__ */ jsx("img", { src: action.iconUrl, alt: "", className: "w-8 h-8 object-contain" }) : /* @__PURE__ */ jsx(Typography, { variant: "body1", className: cn(config.icon, "leading-none"), children: action.iconEmoji || "\u2726" }),
+        action.iconUrl ? /* @__PURE__ */ jsx("img", { src: action.iconUrl.url, alt: "", className: "w-8 h-8 object-contain" }) : /* @__PURE__ */ jsx(Typography, { variant: "body1", className: cn(config.icon, "leading-none"), children: action.iconEmoji || "\u2726" }),
         /* @__PURE__ */ jsx(Typography, { variant: "caption", className: cn(config.text, "text-foreground font-medium whitespace-nowrap"), children: action.name })
       ]
     }
@@ -8661,9 +8695,26 @@ function MiniMap({
   mapWidth = 100,
   mapHeight = 100,
   viewportRect = DEFAULT_VIEWPORT,
-  className
+  className,
+  tileAssets,
+  unitAssets
 }) {
   const canvasRef = React79.useRef(null);
+  const imgCacheRef = React79.useRef(/* @__PURE__ */ new Map());
+  function loadImg(url) {
+    const cached = imgCacheRef.current.get(url);
+    if (cached) return cached.complete ? cached : null;
+    const img = new Image();
+    img.src = url;
+    img.onload = () => {
+      const canvas = canvasRef.current;
+      if (!canvas) return;
+      const ctx = canvas.getContext("2d");
+      if (ctx) ctx.clearRect(0, 0, 0, 0);
+    };
+    imgCacheRef.current.set(url, img);
+    return null;
+  }
   React79.useEffect(() => {
     const canvas = canvasRef.current;
     if (!canvas) return;
@@ -8675,20 +8726,31 @@ function MiniMap({
     ctx.fillStyle = "#111";
     ctx.fillRect(0, 0, width, height);
     for (const tile of tiles) {
-      ctx.fillStyle = tile.color;
-      ctx.fillRect(
-        Math.floor(tile.x * scaleX2),
-        Math.floor(tile.y * scaleY2),
-        Math.max(1, Math.ceil(scaleX2)),
-        Math.max(1, Math.ceil(scaleY2))
-      );
+      const tileAsset = tileAssets?.[tile.color] ?? tileAssets?.["default"];
+      const tileImg = tileAsset ? loadImg(tileAsset.url) : null;
+      const tx = Math.floor(tile.x * scaleX2);
+      const ty = Math.floor(tile.y * scaleY2);
+      const tw = Math.max(1, Math.ceil(scaleX2));
+      const th = Math.max(1, Math.ceil(scaleY2));
+      if (tileImg) {
+        ctx.drawImage(tileImg, tx, ty, tw, th);
+      } else {
+        ctx.fillStyle = tile.color;
+        ctx.fillRect(tx, ty, tw, th);
+      }
     }
     for (const unit of units) {
       if (unit.isPlayer) continue;
-      ctx.fillStyle = unit.color;
+      const unitAsset = unitAssets?.[unit.color] ?? unitAssets?.["default"];
+      const unitImg = unitAsset ? loadImg(unitAsset.url) : null;
       const ux = Math.floor(unit.x * scaleX2) - 1;
       const uy = Math.floor(unit.y * scaleY2) - 1;
-      ctx.fillRect(ux, uy, 3, 3);
+      if (unitImg) {
+        ctx.drawImage(unitImg, ux, uy, 5, 5);
+      } else {
+        ctx.fillStyle = unit.color;
+        ctx.fillRect(ux, uy, 3, 3);
+      }
     }
     if (viewportRect) {
       ctx.strokeStyle = "#ffffff";
@@ -8700,7 +8762,7 @@ function MiniMap({
         Math.floor(viewportRect.h * scaleY2)
       );
     }
-  }, [tiles, units, width, height, mapWidth, mapHeight, viewportRect]);
+  }, [tiles, units, width, height, mapWidth, mapHeight, viewportRect, tileAssets, unitAssets]);
   const scaleX = width / mapWidth;
   const scaleY = height / mapHeight;
   const playerUnit = units.find((u) => u.isPlayer);
@@ -8709,10 +8771,12 @@ function MiniMap({
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx("style", { children: `@keyframes minimap-blink{0%,49%{opacity:1}50%,100%{opacity:0}}` }),
     /* @__PURE__ */ jsxs(
-      "div",
+      Box,
       {
+        position: "relative",
+        display: "inline-block",
         className: cn(
-          "relative inline-block border border-border/20 rounded-container",
+          "border border-border/20 rounded-container",
           className
         ),
         children: [
@@ -8727,10 +8791,10 @@ function MiniMap({
             }
           ),
           playerLeft !== null && playerTop !== null && /* @__PURE__ */ jsx(
-            "div",
+            Box,
             {
+              position: "absolute",
               style: {
-                position: "absolute",
                 left: playerLeft,
                 top: playerTop,
                 width: 3,
@@ -8751,6 +8815,7 @@ var init_MiniMap = __esm({
   "components/game/2d/atoms/MiniMap.tsx"() {
     "use client";
     init_cn();
+    init_Box();
     DEFAULT_TILES = [
       { x: 10, y: 10, color: "#4ade80" },
       { x: 20, y: 15, color: "#4ade80" },
@@ -8777,14 +8842,17 @@ function HealthBar({
   labelSuffix,
   size = "md",
   className,
-  animated = true
+  animated = true,
+  frameAsset,
+  fillAsset
 }) {
-  const sizes = sizeMap2[size];
+  const sizes = sizeMap3[size];
   const percentage = max > 0 ? Math.max(0, Math.min(100, current / max * 100)) : 0;
   if (format === "hearts") {
-    return /* @__PURE__ */ jsx("div", { className: cn("flex items-center gap-1", className), children: Array.from({ length: max }).map((_, i) => /* @__PURE__ */ jsx(
-      "span",
+    return /* @__PURE__ */ jsx(Box, { className: cn("flex items-center gap-1", className), children: Array.from({ length: max }).map((_, i) => /* @__PURE__ */ jsx(
+      Box,
       {
+        as: "span",
         className: cn(animated && "transition-transform hover:scale-110"),
         children: heartIcon(i < current, sizes.heart)
       },
@@ -8793,33 +8861,42 @@ function HealthBar({
   }
   if (format === "bar") {
     return /* @__PURE__ */ jsx(
-      "div",
+      Box,
       {
+        position: "relative",
+        overflow: "hidden",
         className: cn(
-          "relative overflow-hidden rounded-full bg-muted",
+          "rounded-full",
+          !frameAsset && "bg-muted",
           sizes.bar,
           "w-24",
           className
         ),
+        style: frameAsset ? { backgroundImage: `url(${frameAsset.url})`, backgroundSize: "100% 100%" } : void 0,
         children: /* @__PURE__ */ jsx(
-          "div",
+          Box,
           {
+            position: "absolute",
             className: cn(
-              "absolute inset-y-0 left-0 rounded-full",
-              percentage > 66 ? "bg-success" : percentage > 33 ? "bg-warning" : "bg-error",
+              "inset-y-0 left-0 rounded-full",
+              !fillAsset && (percentage > 66 ? "bg-success" : percentage > 33 ? "bg-warning" : "bg-error"),
               animated && "transition-all duration-300"
             ),
-            style: { width: `${percentage}%` }
+            style: {
+              width: `${percentage}%`,
+              ...fillAsset ? { backgroundImage: `url(${fillAsset.url})`, backgroundSize: "auto 100%" } : {}
+            }
           }
         )
       }
     );
   }
   if (format === "progress") {
-    return /* @__PURE__ */ jsxs("div", { className: cn("flex items-center gap-2", className), children: [
+    return /* @__PURE__ */ jsxs(Box, { className: cn("flex items-center gap-2", className), children: [
       level != null && /* @__PURE__ */ jsxs(
-        "span",
+        Typography,
         {
+          as: "span",
           className: cn(
             "flex-shrink-0 rounded-interactive font-bold",
             "bg-accent text-accent-foreground border border-accent",
@@ -8831,28 +8908,35 @@ function HealthBar({
           ]
         }
       ),
-      /* @__PURE__ */ jsxs("div", { className: "flex-1 flex flex-col gap-0.5", children: [
+      /* @__PURE__ */ jsxs(Box, { className: "flex-1 flex flex-col gap-0.5", children: [
         /* @__PURE__ */ jsx(
-          "div",
+          Box,
           {
+            position: "relative",
             className: cn(
-              "relative w-full overflow-hidden rounded-full bg-muted border border-muted",
+              "w-full overflow-hidden rounded-full",
+              !frameAsset && "bg-muted border border-muted",
               sizes.bar
             ),
+            style: frameAsset ? { backgroundImage: `url(${frameAsset.url})`, backgroundSize: "100% 100%" } : void 0,
             children: /* @__PURE__ */ jsx(
-              "div",
+              Box,
               {
+                position: "absolute",
                 className: cn(
-                  "absolute inset-y-0 left-0 rounded-full",
-                  "bg-gradient-to-r from-accent to-info",
+                  "inset-y-0 left-0 rounded-full",
+                  !fillAsset && "bg-gradient-to-r from-accent to-info",
                   animated && "transition-all duration-500 ease-out"
                 ),
-                style: { width: `${percentage}%` }
+                style: {
+                  width: `${percentage}%`,
+                  ...fillAsset ? { backgroundImage: `url(${fillAsset.url})`, backgroundSize: "auto 100%" } : {}
+                }
               }
             )
           }
         ),
-        showLabel && /* @__PURE__ */ jsxs("span", { className: cn("text-foreground/70 tabular-nums", sizes.label), children: [
+        showLabel && /* @__PURE__ */ jsxs(Typography, { as: "span", className: cn("text-foreground/70 tabular-nums", sizes.label), children: [
           current,
           " / ",
           max,
@@ -8861,16 +8945,18 @@ function HealthBar({
       ] })
     ] });
   }
-  return /* @__PURE__ */ jsxs("span", { className: cn("font-mono font-bold", sizes.text, className), children: [
+  return /* @__PURE__ */ jsxs(Typography, { as: "span", className: cn("font-mono font-bold", sizes.text, className), children: [
     current,
     "/",
     max
   ] });
 }
-var heartIcon, sizeMap2;
+var heartIcon, sizeMap3;
 var init_HealthBar = __esm({
   "components/game/2d/atoms/HealthBar.tsx"() {
     init_cn();
+    init_Box();
+    init_Typography();
     heartIcon = (filled, size) => /* @__PURE__ */ jsx(
       "svg",
       {
@@ -8882,7 +8968,7 @@ var init_HealthBar = __esm({
         children: /* @__PURE__ */ jsx("path", { d: "M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" })
       }
     );
-    sizeMap2 = {
+    sizeMap3 = {
       sm: { heart: "w-4 h-4", bar: "h-2", text: "text-sm", label: "text-xs", badge: "text-xs px-1.5 py-0.5" },
       md: { heart: "w-6 h-6", bar: "h-3", text: "text-base", label: "text-xs", badge: "text-xs px-2 py-0.5" },
       lg: { heart: "w-8 h-8", bar: "h-4", text: "text-lg", label: "text-sm", badge: "text-sm px-2.5 py-1" }
@@ -10670,10 +10756,11 @@ function Canvas2D({
             }
           }
         ),
-        process.env.NODE_ENV !== "production" && /* @__PURE__ */ jsxs("div", { "data-game-actions": "", className: "sr-only", "aria-hidden": "true", children: [
+        process.env.NODE_ENV !== "production" && /* @__PURE__ */ jsxs(Box, { "data-game-actions": "", className: "sr-only", "aria-hidden": "true", children: [
           tileClickEvent && /* @__PURE__ */ jsx(
-            "button",
+            Button,
             {
+              variant: "ghost",
               "data-event": tileClickEvent,
               "data-x": "0",
               "data-y": "0",
@@ -10682,8 +10769,9 @@ function Canvas2D({
             }
           ),
           unitClickEvent && units && units.length > 0 && /* @__PURE__ */ jsx(
-            "button",
+            Button,
             {
+              variant: "ghost",
               "data-event": unitClickEvent,
               "data-unit-id": units[0].id,
               onClick: () => eventBus.emit(`UI:${unitClickEvent}`, { unitId: units[0].id }),
@@ -10692,15 +10780,17 @@ function Canvas2D({
           )
         ] }),
         unitOverlays.map(({ unit, screenX, screenY }) => /* @__PURE__ */ jsxs(
-          "div",
+          Box,
           {
-            className: "absolute pointer-events-none",
+            position: "absolute",
+            className: "pointer-events-none",
             style: { left: Math.round(screenX), top: Math.round(screenY), transform: "translate(-50%, 0)", zIndex: 5 },
             children: [
               unit.name && /* @__PURE__ */ jsx(
-                "div",
+                Typography,
                 {
-                  className: "text-white text-xs font-bold px-1.5 py-0.5 rounded mb-0.5 whitespace-nowrap",
+                  as: "span",
+                  className: "text-white text-xs font-bold px-1.5 py-0.5 rounded mb-0.5 whitespace-nowrap block",
                   style: { background: unit.team === "player" ? "rgba(59,130,246,0.9)" : unit.team === "enemy" ? "rgba(239,68,68,0.9)" : "rgba(107,114,128,0.9)" },
                   children: unit.name
                 }
@@ -10710,7 +10800,7 @@ function Canvas2D({
           },
           unit.id
         )),
-        showMinimap && /* @__PURE__ */ jsx("div", { className: "absolute bottom-2 right-2 pointer-events-none", style: { zIndex: 10 }, children: /* @__PURE__ */ jsx(
+        showMinimap && /* @__PURE__ */ jsx(Box, { position: "absolute", className: "bottom-2 right-2 pointer-events-none", style: { zIndex: 10 }, children: /* @__PURE__ */ jsx(
           MiniMap,
           {
             tiles: miniMapTiles,
@@ -10732,6 +10822,7 @@ var init_Canvas2D = __esm({
     init_cn();
     init_useEventBus();
     init_Box();
+    init_Button();
     init_Stack();
     init_Icon();
     init_Typography();
@@ -12629,9 +12720,9 @@ var init_BiologyCanvas = __esm({
   }
 });
 
-// node_modules/.pnpm/katex@0.16.47/node_modules/katex/dist/katex.min.css
+// node_modules/katex/dist/katex.min.css
 var init_katex_min = __esm({
-  "node_modules/.pnpm/katex@0.16.47/node_modules/katex/dist/katex.min.css"() {
+  "node_modules/katex/dist/katex.min.css"() {
   }
 });
 var Tabs;
@@ -17109,38 +17200,6 @@ var init_Breadcrumb = __esm({
     Breadcrumb.displayName = "Breadcrumb";
   }
 });
-function GameIcon({ assetUrl, icon, size = "md", alt, className }) {
-  const px = typeof size === "number" ? size : sizeMap3[size];
-  if (assetUrl?.url) {
-    return /* @__PURE__ */ jsx(
-      "img",
-      {
-        src: assetUrl.url,
-        alt: alt ?? assetUrl.category ?? "",
-        width: px,
-        height: px,
-        style: { imageRendering: "pixelated", objectFit: "contain", width: px, height: px },
-        className: cn("flex-shrink-0", className)
-      }
-    );
-  }
-  const I = typeof icon === "string" ? resolveIcon(icon) : icon;
-  return /* @__PURE__ */ jsx(I, { width: px, height: px, className: cn("flex-shrink-0", className) });
-}
-var sizeMap3;
-var init_GameIcon = __esm({
-  "components/game/2d/atoms/GameIcon.tsx"() {
-    "use client";
-    init_cn();
-    init_Icon();
-    sizeMap3 = {
-      sm: 16,
-      md: 24,
-      lg: 32
-    };
-    GameIcon.displayName = "GameIcon";
-  }
-});
 function BuilderBoard({
   entity,
   completeEvent = "PUZZLE_COMPLETE",
@@ -18972,9 +19031,9 @@ function GameCard({
   }, [disabled, id, onClick, clickEvent, eventBus]);
   const artPx = artPxMap[size];
   return /* @__PURE__ */ jsxs(
-    "button",
+    Button,
     {
-      type: "button",
+      variant: "ghost",
       onClick: handleClick,
       disabled,
       title: name,
@@ -18988,8 +19047,9 @@ function GameCard({
       ),
       children: [
         cost != null && /* @__PURE__ */ jsx(
-          "span",
+          Typography,
           {
+            as: "span",
             className: cn(
               "absolute -top-2 -left-2 flex items-center justify-center",
               "min-w-[22px] h-[22px] rounded-full px-1",
@@ -18998,17 +19058,7 @@ function GameCard({
             children: cost
           }
         ),
-        /* @__PURE__ */ jsx(Box, { className: "flex-1 flex items-center justify-center w-full", children: art ? /* @__PURE__ */ jsx(
-          "img",
-          {
-            src: art.url,
-            alt: name ?? id,
-            width: artPx,
-            height: artPx,
-            style: { imageRendering: "pixelated", objectFit: "contain" },
-            className: "flex-shrink-0"
-          }
-        ) : /* @__PURE__ */ jsx(Box, { className: "rounded bg-muted/40", style: { width: artPx, height: artPx } }) }),
+        /* @__PURE__ */ jsx(Box, { className: "flex-1 flex items-center justify-center w-full", children: art ? /* @__PURE__ */ jsx(GameIcon, { assetUrl: art, icon: "image", size: artPx, alt: name ?? id, className: "flex-shrink-0" }) : /* @__PURE__ */ jsx(Box, { className: "rounded bg-muted/40", style: { width: artPx, height: artPx } }) }),
         name != null && /* @__PURE__ */ jsx(
           Typography,
           {
@@ -19018,8 +19068,8 @@ function GameCard({
           }
         ),
         (attack != null || defense != null) && /* @__PURE__ */ jsxs(Box, { className: "flex w-full items-center justify-between px-0.5 text-[10px] font-bold leading-none", children: [
-          /* @__PURE__ */ jsx("span", { className: "text-error", children: attack != null ? `\u2694${attack}` : "" }),
-          /* @__PURE__ */ jsx("span", { className: "text-info", children: defense != null ? `\u{1F6E1}${defense}` : "" })
+          /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-error", children: attack != null ? `\u2694${attack}` : "" }),
+          /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-info", children: defense != null ? `\u{1F6E1}${defense}` : "" })
         ] })
       ]
     }
@@ -19032,7 +19082,9 @@ var init_GameCard = __esm({
     init_cn();
     init_useEventBus();
     init_Box();
+    init_Button();
     init_Typography();
+    init_GameIcon();
     cardSizeMap = {
       sm: "w-16 h-24",
       md: "w-20 h-28",
@@ -21438,14 +21490,19 @@ function ChoiceButton({
   disabled = false,
   selected = false,
   onClick,
+  action,
   className
 }) {
+  const eventBus = useEventBus();
   return /* @__PURE__ */ jsxs(
-    "button",
+    Button,
     {
-      type: "button",
+      variant: "ghost",
       disabled,
-      onClick,
+      onClick: () => {
+        if (action) eventBus.emit(`UI:${action}`, {});
+        onClick?.();
+      },
       className: cn(
         "w-full text-left px-4 py-2.5 rounded-interactive border transition-all duration-150",
         "flex items-center gap-2",
@@ -21455,8 +21512,9 @@ function ChoiceButton({
       ),
       children: [
         index !== void 0 && /* @__PURE__ */ jsxs(
-          "span",
+          Typography,
           {
+            as: "span",
             className: cn(
               "flex-shrink-0 font-mono font-bold text-sm",
               selected ? "text-accent" : "text-muted-foreground"
@@ -21467,24 +21525,14 @@ function ChoiceButton({
             ]
           }
         ),
-        assetUrl ? /* @__PURE__ */ jsx(
-          "img",
-          {
-            src: assetUrl.url,
-            alt: "",
-            width: 16,
-            height: 16,
-            style: { imageRendering: "pixelated", objectFit: "contain" },
-            className: "flex-shrink-0"
-          }
-        ) : icon ? /* @__PURE__ */ jsx("span", { className: "flex-shrink-0 text-sm", children: typeof icon === "string" ? (() => {
+        assetUrl ? /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: 16, className: "flex-shrink-0" }) : icon ? /* @__PURE__ */ jsx(Box, { as: "span", className: "flex-shrink-0 text-sm", children: typeof icon === "string" ? (() => {
           const I = resolveIcon(icon);
           return I ? /* @__PURE__ */ jsx(I, { className: "w-4 h-4" }) : null;
         })() : /* @__PURE__ */ (() => {
           const I = icon;
           return /* @__PURE__ */ jsx(I, { className: "w-4 h-4" });
         })() }) : null,
-        /* @__PURE__ */ jsx("span", { className: "text-sm leading-snug", children: text })
+        /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-sm leading-snug", children: text })
       ]
     }
   );
@@ -21493,6 +21541,11 @@ var init_ChoiceButton = __esm({
   "components/game/2d/atoms/ChoiceButton.tsx"() {
     init_cn();
     init_Icon();
+    init_useEventBus();
+    init_Button();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     ChoiceButton.displayName = "ChoiceButton";
   }
 });
@@ -22170,7 +22223,7 @@ function ComboCounter({
   const sizes = sizeMap4[size];
   if (combo <= 0) return null;
   return /* @__PURE__ */ jsxs(
-    "div",
+    Box,
     {
       className: cn(
         "inline-flex flex-col items-center justify-center",
@@ -22180,24 +22233,14 @@ function ComboCounter({
         className
       ),
       children: [
-        assetUrl && /* @__PURE__ */ jsx(
-          "img",
-          {
-            src: assetUrl.url,
-            alt: "combo",
-            width: 24,
-            height: 24,
-            style: { imageRendering: "pixelated", objectFit: "contain" },
-            className: "flex-shrink-0 mb-0.5"
-          }
-        ),
-        /* @__PURE__ */ jsx("span", { className: cn("font-black tabular-nums leading-none", sizes.combo, getComboIntensity(combo)), children: combo }),
-        /* @__PURE__ */ jsx("span", { className: cn("font-bold uppercase tracking-wider text-muted-foreground", sizes.label), children: "combo" }),
-        multiplier != null && multiplier > 1 && /* @__PURE__ */ jsxs("span", { className: cn("font-bold text-warning tabular-nums", sizes.multiplier), children: [
+        assetUrl && /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: 24, className: "flex-shrink-0 mb-0.5" }),
+        /* @__PURE__ */ jsx(Typography, { as: "span", className: cn("font-black tabular-nums leading-none", sizes.combo, getComboIntensity(combo)), children: combo }),
+        /* @__PURE__ */ jsx(Typography, { as: "span", className: cn("font-bold uppercase tracking-wider text-muted-foreground", sizes.label), children: "combo" }),
+        multiplier != null && multiplier > 1 && /* @__PURE__ */ jsxs(Typography, { as: "span", className: cn("font-bold text-warning tabular-nums", sizes.multiplier), children: [
           "x",
           multiplier.toFixed(1)
         ] }),
-        streak != null && streak > 0 && /* @__PURE__ */ jsxs("span", { className: cn("text-muted-foreground tabular-nums", sizes.label), children: [
+        streak != null && streak > 0 && /* @__PURE__ */ jsxs(Typography, { as: "span", className: cn("text-muted-foreground tabular-nums", sizes.label), children: [
           streak,
           " streak"
         ] })
@@ -22209,6 +22252,9 @@ var DEFAULT_ASSET_URL2, sizeMap4;
 var init_ComboCounter = __esm({
   "components/game/2d/atoms/ComboCounter.tsx"() {
     init_cn();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     DEFAULT_ASSET_URL2 = {
       url: "https://almadar-kflow-assets.web.app/shared/effects/flash/flash00.png",
       role: "effect",
@@ -22458,9 +22504,9 @@ function ControlButton({
     [isPressed, releaseEvent, eventBus, onRelease]
   );
   return /* @__PURE__ */ jsx(
-    "button",
+    Button,
     {
-      type: "button",
+      variant,
       disabled,
       onPointerDown: handlePointerDown,
       onPointerUp: handlePointerUp,
@@ -22478,23 +22524,13 @@ function ControlButton({
         disabled && "opacity-50 cursor-not-allowed",
         className
       ),
-      children: assetUrl ? /* @__PURE__ */ jsx(
-        "img",
-        {
-          src: assetUrl.url,
-          alt: "",
-          width: 24,
-          height: 24,
-          style: { imageRendering: "pixelated", objectFit: "contain" },
-          className: "flex-shrink-0"
-        }
-      ) : icon ? /* @__PURE__ */ jsx("span", { className: "text-2xl", children: typeof icon === "string" ? /^[a-zA-Z0-9-]+$/.test(icon) ? (() => {
+      children: assetUrl ? /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: 24, className: "flex-shrink-0" }) : icon ? /* @__PURE__ */ jsx(Box, { as: "span", className: "text-2xl", children: typeof icon === "string" ? /^[a-zA-Z0-9-]+$/.test(icon) ? (() => {
         const I = resolveIcon(icon);
         return I ? /* @__PURE__ */ jsx(I, { className: "w-6 h-6" }) : null;
       })() : icon : /* @__PURE__ */ (() => {
         const I = icon;
         return /* @__PURE__ */ jsx(I, { className: "w-6 h-6" });
-      })() }) : label ? /* @__PURE__ */ jsx("span", { children: label }) : null
+      })() }) : label ? /* @__PURE__ */ jsx(Typography, { as: "span", children: label }) : null
     }
   );
 }
@@ -22505,6 +22541,10 @@ var init_ControlButton = __esm({
     init_cn();
     init_useEventBus();
     init_Icon();
+    init_Button();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     sizeMap5 = {
       sm: "w-10 h-10 text-sm",
       md: "w-14 h-14 text-base",
@@ -22538,6 +22578,7 @@ function ControlGrid({
   actionEvent,
   onDirection,
   directionEvent,
+  directionAssets,
   size = "md",
   disabled,
   className
@@ -22577,7 +22618,8 @@ function ControlGrid({
     const dir = (d) => /* @__PURE__ */ jsx(
       ControlButton,
       {
-        icon: arrowIcons[d],
+        icon: directionAssets?.[d] ? void 0 : arrowIcons[d],
+        assetUrl: directionAssets?.[d],
         size: sizeKey[size],
         variant: "secondary",
         pressed: active.has(d),
@@ -22587,22 +22629,22 @@ function ControlGrid({
       },
       d
     );
-    return /* @__PURE__ */ jsxs("div", { className: cn("inline-grid grid-cols-3", ds.gap, ds.container, className), children: [
-      /* @__PURE__ */ jsx("div", {}),
+    return /* @__PURE__ */ jsxs(Box, { className: cn("inline-grid grid-cols-3", ds.gap, ds.container, className), children: [
+      /* @__PURE__ */ jsx(Box, {}),
       dir("up"),
-      /* @__PURE__ */ jsx("div", {}),
+      /* @__PURE__ */ jsx(Box, {}),
       dir("left"),
-      /* @__PURE__ */ jsx("div", { className: "flex items-center justify-center", children: /* @__PURE__ */ jsx("div", { className: "w-6 h-6 rounded-interactive bg-muted border-2 border-muted-foreground" }) }),
+      /* @__PURE__ */ jsx(Box, { className: "flex items-center justify-center", children: /* @__PURE__ */ jsx(Box, { className: "w-6 h-6 rounded-interactive bg-muted border-2 border-muted-foreground" }) }),
       dir("right"),
-      /* @__PURE__ */ jsx("div", {}),
+      /* @__PURE__ */ jsx(Box, {}),
       dir("down"),
-      /* @__PURE__ */ jsx("div", {})
+      /* @__PURE__ */ jsx(Box, {})
     ] });
   }
   if (layout === "diamond" && buttons.length === 4) {
     const [top, right, bottom, left] = buttons;
-    return /* @__PURE__ */ jsxs("div", { className: cn(layoutClass.diamond, className), children: [
-      /* @__PURE__ */ jsx("div", {}),
+    return /* @__PURE__ */ jsxs(Box, { className: cn(layoutClass.diamond, className), children: [
+      /* @__PURE__ */ jsx(Box, {}),
       /* @__PURE__ */ jsx(
         ControlButton,
         {
@@ -22617,7 +22659,7 @@ function ControlGrid({
           disabled
         }
       ),
-      /* @__PURE__ */ jsx("div", {}),
+      /* @__PURE__ */ jsx(Box, {}),
       /* @__PURE__ */ jsx(
         ControlButton,
         {
@@ -22632,7 +22674,7 @@ function ControlGrid({
           disabled
         }
       ),
-      /* @__PURE__ */ jsx("div", {}),
+      /* @__PURE__ */ jsx(Box, {}),
       /* @__PURE__ */ jsx(
         ControlButton,
         {
@@ -22647,7 +22689,7 @@ function ControlGrid({
           disabled
         }
       ),
-      /* @__PURE__ */ jsx("div", {}),
+      /* @__PURE__ */ jsx(Box, {}),
       /* @__PURE__ */ jsx(
         ControlButton,
         {
@@ -22662,10 +22704,10 @@ function ControlGrid({
           disabled
         }
       ),
-      /* @__PURE__ */ jsx("div", {})
+      /* @__PURE__ */ jsx(Box, {})
     ] });
   }
-  return /* @__PURE__ */ jsx("div", { className: cn(layoutClass[layout], className), children: buttons.map((button) => /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(Box, { className: cn(layoutClass[layout], className), children: buttons.map((button) => /* @__PURE__ */ jsx(
     ControlButton,
     {
       icon: button.icon,
@@ -22687,6 +22729,7 @@ var init_ControlGrid = __esm({
     "use client";
     init_cn();
     init_useEventBus();
+    init_Box();
     init_ControlButton();
     sizeKey = { sm: "sm", md: "md", lg: "lg" };
     layoutClass = {
@@ -22718,6 +22761,8 @@ function CounterMinimal({
   size = "md",
   onDecrement,
   onIncrement,
+  decrementEvent,
+  incrementEvent,
   className
 }) {
   const resolved = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
@@ -22728,6 +22773,7 @@ function CounterMinimal({
       {
         variant: "secondary",
         size: sizeStyles8[size].button,
+        action: decrementEvent,
         onClick: onDecrement,
         disabled: resolved.decrementDisabled,
         icon: "minus",
@@ -22750,6 +22796,7 @@ function CounterMinimal({
       {
         variant: "secondary",
         size: sizeStyles8[size].button,
+        action: incrementEvent,
         onClick: onIncrement,
         disabled: resolved.incrementDisabled,
         icon: "plus",
@@ -22766,6 +22813,9 @@ function CounterStandard({
   onDecrement,
   onIncrement,
   onReset,
+  decrementEvent,
+  incrementEvent,
+  resetEvent,
   className
 }) {
   const resolved = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
@@ -22796,6 +22846,7 @@ function CounterStandard({
         {
           variant: "secondary",
           size: sizeStyles8[size].button,
+          action: decrementEvent,
           onClick: onDecrement,
           disabled: resolved.decrementDisabled,
           icon: "minus"
@@ -22806,6 +22857,7 @@ function CounterStandard({
         {
           variant: "primary",
           size: sizeStyles8[size].button,
+          action: incrementEvent,
           onClick: onIncrement,
           disabled: resolved.incrementDisabled,
           icon: "plus"
@@ -22817,6 +22869,7 @@ function CounterStandard({
       {
         variant: "ghost",
         size: "sm",
+        action: resetEvent,
         onClick: onReset,
         icon: "rotate-ccw",
         children: "Reset"
@@ -22832,6 +22885,9 @@ function CounterFull({
   onDecrement,
   onIncrement,
   onReset,
+  decrementEvent,
+  incrementEvent,
+  resetEvent,
   className
 }) {
   const resolved = entity && typeof entity === "object" && !Array.isArray(entity) ? entity : void 0;
@@ -22865,6 +22921,7 @@ function CounterFull({
         {
           variant: "secondary",
           size: sizeStyles8[size].button,
+          action: decrementEvent,
           onClick: onDecrement,
           disabled: resolved.decrementDisabled,
           icon: "minus",
@@ -22876,6 +22933,7 @@ function CounterFull({
         {
           variant: "primary",
           size: sizeStyles8[size].button,
+          action: incrementEvent,
           onClick: onIncrement,
           disabled: resolved.incrementDisabled,
           icon: "plus",
@@ -22888,6 +22946,7 @@ function CounterFull({
       {
         variant: "ghost",
         size: "sm",
+        action: resetEvent,
         onClick: onReset,
         icon: "rotate-ccw",
         children: "Reset to 0"
@@ -22935,8 +22994,9 @@ function DamageNumber({
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx("style", { children: floatKeyframes }),
     /* @__PURE__ */ jsxs(
-      "span",
+      Typography,
       {
+        as: "span",
         className: cn(
           "inline-flex items-center gap-0.5 font-mono select-none pointer-events-none",
           sizeMap6[size],
@@ -22945,17 +23005,7 @@ function DamageNumber({
         ),
         style: { animation: "damageFloat 1s ease-out forwards" },
         children: [
-          assetUrl && /* @__PURE__ */ jsx(
-            "img",
-            {
-              src: assetUrl.url,
-              alt: "",
-              width: 14,
-              height: 14,
-              style: { imageRendering: "pixelated", objectFit: "contain" },
-              className: "flex-shrink-0"
-            }
-          ),
+          assetUrl && /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: 14, className: "flex-shrink-0" }),
           displayText
         ]
       }
@@ -22966,6 +23016,8 @@ var sizeMap6, typeStyles, floatKeyframes, DEFAULT_ASSET_URL4;
 var init_DamageNumber = __esm({
   "components/game/2d/atoms/DamageNumber.tsx"() {
     init_cn();
+    init_Typography();
+    init_GameIcon();
     sizeMap6 = {
       sm: "text-sm",
       md: "text-lg",
@@ -29327,7 +29379,7 @@ function ScoreDisplay({
   const resolvedValue = typeof value === "number" && !Number.isNaN(value) ? value : typeof score === "number" && !Number.isNaN(score) ? score : 0;
   const formattedValue = new Intl.NumberFormat(locale).format(resolvedValue);
   return /* @__PURE__ */ jsxs(
-    "div",
+    Box,
     {
       className: cn(
         "flex items-center gap-2 font-bold",
@@ -29335,19 +29387,9 @@ function ScoreDisplay({
         className
       ),
       children: [
-        assetUrl ? /* @__PURE__ */ jsx(
-          "img",
-          {
-            src: assetUrl.url,
-            alt: "",
-            width: 20,
-            height: 20,
-            style: { imageRendering: "pixelated", objectFit: "contain" },
-            className: "flex-shrink-0"
-          }
-        ) : icon ? /* @__PURE__ */ jsx("span", { className: "flex-shrink-0", children: typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon }) : /* @__PURE__ */ jsx(Icon, { icon }) }) : null,
-        label && /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: label }),
-        /* @__PURE__ */ jsx("span", { className: "tabular-nums", children: formattedValue })
+        assetUrl ? /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: 20, className: "flex-shrink-0" }) : icon ? /* @__PURE__ */ jsx(Box, { as: "span", className: "flex-shrink-0", children: typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon }) : /* @__PURE__ */ jsx(Icon, { icon }) }) : null,
+        label && /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-muted-foreground", children: label }),
+        /* @__PURE__ */ jsx(Typography, { as: "span", className: "tabular-nums", children: formattedValue })
       ]
     }
   );
@@ -29357,6 +29399,9 @@ var init_ScoreDisplay = __esm({
   "components/game/2d/atoms/ScoreDisplay.tsx"() {
     init_cn();
     init_Icon();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     sizeMap8 = {
       sm: "text-sm",
       md: "text-lg",
@@ -29417,12 +29462,12 @@ function Sprite({
     onClick?.();
   };
   return /* @__PURE__ */ jsx(
-    "div",
+    Box,
     {
+      position: "absolute",
       className,
       onClick: action || onClick ? handleClick : void 0,
       style: {
-        position: "absolute",
         width: frameWidth,
         height: frameHeight,
         backgroundImage: `url(${spritesheet.url})`,
@@ -29478,6 +29523,7 @@ var init_Sprite = __esm({
   "components/game/2d/atoms/Sprite.tsx"() {
     "use client";
     init_useEventBus();
+    init_Box();
     init_spriteAnimation();
     DEFAULT_SPRITESHEET = {
       url: "https://almadar-kflow-assets.web.app/shared/isometric-blocks/Spritesheet/allTiles_sheet.png",
@@ -29514,17 +29560,7 @@ function StateIndicator({
         className
       ),
       children: [
-        /* @__PURE__ */ jsx(Box, { as: "span", children: assetUrl ? /* @__PURE__ */ jsx(
-          "img",
-          {
-            src: assetUrl.url,
-            alt: displayLabel,
-            width: 16,
-            height: 16,
-            style: { imageRendering: "pixelated", objectFit: "contain" },
-            className: "flex-shrink-0"
-          }
-        ) : typeof config.icon === "string" ? /^[a-zA-Z0-9-]+$/.test(config.icon) ? /* @__PURE__ */ jsx(Icon, { name: config.icon }) : config.icon : /* @__PURE__ */ jsx(Icon, { icon: config.icon }) }),
+        /* @__PURE__ */ jsx(Box, { as: "span", children: assetUrl ? /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: 16, alt: displayLabel, className: "flex-shrink-0" }) : typeof config.icon === "string" ? /^[a-zA-Z0-9-]+$/.test(config.icon) ? /* @__PURE__ */ jsx(Icon, { name: config.icon }) : config.icon : /* @__PURE__ */ jsx(Icon, { icon: config.icon }) }),
         /* @__PURE__ */ jsx(Box, { as: "span", children: displayLabel })
       ]
     }
@@ -29536,6 +29572,7 @@ var init_StateIndicator = __esm({
     init_Box();
     init_Icon();
     init_cn();
+    init_GameIcon();
     DEFAULT_ASSET_URL6 = {
       url: "https://almadar-kflow-assets.web.app/shared/isometric-dungeon/Isometric/chestClosed_E.png",
       role: "ui",
@@ -29584,14 +29621,15 @@ function TimerDisplay({
   format = "mm:ss",
   size = "md",
   className,
-  lowThreshold
+  lowThreshold,
+  iconAsset
 }) {
   const isLow = lowThreshold != null && seconds <= lowThreshold && seconds > 0;
-  return /* @__PURE__ */ jsx(
-    "div",
+  return /* @__PURE__ */ jsxs(
+    Box,
     {
       className: cn(
-        "inline-flex items-center justify-center rounded-container",
+        "inline-flex items-center gap-1 justify-center rounded-container",
         "bg-card/80 border border-muted font-mono font-bold tabular-nums",
         sizeMap9[size],
         running && "border-success/50",
@@ -29599,7 +29637,10 @@ function TimerDisplay({
         !isLow && "text-foreground",
         className
       ),
-      children: formatTime(seconds, format)
+      children: [
+        iconAsset && /* @__PURE__ */ jsx(GameIcon, { assetUrl: iconAsset, icon: "image", size: 16, className: "w-4 h-4 object-contain flex-shrink-0" }),
+        formatTime(seconds, format)
+      ]
     }
   );
 }
@@ -29607,6 +29648,8 @@ var sizeMap9;
 var init_TimerDisplay = __esm({
   "components/game/2d/atoms/TimerDisplay.tsx"() {
     init_cn();
+    init_Box();
+    init_GameIcon();
     sizeMap9 = {
       sm: "text-sm px-2 py-0.5",
       md: "text-lg px-3 py-1",
@@ -29627,7 +29670,7 @@ function ResourceCounter({
 }) {
   const sizes = sizeMap10[size];
   return /* @__PURE__ */ jsxs(
-    "div",
+    Box,
     {
       className: cn(
         "inline-flex items-center rounded-container",
@@ -29636,21 +29679,11 @@ function ResourceCounter({
         className
       ),
       children: [
-        assetUrl ? /* @__PURE__ */ jsx(
-          "img",
-          {
-            src: assetUrl.url,
-            alt: label,
-            width: sizes.img,
-            height: sizes.img,
-            style: { imageRendering: "pixelated", objectFit: "contain" },
-            className: "flex-shrink-0"
-          }
-        ) : icon ? /* @__PURE__ */ jsx("span", { className: cn("flex-shrink-0", sizes.icon), children: typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon }) : /* @__PURE__ */ jsx(Icon, { icon }) }) : null,
-        /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: label }),
-        /* @__PURE__ */ jsxs("span", { className: cn("font-bold tabular-nums", color && (color in colorTokenClasses2 ? colorTokenClasses2[color] : color)), children: [
+        assetUrl ? /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: sizes.img, alt: label, className: "flex-shrink-0" }) : icon ? /* @__PURE__ */ jsx(Box, { as: "span", className: cn("flex-shrink-0", sizes.icon), children: typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon }) : /* @__PURE__ */ jsx(Icon, { icon }) }) : null,
+        /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-muted-foreground", children: label }),
+        /* @__PURE__ */ jsxs(Typography, { as: "span", className: cn("font-bold tabular-nums", color && (color in colorTokenClasses2 ? colorTokenClasses2[color] : color)), children: [
           value,
-          max != null && /* @__PURE__ */ jsxs("span", { className: "text-muted-foreground", children: [
+          max != null && /* @__PURE__ */ jsxs(Typography, { as: "span", className: "text-muted-foreground", children: [
             "/",
             max
           ] })
@@ -29664,6 +29697,9 @@ var init_ResourceCounter = __esm({
   "components/game/2d/atoms/ResourceCounter.tsx"() {
     init_cn();
     init_Icon();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     colorTokenClasses2 = {
       primary: "text-primary",
       secondary: "text-secondary",
@@ -29695,15 +29731,20 @@ function ItemSlot({
   size = "md",
   selected,
   onClick,
+  action,
   className
 }) {
-  const isClickable = onClick != null;
+  const eventBus = useEventBus();
+  const isClickable = onClick != null || action != null;
   const px = assetSizeMap[size];
   return /* @__PURE__ */ jsx(
-    "button",
+    Button,
     {
-      type: "button",
-      onClick,
+      variant: "ghost",
+      onClick: () => {
+        if (action) eventBus.emit(`UI:${action}`, {});
+        onClick?.();
+      },
       disabled: !isClickable,
       title: label,
       className: cn(
@@ -29718,21 +29759,12 @@ function ItemSlot({
         !isClickable && "cursor-default",
         className
       ),
-      children: empty ? /* @__PURE__ */ jsx("span", { className: "text-muted-foreground text-base", children: "+" }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-        assetUrl ? /* @__PURE__ */ jsx(
-          "img",
-          {
-            src: assetUrl?.url,
-            alt: label,
-            width: px,
-            height: px,
-            style: { imageRendering: "pixelated", objectFit: "contain" },
-            className: "flex-shrink-0"
-          }
-        ) : icon ? /* @__PURE__ */ jsx("span", { className: "flex-shrink-0", children: typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon }) : /* @__PURE__ */ jsx(Icon, { icon }) }) : null,
+      children: empty ? /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-muted-foreground text-base", children: "+" }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+        assetUrl ? /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: px, alt: label, className: "flex-shrink-0" }) : icon ? /* @__PURE__ */ jsx(Box, { as: "span", className: "flex-shrink-0", children: typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon }) : /* @__PURE__ */ jsx(Icon, { icon }) }) : null,
         quantity != null && quantity > 1 && /* @__PURE__ */ jsx(
-          "span",
+          Typography,
           {
+            as: "span",
             className: cn(
               "absolute -bottom-1 -right-1 flex items-center justify-center",
               "min-w-[18px] h-[18px] rounded-full px-1",
@@ -29751,6 +29783,11 @@ var init_ItemSlot = __esm({
     "use client";
     init_cn();
     init_Icon();
+    init_useEventBus();
+    init_Button();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     sizeMap11 = {
       sm: "w-10 h-10 text-lg",
       md: "w-14 h-14 text-2xl",
@@ -29794,7 +29831,7 @@ function TurnIndicator({
 }) {
   const sizes = sizeMap12[size];
   return /* @__PURE__ */ jsxs(
-    "div",
+    Box,
     {
       className: cn(
         "inline-flex items-center rounded-container",
@@ -29803,32 +29840,22 @@ function TurnIndicator({
         className
       ),
       children: [
-        /* @__PURE__ */ jsxs("span", { className: "font-bold tabular-nums", children: [
+        /* @__PURE__ */ jsxs(Typography, { as: "span", className: "font-bold tabular-nums", children: [
           "Turn ",
           currentTurn,
-          maxTurns != null && /* @__PURE__ */ jsxs("span", { className: "text-muted-foreground", children: [
+          maxTurns != null && /* @__PURE__ */ jsxs(Typography, { as: "span", className: "text-muted-foreground", children: [
             "/",
             maxTurns
           ] })
         ] }),
         phase && /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: "|" }),
-          /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: phase })
+          /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-muted-foreground", children: "|" }),
+          /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-muted-foreground", children: phase })
         ] }),
         activeTeam && /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx("span", { className: "text-muted-foreground", children: "|" }),
-          assetUrl ? /* @__PURE__ */ jsx(
-            "img",
-            {
-              src: assetUrl.url,
-              alt: "",
-              width: 12,
-              height: 12,
-              style: { imageRendering: "pixelated", objectFit: "contain" },
-              className: "flex-shrink-0"
-            }
-          ) : /* @__PURE__ */ jsx("span", { className: cn("rounded-full bg-success/20", sizes.dot) }),
-          /* @__PURE__ */ jsx("span", { className: "text-success", children: activeTeam })
+          /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-muted-foreground", children: "|" }),
+          assetUrl ? /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: 12, className: "flex-shrink-0" }) : /* @__PURE__ */ jsx(Box, { as: "span", className: cn("rounded-full bg-success/20", sizes.dot) }),
+          /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-success", children: activeTeam })
         ] })
       ]
     }
@@ -29838,6 +29865,9 @@ var sizeMap12, DEFAULT_ASSET_URL9;
 var init_TurnIndicator = __esm({
   "components/game/2d/atoms/TurnIndicator.tsx"() {
     init_cn();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     sizeMap12 = {
       sm: { wrapper: "text-xs gap-1.5 px-2 py-0.5", dot: "w-1.5 h-1.5" },
       md: { wrapper: "text-sm gap-2 px-3 py-1", dot: "w-2 h-2" },
@@ -29861,53 +29891,47 @@ function WaypointMarker({
   className
 }) {
   const sizes = sizeMap13[size];
-  return /* @__PURE__ */ jsxs("div", { className: cn("flex flex-col items-center", className), children: [
-    /* @__PURE__ */ jsxs("div", { className: "relative flex items-center justify-center", children: [
+  return /* @__PURE__ */ jsxs(Box, { className: cn("flex flex-col items-center", className), children: [
+    /* @__PURE__ */ jsxs(Box, { className: "relative flex items-center justify-center", children: [
       active && /* @__PURE__ */ jsx(
-        "div",
+        Box,
         {
+          position: "absolute",
           className: cn(
-            "absolute rounded-full border-2 border-info animate-ping opacity-50",
+            "rounded-full border-2 border-info animate-ping opacity-50",
             sizes.ring
           )
         }
       ),
       active && /* @__PURE__ */ jsx(
-        "div",
+        Box,
         {
+          position: "absolute",
           className: cn(
-            "absolute rounded-full border-2 border-info",
+            "rounded-full border-2 border-info",
             sizes.ring
           )
         }
       ),
       /* @__PURE__ */ jsx(
-        "div",
+        Box,
         {
+          position: "relative",
           className: cn(
-            "relative flex items-center justify-center rounded-full transition-all duration-200",
+            "flex items-center justify-center rounded-full transition-all duration-200",
             sizes.dot,
             completed && "bg-success text-foreground",
             active && !completed && "bg-info text-foreground",
             !active && !completed && "bg-muted"
           ),
-          children: completed ? checkIcon : assetUrl ? /* @__PURE__ */ jsx(
-            "img",
-            {
-              src: assetUrl.url,
-              alt: label,
-              width: sizes.img,
-              height: sizes.img,
-              style: { imageRendering: "pixelated", objectFit: "contain" },
-              className: "flex-shrink-0"
-            }
-          ) : icon ? typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon }) : /* @__PURE__ */ jsx(Icon, { icon }) : null
+          children: completed ? checkIcon : assetUrl ? /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: sizes.img, alt: label, className: "flex-shrink-0" }) : icon ? typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon }) : /* @__PURE__ */ jsx(Icon, { icon }) : null
         }
       )
     ] }),
     label && /* @__PURE__ */ jsx(
-      "span",
+      Typography,
       {
+        as: "span",
         className: cn(
           "text-center whitespace-nowrap",
           sizes.label,
@@ -29923,6 +29947,9 @@ var init_WaypointMarker = __esm({
   "components/game/2d/atoms/WaypointMarker.tsx"() {
     init_cn();
     init_Icon();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     DEFAULT_ASSET_URL10 = {
       url: "https://almadar-kflow-assets.web.app/shared/world-map/battle_marker.png",
       role: "ui",
@@ -29954,31 +29981,23 @@ function StatusEffect({
   className
 }) {
   const sizes = sizeMap14[size];
-  return /* @__PURE__ */ jsxs("div", { className: cn("relative inline-flex flex-col items-center", className), children: [
+  return /* @__PURE__ */ jsxs(Box, { position: "relative", className: cn("inline-flex flex-col items-center", className), children: [
     /* @__PURE__ */ jsxs(
-      "div",
+      Box,
       {
+        position: "relative",
         className: cn(
-          "relative flex items-center justify-center rounded-interactive border-2",
+          "flex items-center justify-center rounded-interactive border-2",
           sizes.container,
           variantStyles8[variant]
         ),
         title: label,
         children: [
-          /* @__PURE__ */ jsx("span", { className: cn("flex items-center justify-center", sizes.icon), children: assetUrl ? /* @__PURE__ */ jsx(
-            "img",
-            {
-              src: assetUrl.url,
-              alt: label,
-              width: sizes.img,
-              height: sizes.img,
-              style: { imageRendering: "pixelated", objectFit: "contain" },
-              className: "flex-shrink-0"
-            }
-          ) : icon != null && typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon, size: "sm" }) : icon != null ? /* @__PURE__ */ jsx(Icon, { icon, size: "sm" }) : null }),
+          /* @__PURE__ */ jsx(Box, { as: "span", className: cn("flex items-center justify-center", sizes.icon), children: assetUrl ? /* @__PURE__ */ jsx(GameIcon, { assetUrl, icon: "image", size: sizes.img, alt: label, className: "flex-shrink-0" }) : icon != null && typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon, size: "sm" }) : icon != null ? /* @__PURE__ */ jsx(Icon, { icon, size: "sm" }) : null }),
           duration !== void 0 && /* @__PURE__ */ jsx(
-            "span",
+            Typography,
             {
+              as: "span",
               className: cn(
                 "absolute bottom-0 left-0 right-0 text-center font-mono font-bold text-foreground bg-background/60 leading-tight",
                 sizes.timer
@@ -29990,8 +30009,9 @@ function StatusEffect({
       }
     ),
     stacks !== void 0 && stacks > 1 && /* @__PURE__ */ jsx(
-      "span",
+      Typography,
       {
+        as: "span",
         className: cn(
           "absolute flex items-center justify-center rounded-full bg-card text-foreground font-bold leading-none",
           sizes.badge
@@ -29999,7 +30019,7 @@ function StatusEffect({
         children: stacks
       }
     ),
-    label && /* @__PURE__ */ jsx("span", { className: "text-xs text-muted-foreground mt-0.5 text-center whitespace-nowrap", children: label })
+    label && /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-xs text-muted-foreground mt-0.5 text-center whitespace-nowrap", children: label })
   ] });
 }
 var DEFAULT_ASSET_URL11, sizeMap14, variantStyles8;
@@ -30007,6 +30027,9 @@ var init_StatusEffect = __esm({
   "components/game/2d/atoms/StatusEffect.tsx"() {
     init_cn();
     init_Icon();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     DEFAULT_ASSET_URL11 = {
       url: "https://almadar-kflow-assets.web.app/shared/effects/particles/flame_01.png",
       role: "ui",
@@ -30033,7 +30056,7 @@ function DialogueBubble({
   className
 }) {
   return /* @__PURE__ */ jsxs(
-    "div",
+    Box,
     {
       className: cn(
         "flex items-start gap-3 rounded-container bg-background/80 backdrop-blur-sm px-4 py-3 border border-border/10",
@@ -30041,17 +30064,10 @@ function DialogueBubble({
         className
       ),
       children: [
-        portrait && /* @__PURE__ */ jsx("div", { className: "flex-shrink-0 w-12 h-12 rounded-full overflow-hidden border-2 border-warning/60", children: /* @__PURE__ */ jsx(
-          "img",
-          {
-            src: portrait?.url,
-            alt: speaker ?? "speaker",
-            className: "w-full h-full object-cover"
-          }
-        ) }),
-        /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-1 min-w-0", children: [
-          speaker && /* @__PURE__ */ jsx("span", { className: "text-sm font-bold text-warning", children: speaker }),
-          /* @__PURE__ */ jsx("span", { className: "text-sm text-foreground leading-relaxed", children: text })
+        portrait && /* @__PURE__ */ jsx(Box, { className: "flex-shrink-0 w-12 h-12 rounded-full overflow-hidden border-2 border-warning/60", children: /* @__PURE__ */ jsx(GameIcon, { assetUrl: portrait, icon: "image", size: 48, alt: speaker ?? "speaker", className: "w-full h-full object-cover" }) }),
+        /* @__PURE__ */ jsxs(Box, { className: "flex flex-col gap-1 min-w-0", children: [
+          speaker && /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-sm font-bold text-warning", children: speaker }),
+          /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-sm text-foreground leading-relaxed", children: text })
         ] })
       ]
     }
@@ -30061,6 +30077,9 @@ var DEFAULT_PORTRAIT;
 var init_DialogueBubble = __esm({
   "components/game/2d/atoms/DialogueBubble.tsx"() {
     init_cn();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     DEFAULT_PORTRAIT = {
       url: "https://almadar-kflow-assets.web.app/shared/characters/archetypes/04_hero.png",
       role: "effect",
@@ -30087,7 +30106,7 @@ function StatBadge({
   const numValue = typeof value === "number" ? value : parseInt(String(value), 10) || 0;
   const resolvedAsset = iconUrl ?? assetUrl;
   return /* @__PURE__ */ jsxs(
-    "div",
+    Box,
     {
       className: cn(
         "inline-flex items-center gap-2 rounded-container border backdrop-blur-sm",
@@ -30096,18 +30115,8 @@ function StatBadge({
         className
       ),
       children: [
-        resolvedAsset ? /* @__PURE__ */ jsx(
-          "img",
-          {
-            src: resolvedAsset.url,
-            alt: "",
-            width: 16,
-            height: 16,
-            style: { imageRendering: "pixelated", objectFit: "contain" },
-            className: "flex-shrink-0"
-          }
-        ) : icon ? /* @__PURE__ */ jsx("span", { className: "flex-shrink-0 text-lg", children: typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon, className: "w-4 h-4" }) : /* @__PURE__ */ jsx(Icon, { icon, className: "w-4 h-4" }) }) : null,
-        /* @__PURE__ */ jsx("span", { className: "text-muted-foreground font-medium", children: label }),
+        resolvedAsset ? /* @__PURE__ */ jsx(GameIcon, { assetUrl: resolvedAsset, icon: "image", size: 16, className: "flex-shrink-0" }) : icon ? /* @__PURE__ */ jsx(Box, { as: "span", className: "flex-shrink-0 text-lg", children: typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon, className: "w-4 h-4" }) : /* @__PURE__ */ jsx(Icon, { icon, className: "w-4 h-4" }) }) : null,
+        /* @__PURE__ */ jsx(Typography, { as: "span", className: "text-muted-foreground font-medium", children: label }),
         format === "hearts" && max && /* @__PURE__ */ jsx(
           HealthBar,
           {
@@ -30133,7 +30142,7 @@ function StatBadge({
             size: size === "lg" ? "md" : "sm"
           }
         ),
-        format === "text" && /* @__PURE__ */ jsx("span", { className: "font-bold text-foreground", children: value })
+        format === "text" && /* @__PURE__ */ jsx(Typography, { as: "span", className: "font-bold text-foreground", children: value })
       ]
     }
   );
@@ -30143,6 +30152,9 @@ var init_StatBadge = __esm({
   "components/game/2d/molecules/StatBadge.tsx"() {
     init_cn();
     init_Icon();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     init_HealthBar();
     init_ScoreDisplay();
     sizeMap15 = {
@@ -30177,7 +30189,7 @@ function InventoryGrid({
     (id) => {
       onSelect?.(id);
       if (selectEvent) {
-        eventBus.emit(selectEvent, { id });
+        eventBus.emit(`UI:${selectEvent}`, { id });
       }
     },
     [onSelect, selectEvent, eventBus]
@@ -30320,9 +30332,9 @@ function GameHud({
   if (position === "corners") {
     const leftStats = stats.slice(0, Math.ceil(stats.length / 2));
     const rightStats = stats.slice(Math.ceil(stats.length / 2));
-    return /* @__PURE__ */ jsxs("div", { className: cn("relative", positionMap[position], className), children: [
-      /* @__PURE__ */ jsx("div", { className: "absolute top-4 left-4 flex flex-col gap-2 pointer-events-auto", children: leftStats.map((stat, i) => /* @__PURE__ */ jsx(StatBadge, { ...stat, size }, i)) }),
-      /* @__PURE__ */ jsx("div", { className: "absolute top-4 right-4 flex flex-col gap-2 items-end pointer-events-auto", children: rightStats.map((stat, i) => /* @__PURE__ */ jsx(StatBadge, { ...stat, size }, i)) })
+    return /* @__PURE__ */ jsxs(Box, { position: "relative", className: cn(positionMap[position], className), children: [
+      /* @__PURE__ */ jsx(Box, { position: "absolute", className: "top-4 left-4 flex flex-col gap-2 pointer-events-auto", children: leftStats.map((stat, i) => /* @__PURE__ */ jsx(StatBadge, { ...stat, size }, i)) }),
+      /* @__PURE__ */ jsx(Box, { position: "absolute", className: "top-4 right-4 flex flex-col gap-2 items-end pointer-events-auto", children: rightStats.map((stat, i) => /* @__PURE__ */ jsx(StatBadge, { ...stat, size }, i)) })
     ] });
   }
   if (position === "top" || position === "bottom") {
@@ -30331,7 +30343,7 @@ function GameHud({
     const rightStats = stats.slice(mid);
     const isTop = position === "top";
     return /* @__PURE__ */ jsxs(
-      "div",
+      Box,
       {
         className: cn(
           "flex items-center justify-between w-full",
@@ -30341,17 +30353,18 @@ function GameHud({
           className
         ),
         children: [
-          /* @__PURE__ */ jsx("div", { className: "flex items-center gap-3 flex-shrink-0", children: leftStats.map((stat, i) => /* @__PURE__ */ jsx(StatBadge, { ...stat, size }, i)) }),
-          rightStats.length > 0 && /* @__PURE__ */ jsx("div", { className: "flex items-center gap-3 flex-shrink-0", children: rightStats.map((stat, i) => /* @__PURE__ */ jsx(StatBadge, { ...stat, size }, i)) })
+          /* @__PURE__ */ jsx(Box, { className: "flex items-center gap-3 flex-shrink-0", children: leftStats.map((stat, i) => /* @__PURE__ */ jsx(StatBadge, { ...stat, size }, i)) }),
+          rightStats.length > 0 && /* @__PURE__ */ jsx(Box, { className: "flex items-center gap-3 flex-shrink-0", children: rightStats.map((stat, i) => /* @__PURE__ */ jsx(StatBadge, { ...stat, size }, i)) })
         ]
       }
     );
   }
   return /* @__PURE__ */ jsx(
-    "div",
+    Box,
     {
+      position: "relative",
       className: cn(
-        "relative z-10 flex items-center gap-4 px-4 py-2",
+        "z-10 flex items-center gap-4 px-4 py-2",
         transparent ? "bg-black/30 backdrop-blur-sm" : "bg-surface/90 backdrop-blur-sm",
         className
       ),
@@ -30363,6 +30376,7 @@ var positionMap, DEFAULT_HUD_STATS;
 var init_GameHud = __esm({
   "components/game/2d/molecules/GameHud.tsx"() {
     init_cn();
+    init_Box();
     init_StatBadge();
     positionMap = {
       corners: "inset-0 pointer-events-none"
@@ -30382,34 +30396,28 @@ function GameMenu({
   options,
   menuItems,
   onSelect,
-  eventBus: eventBusProp,
   background,
-  logo = "",
+  logo,
   className
 }) {
   const resolvedOptions = options ?? menuItems ?? DEFAULT_MENU_OPTIONS;
-  let eventBusFromHook = null;
-  try {
-    eventBusFromHook = useEventBus();
-  } catch {
-  }
-  const eventBus = eventBusProp || eventBusFromHook;
+  const eventBus = useEventBus();
   const handleOptionClick = React79.useCallback(
     (option) => {
-      if (option.event && eventBus) {
+      if (option.event) {
         eventBus.emit(`UI:${option.event}`, { option });
       }
       if (onSelect) {
         onSelect(option);
       }
-      if (option.navigatesTo && eventBus) {
+      if (option.navigatesTo) {
         eventBus.emit("UI:NAVIGATE", { url: option.navigatesTo, option });
       }
     },
     [eventBus, onSelect]
   );
   return /* @__PURE__ */ jsxs(
-    "div",
+    Box,
     {
       className: cn(
         "min-h-screen w-full flex flex-col items-center justify-center p-8",
@@ -30419,18 +30427,12 @@ function GameMenu({
         background: background ?? "linear-gradient(135deg, #1a1a2e 0%, #16213e 50%, #0f0e17 100%)"
       },
       children: [
-        /* @__PURE__ */ jsxs("div", { className: "text-center mb-12 animate-fade-in", children: [
-          logo && /* @__PURE__ */ jsx(
-            "img",
-            {
-              src: logo,
-              alt: title,
-              className: "h-24 w-auto mx-auto mb-6 drop-shadow-2xl"
-            }
-          ),
+        /* @__PURE__ */ jsxs(Box, { className: "text-center mb-12 animate-fade-in", children: [
+          logo && /* @__PURE__ */ jsx(GameIcon, { assetUrl: logo, icon: "image", size: 96, alt: title, className: "h-24 w-auto mx-auto mb-6 drop-shadow-2xl" }),
           /* @__PURE__ */ jsx(
-            "h1",
+            Typography,
             {
+              variant: "h1",
               className: "text-5xl md:text-7xl font-bold text-[var(--color-foreground)] tracking-tight",
               style: {
                 textShadow: "0 4px 12px rgba(0,0,0,0.5)"
@@ -30438,9 +30440,9 @@ function GameMenu({
               children: title
             }
           ),
-          subtitle && /* @__PURE__ */ jsx("p", { className: "mt-2 text-lg text-muted-foreground tracking-widest uppercase", children: subtitle })
+          subtitle && /* @__PURE__ */ jsx(Typography, { variant: "body", className: "mt-2 text-lg text-muted-foreground tracking-widest uppercase", children: subtitle })
         ] }),
-        /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-4 w-full max-w-md", children: resolvedOptions.map((option, index) => /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx(Box, { className: "flex flex-col gap-4 w-full max-w-md", children: resolvedOptions.map((option, index) => /* @__PURE__ */ jsx(
           ChoiceButton,
           {
             text: option.label,
@@ -30451,9 +30453,9 @@ function GameMenu({
           },
           index
         )) }),
-        /* @__PURE__ */ jsxs("div", { className: "absolute inset-0 pointer-events-none overflow-hidden", children: [
-          /* @__PURE__ */ jsx("div", { className: "absolute top-1/4 left-1/4 w-64 h-64 bg-info/10 rounded-container blur-3xl" }),
-          /* @__PURE__ */ jsx("div", { className: "absolute bottom-1/4 right-1/4 w-96 h-96 bg-accent/10 rounded-container blur-3xl" })
+        /* @__PURE__ */ jsxs(Box, { position: "absolute", className: "inset-0 pointer-events-none overflow-hidden", children: [
+          /* @__PURE__ */ jsx(Box, { position: "absolute", className: "top-1/4 left-1/4 w-64 h-64 bg-info/10 rounded-container blur-3xl" }),
+          /* @__PURE__ */ jsx(Box, { position: "absolute", className: "bottom-1/4 right-1/4 w-96 h-96 bg-accent/10 rounded-container blur-3xl" })
         ] })
       ]
     }
@@ -30465,6 +30467,9 @@ var init_GameMenu = __esm({
     "use client";
     init_cn();
     init_useEventBus();
+    init_Box();
+    init_Typography();
+    init_GameIcon();
     init_ChoiceButton();
     DEFAULT_MENU_OPTIONS = [
       { label: "New Game", event: "NEW_GAME", variant: "primary" },
@@ -30883,7 +30888,9 @@ var init_GameAudioProvider = __esm({
 });
 function GameAudioToggle({
   size = "sm",
-  className
+  className,
+  onAsset,
+  offAsset
 }) {
   const ctx = useGameAudioContextOptional();
   const [localMuted, setLocalMuted] = useState(false);
@@ -30892,6 +30899,7 @@ function GameAudioToggle({
   const handleToggle = useCallback(() => {
     setMuted(!muted);
   }, [muted, setMuted]);
+  const activeAsset = muted ? offAsset : onAsset;
   return /* @__PURE__ */ jsx(
     Button,
     {
@@ -30900,7 +30908,7 @@ function GameAudioToggle({
       onClick: handleToggle,
       className: cn("text-lg leading-none px-2", className),
       "aria-pressed": muted,
-      children: muted ? "\u{1F507}" : "\u{1F50A}"
+      children: activeAsset ? /* @__PURE__ */ jsx(GameIcon, { assetUrl: activeAsset, icon: "image", size: 20, alt: muted ? "Muted" : "Sound on", className: "w-5 h-5 object-contain" }) : muted ? "\u{1F507}" : "\u{1F50A}"
     }
   );
 }
@@ -30910,6 +30918,7 @@ var init_GameAudioToggle = __esm({
     init_atoms();
     init_cn();
     init_GameAudioProvider();
+    init_GameIcon();
     GameAudioToggle.displayName = "GameAudioToggle";
   }
 });
@@ -31489,6 +31498,7 @@ function PlatformerBoard({
   canvasHeight: _canvasHeight = 400,
   playerSprite,
   tileSprites,
+  ui: _ui,
   bgColor: _bgColor,
   keyEvent = "KEY",
   playAgainEvent = "PLAY_AGAIN",
@@ -32913,6 +32923,7 @@ function TanksBoard({
   features,
   assetManifest,
   assetBaseUrl,
+  ui: _ui,
   scale = 0.45,
   showMinimap = true,
   enableCamera = true,
@@ -33620,7 +33631,7 @@ function TraitSlot({
   size = "md",
   showTooltip = true,
   categoryColors,
-  tooltipFrameUrl = "",
+  tooltipFrameUrl,
   className,
   feedback,
   onItemDrop,
@@ -33750,7 +33761,7 @@ function TraitSlot({
               as: "img",
               className: "object-contain",
               style: { width: config.icon, height: config.icon },
-              ...{ src: equippedItem.iconUrl, alt: equippedItem.name }
+              ...{ src: equippedItem.iconUrl.url, alt: equippedItem.name }
             }
           ) : /* @__PURE__ */ jsx(Typography, { variant: "body1", className: "text-center leading-none", style: { fontSize: config.icon }, children: equippedItem.iconEmoji || "\u2726" }),
           (onRemove || removeEvent) && /* @__PURE__ */ jsx(
@@ -33779,7 +33790,7 @@ function TraitSlot({
               ...getTooltipStyle(),
               minWidth: 200,
               ...tooltipFrameUrl ? {
-                borderImage: `url(${tooltipFrameUrl}) 60 fill / 15px / 0 stretch`,
+                borderImage: `url(${tooltipFrameUrl.url}) 60 fill / 15px / 0 stretch`,
                 border: "none"
               } : {}
             },
@@ -34076,6 +34087,42 @@ function computeSlotFeedback(playerSeq, solutions) {
     (id, i) => id !== void 0 && id === bestSolution[i] ? "correct" : "wrong"
   );
 }
+function isFieldRecord(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v) && !(v instanceof Date);
+}
+function assetFromField(v) {
+  if (!isFieldRecord(v)) return void 0;
+  const url = typeof v.url === "string" ? v.url : void 0;
+  const role = typeof v.role === "string" ? v.role : void 0;
+  const category = typeof v.category === "string" ? v.category : "";
+  if (!url || !role) return void 0;
+  return {
+    url,
+    role,
+    category,
+    name: typeof v.name === "string" ? v.name : void 0,
+    thumbnailUrl: typeof v.thumbnailUrl === "string" ? v.thumbnailUrl : void 0,
+    style: typeof v.style === "string" ? v.style : void 0,
+    variant: typeof v.variant === "string" ? v.variant : void 0,
+    dimension: typeof v.dimension === "string" ? v.dimension : void 0,
+    aspect: typeof v.aspect === "string" ? v.aspect : void 0
+  };
+}
+function slotItemFromField(fv) {
+  if (!isFieldRecord(fv)) return void 0;
+  const id = typeof fv.id === "string" ? fv.id : void 0;
+  const name = typeof fv.name === "string" ? fv.name : void 0;
+  const category = typeof fv.category === "string" ? fv.category : void 0;
+  if (!id || !name || !category) return void 0;
+  return {
+    id,
+    name,
+    category,
+    description: typeof fv.description === "string" ? fv.description : void 0,
+    iconEmoji: typeof fv.iconEmoji === "string" ? fv.iconEmoji : void 0,
+    iconUrl: assetFromField(fv.iconUrl)
+  };
+}
 function SequencerBoard({
   entity,
   categoryColors,
@@ -34086,6 +34133,7 @@ function SequencerBoard({
   removeEvent,
   checkEvent,
   playAgainEvent,
+  stepEvent,
   className
 }) {
   const { emit } = useEventBus();
@@ -34093,7 +34141,11 @@ function SequencerBoard({
   const resolved = boardEntity(entity);
   const maxSlots = num(resolved?.maxSlots) || 3;
   const solutions = Array.isArray(resolved?.solutions) ? resolved.solutions : [];
-  const availableActions = Array.isArray(resolved?.availableActions) ? resolved.availableActions : [];
+  const availableActions = (Array.isArray(resolved?.availableActions) ? resolved.availableActions : []).reduce((acc, fv) => {
+    const item = slotItemFromField(fv);
+    if (item) acc.push(item);
+    return acc;
+  }, []);
   const allowDuplicates = resolved?.allowDuplicates !== false;
   const entitySlots = Array.isArray(resolved?.slots) ? resolved.slots : [];
   const entityResult = str(resolved?.result);
@@ -34151,7 +34203,7 @@ function SequencerBoard({
     let step = 0;
     const advance = () => {
       step++;
-      emit("UI:STEP", { step });
+      if (stepEvent) emit(`UI:${stepEvent}`, { step });
       if (step >= maxSlots) {
         if (checkEvent) emit(`UI:${checkEvent}`, { sequence: playerIds });
         const playerSeq = slots.map((s) => s?.id);
@@ -36050,24 +36102,55 @@ function SimulationControls({
   onReset,
   onSpeedChange,
   onParameterChange,
+  playEvent,
+  pauseEvent,
+  stepEvent,
+  resetEvent,
+  speedChangeEvent,
+  parameterChangeEvent,
   assetManifest,
   className
 }) {
+  const eventBus = useEventBus();
   const ui = assetManifest?.ui;
+  const handlePlay = () => {
+    if (playEvent) eventBus.emit(`UI:${playEvent}`, {});
+    onPlay?.();
+  };
+  const handlePause = () => {
+    if (pauseEvent) eventBus.emit(`UI:${pauseEvent}`, {});
+    onPause?.();
+  };
+  const handleStep = () => {
+    if (stepEvent) eventBus.emit(`UI:${stepEvent}`, {});
+    onStep?.();
+  };
+  const handleReset = () => {
+    if (resetEvent) eventBus.emit(`UI:${resetEvent}`, {});
+    onReset?.();
+  };
+  const handleSpeedChange = (s) => {
+    if (speedChangeEvent) eventBus.emit(`UI:${speedChangeEvent}`, { speed: s });
+    onSpeedChange?.(s);
+  };
+  const handleParameterChange = (name, value) => {
+    if (parameterChangeEvent) eventBus.emit(`UI:${parameterChangeEvent}`, { name, value });
+    onParameterChange?.(name, value);
+  };
   return /* @__PURE__ */ jsxs(VStack, { gap: "md", className, children: [
     /* @__PURE__ */ jsxs(HStack, { gap: "sm", align: "center", children: [
-      running ? /* @__PURE__ */ jsxs(Button, { size: "sm", variant: "secondary", onClick: onPause, children: [
+      running ? /* @__PURE__ */ jsxs(Button, { size: "sm", variant: "secondary", onClick: handlePause, children: [
         /* @__PURE__ */ jsx(GameIcon, { icon: Pause, assetUrl: ui?.["pause"], size: "sm" }),
         "Pause"
-      ] }) : /* @__PURE__ */ jsxs(Button, { size: "sm", variant: "primary", onClick: onPlay, children: [
+      ] }) : /* @__PURE__ */ jsxs(Button, { size: "sm", variant: "primary", onClick: handlePlay, children: [
         /* @__PURE__ */ jsx(GameIcon, { icon: Play, assetUrl: ui?.["play"], size: "sm" }),
         "Play"
       ] }),
-      /* @__PURE__ */ jsxs(Button, { size: "sm", variant: "ghost", onClick: onStep, disabled: running, children: [
+      /* @__PURE__ */ jsxs(Button, { size: "sm", variant: "ghost", onClick: handleStep, disabled: running, children: [
         /* @__PURE__ */ jsx(GameIcon, { icon: SkipForward, assetUrl: ui?.["step"], size: "sm" }),
         "Step"
       ] }),
-      /* @__PURE__ */ jsxs(Button, { size: "sm", variant: "ghost", onClick: onReset, children: [
+      /* @__PURE__ */ jsxs(Button, { size: "sm", variant: "ghost", onClick: handleReset, children: [
         /* @__PURE__ */ jsx(GameIcon, { icon: RotateCcw, assetUrl: ui?.["reset"], size: "sm" }),
         "Reset"
       ] })
@@ -36086,7 +36169,7 @@ function SimulationControls({
           max: 5,
           step: 0.1,
           value: speed,
-          onChange: (e) => onSpeedChange(parseFloat(e.target.value)),
+          onChange: (e) => handleSpeedChange(parseFloat(e.target.value)),
           className: "w-full"
         }
       )
@@ -36105,7 +36188,7 @@ function SimulationControls({
           max: param.max,
           step: param.step,
           value: param.value,
-          onChange: (e) => onParameterChange(name, parseFloat(e.target.value)),
+          onChange: (e) => handleParameterChange(name, parseFloat(e.target.value)),
           className: "w-full"
         }
       )
@@ -36114,6 +36197,7 @@ function SimulationControls({
 }
 var init_SimulationControls = __esm({
   "components/game/2d/organisms/SimulationControls.tsx"() {
+    init_useEventBus();
     init_atoms();
     init_GameIcon();
     SimulationControls.displayName = "SimulationControls";
@@ -36182,35 +36266,7 @@ var init_SimulationGraph = __esm({
     SimulationGraph.displayName = "SimulationGraph";
   }
 });
-function getSlotContentRenderer() {
-  if (_scr) return _scr;
-  const mod = (init_UISlotRenderer(), __toCommonJS(UISlotRenderer_exports));
-  _scr = mod.SlotContentRenderer;
-  return _scr;
-}
-function resolveDescriptor(value, idPrefix) {
-  if (value === null || value === void 0) return value;
-  if (React79__default.isValidElement(value)) return value;
-  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
-  if (Array.isArray(value)) {
-    return value.map((item, i) => /* @__PURE__ */ jsx(React79__default.Fragment, { children: resolveDescriptor(item, `${idPrefix}-${i}`) }, i));
-  }
-  if (typeof value === "object") {
-    const rec = value;
-    if (typeof rec.type === "string" && getComponentForPattern(rec.type) !== null) {
-      const type = rec.type;
-      const _id = typeof rec._id === "string" ? rec._id : void 0;
-      const nestedProps = rec.props !== void 0 && typeof rec.props === "object" && !Array.isArray(rec.props) && rec.props !== null ? rec.props : void 0;
-      const { type: _t, props: _p, _id: _d, ...flatRest } = rec;
-      const resolvedProps = nestedProps !== void 0 ? nestedProps : flatRest;
-      const content = { id: _id ?? idPrefix, pattern: type, props: resolvedProps, priority: 0 };
-      const SCR = getSlotContentRenderer();
-      return /* @__PURE__ */ jsx(SCR, { content, onDismiss: () => void 0 });
-    }
-  }
-  return null;
-}
-var _scr, GameTemplate;
+var GameTemplate;
 var init_GameTemplate = __esm({
   "components/game/2d/templates/GameTemplate.tsx"() {
     init_cn();
@@ -36218,7 +36274,6 @@ var init_GameTemplate = __esm({
     init_Stack();
     init_Typography();
     init_Button();
-    _scr = null;
     GameTemplate = ({
       entity,
       title = "Game",
@@ -36227,7 +36282,8 @@ var init_GameTemplate = __esm({
       debugPanel,
       showDebugPanel = false,
       controls,
-      className
+      className,
+      backgroundAsset
     }) => {
       return /* @__PURE__ */ jsxs(
         Box,
@@ -36284,15 +36340,16 @@ var init_GameTemplate = __esm({
                 {
                   position: "relative",
                   fullWidth: true,
-                  className: "flex-1 bg-muted",
+                  className: backgroundAsset ? "flex-1" : "flex-1 bg-muted",
+                  style: backgroundAsset ? { backgroundImage: `url(${backgroundAsset.url})`, backgroundSize: "cover", backgroundPosition: "center" } : void 0,
                   children: [
-                    resolveDescriptor(children, "gt-children"),
+                    children,
                     hud && /* @__PURE__ */ jsx(
                       Box,
                       {
                         position: "absolute",
                         className: "top-0 left-0 right-0 pointer-events-none",
-                        children: /* @__PURE__ */ jsx(Box, { padding: "md", className: "pointer-events-auto w-fit", children: resolveDescriptor(hud, "gt-hud") })
+                        children: /* @__PURE__ */ jsx(Box, { padding: "md", className: "pointer-events-auto w-fit", children: hud })
                       }
                     )
                   ]
@@ -36317,7 +36374,7 @@ var init_GameTemplate = __esm({
                       children: /* @__PURE__ */ jsx(Typography, { variant: "h6", children: "Debug Panel" })
                     }
                   ),
-                  /* @__PURE__ */ jsx(Box, { padding: "md", children: resolveDescriptor(debugPanel, "gt-debug") })
+                  /* @__PURE__ */ jsx(Box, { padding: "md", children: debugPanel })
                 ]
               }
             )
@@ -36328,59 +36385,21 @@ var init_GameTemplate = __esm({
     GameTemplate.displayName = "GameTemplate";
   }
 });
-function asDescriptor(v) {
-  if (Array.isArray(v) || React79__default.isValidElement(v)) return null;
-  const o = v;
-  if (typeof o.type !== "string") return null;
-  const props = o.props !== void 0 && typeof o.props === "object" && !Array.isArray(o.props) && o.props !== null ? o.props : void 0;
-  const _id = typeof o._id === "string" ? o._id : void 0;
-  const sourceTrait = typeof o.sourceTrait === "string" ? o.sourceTrait : void 0;
-  return { type: o.type, props, _id, sourceTrait };
-}
-function getSlotContentRenderer2() {
-  if (_scr2) return _scr2;
-  const mod = (init_UISlotRenderer(), __toCommonJS(UISlotRenderer_exports));
-  _scr2 = mod.SlotContentRenderer;
-  return _scr2;
-}
-function resolveDescriptor2(value, idPrefix) {
-  if (value === null || value === void 0) return value;
-  if (React79__default.isValidElement(value)) return value;
-  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
-  if (Array.isArray(value)) {
-    return value.map((item, i) => /* @__PURE__ */ jsx(React79__default.Fragment, { children: resolveDescriptor2(item, `${idPrefix}-${i}`) }, i));
-  }
-  if (typeof value === "object" && value !== null) {
-    const desc = asDescriptor(value);
-    if (desc !== null && getComponentForPattern(desc.type) !== null) {
-      const resolvedProps = desc.props ?? {};
-      const content = {
-        id: desc._id ?? idPrefix,
-        pattern: desc.type,
-        props: resolvedProps,
-        priority: 0,
-        ...desc.sourceTrait !== void 0 && { sourceTrait: desc.sourceTrait }
-      };
-      const SCR = getSlotContentRenderer2();
-      return /* @__PURE__ */ jsx(SCR, { content, onDismiss: () => void 0 }, content.id);
-    }
-  }
-  return null;
-}
-var _scr2, GameShell;
+var GameShell;
 var init_GameShell = __esm({
   "components/game/2d/templates/GameShell.tsx"() {
     init_cn();
     init_Box();
     init_Stack();
     init_Typography();
-    _scr2 = null;
     GameShell = ({
       appName = "Game",
       hud,
       className,
       showTopBar = true,
-      children
+      children,
+      backgroundAsset,
+      hudBackgroundAsset
     }) => {
       return /* @__PURE__ */ jsxs(
         Box,
@@ -36395,7 +36414,7 @@ var init_GameShell = __esm({
             width: "100vw",
             height: "100vh",
             overflow: "hidden",
-            background: "var(--color-background, #0a0a0f)",
+            background: backgroundAsset ? `url(${backgroundAsset.url}) center/cover no-repeat` : "var(--color-background, #0a0a0f)",
             color: "var(--color-text, #e0e0e0)"
           },
           children: [
@@ -36405,7 +36424,7 @@ var init_GameShell = __esm({
                 className: "game-shell__header",
                 style: {
                   flexShrink: 0,
-                  background: "var(--color-surface, #12121f)",
+                  background: hudBackgroundAsset ? `url(${hudBackgroundAsset.url}) center/cover no-repeat` : "var(--color-surface, #12121f)",
                   borderBottom: "1px solid var(--color-border, #2a2a3a)"
                 },
                 children: [
@@ -36428,7 +36447,7 @@ var init_GameShell = __esm({
                       )
                     }
                   ),
-                  hud && /* @__PURE__ */ jsx(Box, { className: "game-shell__hud", style: { width: "100%" }, children: resolveDescriptor2(hud, "gs-hud") })
+                  hud && /* @__PURE__ */ jsx(Box, { className: "game-shell__hud", style: { width: "100%" }, children: hud })
                 ]
               }
             ),
@@ -36441,7 +36460,7 @@ var init_GameShell = __esm({
                   overflow: "hidden",
                   position: "relative"
                 },
-                children: resolveDescriptor2(children, "gs-children")
+                children
               }
             )
           ]
@@ -45115,6 +45134,7 @@ var init_WizardContainer = __esm({
     init_Stack();
     init_Icon();
     init_cn();
+    init_useEventBus();
     WizardContainer = ({
       steps,
       currentStep: controlledStep,
@@ -45123,9 +45143,13 @@ var init_WizardContainer = __esm({
       showProgress = true,
       allowBack = true,
       compact = false,
-      className
+      className,
+      nextEvent,
+      backEvent,
+      completeEvent
     }) => {
       const { t } = useTranslate();
+      const eventBus = useEventBus();
       const [internalStep, setInternalStep] = useState(0);
       const normalizedControlledStep = (() => {
         if (controlledStep === void 0 || controlledStep === null)
@@ -45155,13 +45179,16 @@ var init_WizardContainer = __esm({
           return;
         }
         if (isLastStep) {
+          if (completeEvent) eventBus.emit(`UI:${completeEvent}`, { step: currentStep });
           onComplete?.();
         } else {
+          if (nextEvent) eventBus.emit(`UI:${nextEvent}`, { step: currentStep + 1 });
           goToStep(currentStep + 1);
         }
       };
       const handleBack = () => {
         if (!isFirstStep && allowBack) {
+          if (backEvent) eventBus.emit(`UI:${backEvent}`, { step: currentStep - 1 });
           goToStep(currentStep - 1);
         }
       };
@@ -47846,14 +47873,18 @@ var init_DrawerSlot = __esm({
       title: overrideTitle,
       position = "right",
       size = "md",
-      className
+      className,
+      sourceTrait
     }) => {
       const eventBus = useEventBus();
+      const schemaCtx = useEntitySchemaOptional();
       const isOpen = Boolean(children);
       const title = overrideTitle || extractTitle(children);
       const handleClose = () => {
-        eventBus.emit("UI:CLOSE");
-        eventBus.emit("UI:CANCEL");
+        const orbital = sourceTrait !== void 0 && schemaCtx !== null ? schemaCtx.orbitalsByTrait.get(sourceTrait) : void 0;
+        const prefix = orbital !== void 0 && sourceTrait !== void 0 ? `UI:${orbital}.${sourceTrait}.` : "UI:";
+        eventBus.emit(`${prefix}CLOSE`);
+        eventBus.emit(`${prefix}CANCEL`);
       };
       if (!isOpen) return null;
       return /* @__PURE__ */ jsx(
@@ -49824,14 +49855,18 @@ var init_ModalSlot = __esm({
       children,
       title: overrideTitle,
       size = "md",
-      className
+      className,
+      sourceTrait
     }) => {
       const eventBus = useEventBus();
+      const schemaCtx = useEntitySchemaOptional();
       const isOpen = Boolean(children);
       const title = overrideTitle || extractTitle2(children);
       const handleClose = () => {
-        eventBus.emit("UI:CLOSE");
-        eventBus.emit("UI:CANCEL");
+        const orbital = sourceTrait !== void 0 && schemaCtx !== null ? schemaCtx.orbitalsByTrait.get(sourceTrait) : void 0;
+        const prefix = orbital !== void 0 && sourceTrait !== void 0 ? `UI:${orbital}.${sourceTrait}.` : "UI:";
+        eventBus.emit(`${prefix}CLOSE`);
+        eventBus.emit(`${prefix}CANCEL`);
       };
       if (!isOpen) return null;
       return /* @__PURE__ */ jsx(
@@ -53396,17 +53431,21 @@ var init_ToastSlot = __esm({
       variant: overrideVariant,
       title: overrideTitle,
       duration = 5e3,
-      className
+      className,
+      sourceTrait
     }) => {
       const eventBus = useEventBus();
+      const schemaCtx = useEntitySchemaOptional();
       const isVisible = Boolean(children);
       const extracted = extractToastProps(children);
       const variant = overrideVariant || extracted.variant || "info";
       const title = overrideTitle || extracted.title;
       const message = extracted.message || (typeof children === "string" ? children : "");
       const handleDismiss = () => {
-        eventBus.emit("UI:DISMISS");
-        eventBus.emit("UI:CLOSE");
+        const orbital = sourceTrait !== void 0 && schemaCtx !== null ? schemaCtx.orbitalsByTrait.get(sourceTrait) : void 0;
+        const prefix = orbital !== void 0 && sourceTrait !== void 0 ? `UI:${orbital}.${sourceTrait}.` : "UI:";
+        eventBus.emit(`${prefix}DISMISS`);
+        eventBus.emit(`${prefix}CLOSE`);
       };
       if (!isVisible) return null;
       const isCustomContent = React79__default.isValidElement(children) && !message;
@@ -54133,8 +54172,8 @@ function getSlotFallback(slot, config) {
   const variant = SLOT_SKELETON_MAP[slot] ?? "text";
   return /* @__PURE__ */ jsx(Skeleton, { variant });
 }
-function getComponentForPattern3(patternType) {
-  const mapping = getComponentForPattern(patternType);
+function getComponentForPattern(patternType) {
+  const mapping = getComponentForPattern$1(patternType);
   if (!mapping) {
     return null;
   }
@@ -54342,6 +54381,7 @@ function UISlotComponent({
   const { t } = useTranslate();
   const suspenseConfig = useContext(SuspenseConfigContext);
   const contained = useContext(SlotContainedContext);
+  const schemaCtx = useEntitySchemaOptional();
   const content = slots[slot];
   if (children !== void 0) {
     if (pattern === "clear") {
@@ -54387,8 +54427,11 @@ function UISlotComponent({
   }
   const handleDismiss = () => {
     if (slot === "modal" || slot === "drawer") {
-      eventBus.emit("UI:CLOSE");
-      eventBus.emit("UI:CANCEL");
+      const trait = content?.sourceTrait;
+      const orbital = trait !== void 0 && schemaCtx !== null ? schemaCtx.orbitalsByTrait.get(trait) : void 0;
+      const prefix = orbital !== void 0 && trait !== void 0 ? `UI:${orbital}.${trait}.` : "UI:";
+      eventBus.emit(`${prefix}CLOSE`);
+      eventBus.emit(`${prefix}CANCEL`);
     }
     clear(slot);
   };
@@ -54442,6 +54485,7 @@ function CompiledPortal({ slot, className, pattern, sourceTrait, children }) {
   const slotsBus = useUISlots();
   const eventBus = useEventBus();
   const { t } = useTranslate();
+  const compiledPortalSchemaCtx = useEntitySchemaOptional();
   useEffect(() => {
     setPortalRoot(getOrCreatePortalRoot());
   }, []);
@@ -54450,8 +54494,10 @@ function CompiledPortal({ slot, className, pattern, sourceTrait, children }) {
   });
   const handleDismiss = () => {
     if (slot === "modal" || slot === "drawer") {
-      eventBus.emit("UI:CLOSE");
-      eventBus.emit("UI:CANCEL");
+      const orbital = sourceTrait !== void 0 && compiledPortalSchemaCtx !== null ? compiledPortalSchemaCtx.orbitalsByTrait.get(sourceTrait) : void 0;
+      const prefix = orbital !== void 0 && sourceTrait !== void 0 ? `UI:${orbital}.${sourceTrait}.` : "UI:";
+      eventBus.emit(`${prefix}CLOSE`);
+      eventBus.emit(`${prefix}CANCEL`);
     }
     slotsBus.clear(slot);
   };
@@ -54654,7 +54700,7 @@ function isPatternConfig(value) {
   if (value instanceof Date) return false;
   if (typeof value === "function") return false;
   const record = value;
-  return "type" in record && typeof record.type === "string" && getComponentForPattern(record.type) !== null;
+  return "type" in record && typeof record.type === "string" && getComponentForPattern$1(record.type) !== null;
 }
 function isPlainConfigObject(value) {
   if (React79__default.isValidElement(value)) return false;
@@ -54763,7 +54809,7 @@ function SlotContentRenderer({
     }
   }
   const orbitalName = schemaCtx && content.sourceTrait !== void 0 ? schemaCtx.orbitalsByTrait.get(content.sourceTrait) : void 0;
-  const PatternComponent = getComponentForPattern3(content.pattern);
+  const PatternComponent = getComponentForPattern(content.pattern);
   if (PatternComponent) {
     const childrenConfig = content.props.children;
     const isSingleChild = typeof childrenConfig === "string" || typeof childrenConfig === "object" && childrenConfig !== null && !Array.isArray(childrenConfig) && "type" in childrenConfig;
@@ -55010,6 +55056,7 @@ var init_UISlotRenderer = __esm({
       "custom",
       "dashboard-layout",
       "game-shell",
+      "game-template",
       "scaled-diagram",
       "master-detail",
       "form-field",
@@ -55049,7 +55096,7 @@ function TraitFrame({
   if (!content) {
     return /* @__PURE__ */ jsx(Fragment, { children: fallback });
   }
-  const SlotContentRenderer2 = getSlotContentRenderer3();
+  const SlotContentRenderer2 = getSlotContentRenderer();
   const rendered = /* @__PURE__ */ jsx(
     SlotContentRenderer2,
     {
@@ -55063,7 +55110,7 @@ function TraitFrame({
   }
   return /* @__PURE__ */ jsx(TraitScopeProvider, { orbital, trait: traitName, children: rendered });
 }
-function getSlotContentRenderer3() {
+function getSlotContentRenderer() {
   if (_slotContentRenderer) return _slotContentRenderer;
   const mod = (init_UISlotRenderer(), __toCommonJS(UISlotRenderer_exports));
   _slotContentRenderer = mod.SlotContentRenderer;