@almadar/ui 6.14.0 → 6.16.0

package/dist/runtime/index.js

@@ -3987,7 +3987,7 @@ var init_Textarea = __esm({
     init_cn();
     init_useEventBus();
     Textarea = React87__default.forwardRef(
-      ({ className, error, onChange, ...props }, ref) => {
+      ({ className, error, onChange, action, onKeyDown, ...props }, ref) => {
         const eventBus = useEventBus();
         const handleChange = (e) => {
           if (typeof onChange === "string") {
@@ -3996,11 +3996,18 @@ var init_Textarea = __esm({
             onChange?.(e);
           }
         };
+        const handleKeyDown = (e) => {
+          onKeyDown?.(e);
+          if (!action || e.key !== "Enter" || !(e.metaKey || e.ctrlKey)) return;
+          e.preventDefault();
+          eventBus.emit(`UI:${action}`, { value: e.currentTarget.value });
+        };
         return /* @__PURE__ */ jsx(
           "textarea",
           {
             ref,
             onChange: handleChange,
+            onKeyDown: handleKeyDown,
             className: cn(
               "block w-full border-[length:var(--border-width)] shadow-sm",
               "px-3 py-2 text-sm text-foreground",
@@ -9393,6 +9400,29 @@ var init_useCamera = __esm({
   }
 });
 
+// lib/keyMapEvent.ts
+function isEditableTarget(target) {
+  if (!(target instanceof HTMLElement)) return false;
+  const tag = target.tagName;
+  if (tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT") return true;
+  return target.isContentEditable || target.contentEditable === "true";
+}
+function keyMapCode(e) {
+  let code = e.code;
+  if (e.altKey) code = `Alt+${code}`;
+  if (e.shiftKey) code = `Shift+${code}`;
+  if (e.metaKey || e.ctrlKey) code = `Mod+${code}`;
+  return code;
+}
+function resolveKeyMapEvent(map, e) {
+  if (!map || isEditableTarget(e.target)) return void 0;
+  return map[keyMapCode(e)] ?? map[e.code];
+}
+var init_keyMapEvent = __esm({
+  "lib/keyMapEvent.ts"() {
+  }
+});
+
 // lib/imageCache.ts
 function startLoad(url, onReady, existing) {
   const img = new Image();
@@ -11318,14 +11348,14 @@ function Canvas2D({
   useEffect(() => {
     if (!keyMap && !keyUpMap) return;
     const onDown = (e) => {
-      const ev = keyMap?.[e.code];
+      const ev = resolveKeyMapEvent(keyMap, e);
       if (ev) {
         eventBus.emit(`UI:${ev}`, {});
         e.preventDefault();
       }
     };
     const onUp = (e) => {
-      const ev = keyUpMap?.[e.code];
+      const ev = resolveKeyMapEvent(keyUpMap, e);
       if (ev) eventBus.emit(`UI:${ev}`, {});
     };
     window.addEventListener("keydown", onDown);
@@ -11449,6 +11479,7 @@ var init_Canvas2D = __esm({
     init_useCamera();
     init_useCanvasGestures();
     init_verificationRegistry();
+    init_keyMapEvent();
     init_webPainter2d();
     init_projector();
     init_paintDispatch();
@@ -27378,6 +27409,40 @@ var init_DashboardLayout = __esm({
     NavLinkBottom.displayName = "NavLinkBottom";
   }
 });
+
+// lib/relationLabel.ts
+function relationLabel(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value) || value instanceof Date)
+    return null;
+  for (const key of ["name", "title", "label"]) {
+    const candidate = value[key];
+    if (typeof candidate === "string" && candidate !== "") return candidate;
+  }
+  const id = value.id;
+  return id !== void 0 && id !== null ? String(id) : null;
+}
+function relationDisplayLabels(value, options) {
+  if (value === void 0 || value === null || value === "") return [];
+  if (Array.isArray(value)) {
+    return value.flatMap((item) => relationDisplayLabels(item, options));
+  }
+  const hydrated = relationLabel(value);
+  if (hydrated !== null) return [hydrated];
+  const raw = String(value);
+  const match = options?.find((opt) => opt.value === raw);
+  return [match ? match.label : raw];
+}
+function resolveRelationCellDisplay(value, options) {
+  if (value === null || value === void 0 || value === "") return void 0;
+  const isObjectShaped = typeof value === "object" && !(value instanceof Date) || Array.isArray(value) && value.some((v) => v !== null && typeof v === "object" && !(v instanceof Date));
+  if (!isObjectShaped && !options) return void 0;
+  const labels = relationDisplayLabels(value, options);
+  return labels.length > 0 ? labels.join(", ") : void 0;
+}
+var init_relationLabel = __esm({
+  "lib/relationLabel.ts"() {
+  }
+});
 function downloadItemUrl(url, label) {
   const a = document.createElement("a");
   a.href = url;
@@ -28209,7 +28274,8 @@ function DataGrid({
   positionEvent,
   dndItemIdField,
   dndRoot,
-  look = "dense"
+  look = "dense",
+  relationsData
 }) {
   const eventBus = useEventBus();
   const { t } = useTranslate();
@@ -28399,6 +28465,10 @@ function DataGrid({
               );
             }
             const titleValue = getNestedValue(itemData, titleField?.name ?? "");
+            const titleDisplay = resolveRelationCellDisplay(
+              titleValue,
+              titleField ? relationsData?.[titleField.name] : void 0
+            ) ?? (titleValue !== void 0 && titleValue !== null ? String(titleValue) : void 0);
             return wrapDnd(
               /* @__PURE__ */ jsxs(
                 Box,
@@ -28423,7 +28493,7 @@ function DataGrid({
                         "img",
                         {
                           src: imgUrl,
-                          alt: titleValue !== void 0 ? String(titleValue) : "",
+                          alt: titleDisplay ?? "",
                           className: "w-full h-full object-cover",
                           loading: "lazy"
                         }
@@ -28438,18 +28508,18 @@ function DataGrid({
                           onChange: () => toggleSelection(id),
                           onClick: (e) => e.stopPropagation(),
                           className: "w-4 h-4 mt-1 flex-shrink-0 accent-primary",
-                          "aria-label": t("card.selectItem", { item: titleValue !== void 0 ? String(titleValue) : t("card.itemFallback") })
+                          "aria-label": t("card.selectItem", { item: titleDisplay ?? t("card.itemFallback") })
                         }
                       ),
                       /* @__PURE__ */ jsxs(VStack, { gap: "xs", className: "flex-1 min-w-0", children: [
-                        titleValue !== void 0 && titleValue !== null && /* @__PURE__ */ jsxs(HStack, { gap: "xs", className: "items-center min-w-0", children: [
+                        titleDisplay !== void 0 && /* @__PURE__ */ jsxs(HStack, { gap: "xs", className: "items-center min-w-0", children: [
                           titleField?.icon && renderIconInput(titleField.icon, { size: "sm", className: "text-primary flex-shrink-0" }),
                           /* @__PURE__ */ jsx(
                             Typography,
                             {
                               variant: titleField?.variant === "h3" ? "h3" : "h4",
                               className: "font-semibold truncate min-w-0",
-                              children: String(titleValue)
+                              children: titleDisplay
                             }
                           )
                         ] }),
@@ -28458,7 +28528,7 @@ function DataGrid({
                           if (val === void 0 || val === null || val === "") return null;
                           return /* @__PURE__ */ jsxs(HStack, { gap: "xs", className: "items-center", children: [
                             field.icon && renderIconInput(field.icon, { size: "xs" }),
-                            /* @__PURE__ */ jsx(Badge, { variant: resolveBadgeVariant(field, String(val)), children: humanizeEnumValue(formatValue(val, field.format)) })
+                            /* @__PURE__ */ jsx(Badge, { variant: resolveBadgeVariant(field, String(val)), children: resolveRelationCellDisplay(val, relationsData?.[field.name]) ?? humanizeEnumValue(formatValue(val, field.format)) })
                           ] }, field.name);
                         }) })
                       ] }),
@@ -28497,7 +28567,7 @@ function DataGrid({
                       bodyFields.filter((f3) => f3.variant === "caption" && f3.format !== "boolean").map((field) => {
                         const value = getNestedValue(itemData, field.name);
                         if (value === void 0 || value === null || value === "") return null;
-                        return /* @__PURE__ */ jsx(Typography, { variant: "small", color: "secondary", className: "line-clamp-2", children: formatValue(value, field.format) }, field.name);
+                        return /* @__PURE__ */ jsx(Typography, { variant: "small", color: "secondary", className: "line-clamp-2", children: resolveRelationCellDisplay(value, relationsData?.[field.name]) ?? formatValue(value, field.format) }, field.name);
                       }),
                       /* @__PURE__ */ jsx(HStack, { gap: "md", className: "flex-wrap gap-y-1", children: bodyFields.filter((f3) => f3.variant !== "caption" || f3.format === "boolean").map((field) => {
                         const value = getNestedValue(itemData, field.name);
@@ -28512,7 +28582,7 @@ function DataGrid({
                         return /* @__PURE__ */ jsxs(HStack, { gap: "xs", className: "items-center", children: [
                           field.icon && renderIconInput(field.icon, { size: "xs", className: "text-muted-foreground" }),
                           /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "secondary", className: "sr-only", children: (field.label ?? fieldLabel2(field.name)) + ":" }),
-                          /* @__PURE__ */ jsx(Typography, { variant: "small", color: "secondary", children: formatValue(value, field.format) })
+                          /* @__PURE__ */ jsx(Typography, { variant: "small", color: "secondary", children: resolveRelationCellDisplay(value, relationsData?.[field.name]) ?? formatValue(value, field.format) })
                         ] }, field.name);
                       }) })
                     ] }) })
@@ -28556,6 +28626,7 @@ var init_DataGrid = __esm({
     "use client";
     init_cn();
     init_format();
+    init_relationLabel();
     init_getNestedValue();
     init_useEventBus();
     init_Box();
@@ -28608,7 +28679,9 @@ function statusVariant3(value) {
   if (["new", "created", "scheduled", "queued", "info"].includes(v)) return "info";
   return "default";
 }
-function formatValue2(value, format, boolLabels) {
+function formatValue2(value, format, boolLabels, relationOptions) {
+  const relationDisplay = resolveRelationCellDisplay(value, relationOptions);
+  if (relationDisplay !== void 0) return relationDisplay;
   if (value !== void 0 && value !== null && (format === "boolean" || typeof value === "boolean")) {
     const isNo = value === false || value === 0 || String(value) === "false";
     return isNo ? boolLabels?.no ?? "No" : boolLabels?.yes ?? "Yes";
@@ -28668,7 +28741,8 @@ function DataList({
   positionEvent,
   dndItemIdField,
   dndRoot,
-  look = "dense"
+  look = "dense",
+  relationsData
 }) {
   const eventBus = useEventBus();
   const { t } = useTranslate();
@@ -28856,13 +28930,13 @@ function DataList({
                       return f3.variant === "badge" ? (
                         // `format` applies here too — a boolean field badged
                         // without it renders the raw "false" instead of "No".
-                        /* @__PURE__ */ jsx(Badge, { variant: statusVariant3(String(v)), children: formatValue2(v, f3.format) }, f3.name)
+                        /* @__PURE__ */ jsx(Badge, { variant: statusVariant3(String(v)), children: formatValue2(v, f3.format, void 0, relationsData?.[f3.name]) }, f3.name)
                       ) : /* @__PURE__ */ jsx(
                         Typography,
                         {
                           variant: "caption",
                           className: cn("text-xs", isSent ? "opacity-70" : "text-muted-foreground"),
-                          children: formatValue2(v, f3.format)
+                          children: formatValue2(v, f3.format, void 0, relationsData?.[f3.name])
                         },
                         f3.name
                       );
@@ -28940,6 +29014,10 @@ function DataList({
     }
     const id = itemData.id || String(index);
     const titleValue = getNestedValue(itemData, titleField?.name ?? "");
+    const titleDisplay = resolveRelationCellDisplay(
+      titleValue,
+      titleField ? relationsData?.[titleField.name] : void 0
+    ) ?? (titleValue !== void 0 && titleValue !== null ? String(titleValue) : void 0);
     return wrapDnd(
       /* @__PURE__ */ jsxs(Box, { "data-entity-row": true, "data-entity-id": id, onClick: rowClickEvent ? handleRowClick(itemData) : void 0, className: cn(rowClickEvent && "cursor-pointer"), children: [
         /* @__PURE__ */ jsxs(
@@ -28964,7 +29042,7 @@ function DataList({
                     {
                       variant: titleField?.variant === "h3" ? "h3" : "h4",
                       className: cn("font-semibold truncate flex-1", isCompact && "text-sm"),
-                      children: String(titleValue)
+                      children: titleDisplay
                     }
                   ),
                   badgeFields.map((field) => {
@@ -28972,7 +29050,7 @@ function DataList({
                     if (val === void 0 || val === null) return null;
                     return /* @__PURE__ */ jsxs(HStack, { gap: "xs", className: "items-center flex-shrink-0", children: [
                       field.icon && renderIconInput2(field.icon, { size: "xs" }),
-                      /* @__PURE__ */ jsx(Badge, { variant: statusVariant3(String(val)), children: formatValue2(val, field.format) })
+                      /* @__PURE__ */ jsx(Badge, { variant: statusVariant3(String(val)), children: formatValue2(val, field.format, void 0, relationsData?.[field.name]) })
                     ] }, field.name);
                   })
                 ] }),
@@ -28993,7 +29071,7 @@ function DataList({
                         ]
                       }
                     ),
-                    /* @__PURE__ */ jsx(Typography, { variant: "small", color: "secondary", children: formatValue2(value, field.format, { yes: t("common.yes"), no: t("common.no") }) })
+                    /* @__PURE__ */ jsx(Typography, { variant: "small", color: "secondary", children: formatValue2(value, field.format, { yes: t("common.yes"), no: t("common.no") }, relationsData?.[field.name]) })
                   ] }, field.name);
                 }) }),
                 progressFields.map((field) => {
@@ -29073,6 +29151,7 @@ var init_DataList = __esm({
     "use client";
     init_cn();
     init_format();
+    init_relationLabel();
     init_getNestedValue();
     init_useEventBus();
     init_Box();
@@ -32747,6 +32826,7 @@ var init_MathCanvas = __esm({
     "use client";
     init_useEventBus();
     init_perf();
+    init_keyMapEvent();
     init_atoms();
     init_Stack();
     init_gameFonts();
@@ -32800,14 +32880,14 @@ var init_MathCanvas = __esm({
       useEffect(() => {
         if (!stableKeyMap && !stableKeyUpMap) return;
         const onDown = (e) => {
-          const ev = stableKeyMap?.[e.code];
+          const ev = resolveKeyMapEvent(stableKeyMap, e);
           if (ev) {
             eventBus.emit(`UI:${ev}`, {});
             e.preventDefault();
           }
         };
         const onUp = (e) => {
-          const ev = stableKeyUpMap?.[e.code];
+          const ev = resolveKeyMapEvent(stableKeyUpMap, e);
           if (ev) eventBus.emit(`UI:${ev}`, {});
         };
         window.addEventListener("keydown", onDown);
@@ -35223,33 +35303,6 @@ var init_Lightbox = __esm({
     Lightbox.displayName = "Lightbox";
   }
 });
-
-// lib/relationLabel.ts
-function relationLabel(value) {
-  if (value === null || typeof value !== "object" || Array.isArray(value) || value instanceof Date)
-    return null;
-  for (const key of ["name", "title", "label"]) {
-    const candidate = value[key];
-    if (typeof candidate === "string" && candidate !== "") return candidate;
-  }
-  const id = value.id;
-  return id !== void 0 && id !== null ? String(id) : null;
-}
-function relationDisplayLabels(value, options) {
-  if (value === void 0 || value === null || value === "") return [];
-  if (Array.isArray(value)) {
-    return value.flatMap((item) => relationDisplayLabels(item, options));
-  }
-  const hydrated = relationLabel(value);
-  if (hydrated !== null) return [hydrated];
-  const raw = String(value);
-  const match = options?.find((opt) => opt.value === raw);
-  return [match ? match.label : raw];
-}
-var init_relationLabel = __esm({
-  "lib/relationLabel.ts"() {
-  }
-});
 function renderIconInput3(icon, props) {
   return typeof icon === "string" ? /* @__PURE__ */ jsx(Icon, { name: icon, ...props }) : /* @__PURE__ */ jsx(Icon, { icon, ...props });
 }
@@ -35313,7 +35366,8 @@ function TableView({
   reorderEvent,
   positionEvent,
   dndItemIdField,
-  dndRoot
+  dndRoot,
+  relationsData
 }) {
   const eventBus = useEventBus();
   const { t } = useTranslate();
@@ -35398,7 +35452,7 @@ function TableView({
   const colFloors = React87__default.useMemo(
     () => colDefs.map((col) => {
       const longest = data.reduce((widest, row) => {
-        const cell = formatCell(asFieldValue(getNestedValue(row, col.field ?? col.key)), col.format);
+        const cell = formatCell(asFieldValue(getNestedValue(row, col.field ?? col.key)), col.format, relationsData?.[col.field ?? col.key]);
         return Math.max(widest, cell.length);
       }, columnLabel(col).length);
       const chrome = col.format === "badge" ? BADGE_CHROME_CH : 0;
@@ -35498,9 +35552,11 @@ function TableView({
               col.className
             );
             if (col.format === "badge" && raw != null && raw !== "") {
-              return /* @__PURE__ */ jsx(Box, { role: "cell", className: cellBase, children: /* @__PURE__ */ jsx(Badge, { variant: statusVariant4(String(raw)), size: "sm", className: "whitespace-nowrap", children: humanizeEnumValue(String(raw)) }) }, col.key);
+              const relationDisplay = resolveRelationCellDisplay(raw, relationsData?.[col.field ?? col.key]);
+              const label = relationDisplay ?? humanizeEnumValue(String(raw));
+              return /* @__PURE__ */ jsx(Box, { role: "cell", className: cellBase, children: /* @__PURE__ */ jsx(Badge, { variant: statusVariant4(String(raw)), size: "sm", className: "whitespace-nowrap", children: label }) }, col.key);
             }
-            return /* @__PURE__ */ jsx(Box, { role: "cell", className: cellBase, children: /* @__PURE__ */ jsx("span", { className: "truncate text-foreground", children: formatCell(raw, col.format) }) }, col.key);
+            return /* @__PURE__ */ jsx(Box, { role: "cell", className: cellBase, children: /* @__PURE__ */ jsx("span", { className: "truncate text-foreground", children: formatCell(raw, col.format, relationsData?.[col.field ?? col.key]) }) }, col.key);
           }),
           hasActions && /* @__PURE__ */ jsxs(
             HStack,
@@ -35602,11 +35658,9 @@ var init_TableView = __esm({
     init_Menu();
     init_useDataDnd();
     tableViewLog = createLogger("almadar:ui:table-view");
-    formatCell = (value, format) => {
-      if (value !== null && value !== void 0 && typeof value === "object" && !(value instanceof Date)) {
-        const labels = relationDisplayLabels(value);
-        if (labels.length > 0) return labels.join(", ");
-      }
+    formatCell = (value, format, relationOptions) => {
+      const relationDisplay = resolveRelationCellDisplay(value, relationOptions);
+      if (relationDisplay !== void 0) return relationDisplay;
       return formatValue(value, format);
     };
     MAX_MEASURED_COL_CH = 32;
@@ -44178,7 +44232,8 @@ function DataTable({
   headerActions,
   showTotal = true,
   className,
-  look = "dense"
+  look = "dense",
+  relationsData
 }) {
   const [openActionMenu, setOpenActionMenu] = useState(
     null
@@ -44473,6 +44528,11 @@ function DataTable({
                       "data-column": String(col.key),
                       className: "px-4 py-3 text-sm text-foreground whitespace-nowrap sm:whitespace-normal",
                       children: col.render ? col.render(cellValue, row, rowIndex) : (() => {
+                        const relationDisplay = resolveRelationCellDisplay(
+                          cellValue,
+                          relationsData?.[String(col.key)]
+                        );
+                        if (relationDisplay !== void 0) return relationDisplay;
                         const boolVal = asBooleanValue2(cellValue);
                         if (boolVal !== null) {
                           return boolVal ? /* @__PURE__ */ jsx(Badge, { variant: "success", children: t("common.yes") }) : /* @__PURE__ */ jsx(Badge, { variant: "neutral", children: t("common.no") });
@@ -44561,6 +44621,7 @@ var init_DataTable = __esm({
     init_cn();
     init_format();
     init_getNestedValue();
+    init_relationLabel();
     init_atoms();
     init_Box();
     init_Stack();
@@ -52921,7 +52982,7 @@ function runTickFrame(entityId, orderedWriters, store) {
 }
 var log3 = createLogger("almadar:ui:effects:client-handlers");
 function createClientEffectHandlers(options) {
-  const { eventBus, slotSetter, navigate, navigateBack, callService, liveEntity, persistDelegated } = options;
+  const { eventBus, slotSetter, navigate, navigateBack, callService, liveEntity, persistDelegated, callServiceDelegated } = options;
   return {
     emit: (event, payload, source) => {
       const prefixedEvent = event.startsWith("UI:") ? event : `UI:${event}`;
@@ -52934,6 +52995,7 @@ function createClientEffectHandlers(options) {
     // carries its outcome — tell the executor so the placeholder above is
     // never read as a denial (see `EffectHandlers.persistDelegated`).
     ...persistDelegated === true ? { persistDelegated: true } : {},
+    ...callServiceDelegated === true ? { callServiceDelegated: true } : {},
     // @almadar/runtime EffectHandlers.set types value:unknown — should be FieldValue (upstream fix queued)
     set: ((_entityId, field, value) => {
       if (!liveEntity) {
@@ -53509,7 +53571,6 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
   }, [traitStates]);
   const traitSnapshotDataRef = useRef(/* @__PURE__ */ new Map());
   const traitFieldStatesRef = useRef(/* @__PURE__ */ new Map());
-  const bridgeEchoPendingRef = useRef(/* @__PURE__ */ new Map());
   const bindingSnapshotsRef = useRef(/* @__PURE__ */ new Map());
   const bindingListenersRef = useRef(/* @__PURE__ */ new Map());
   const publishBindingSnapshot = useCallback((traitName, row) => {
@@ -53670,7 +53731,11 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       // No local persistence adapter (bridge mode, or a syncOnly tick):
       // nothing persists client-side, the server owns the write and
       // reports it — never read the placeholder as a denial.
-      persistDelegated: (syncOnly ? void 0 : optionsRef.current?.persistence) === void 0
+      persistDelegated: (syncOnly ? void 0 : optionsRef.current?.persistence) === void 0,
+      // Bridge mode with no consumer-supplied callService: the server
+      // runs every call-service and its cascade carries the result —
+      // the client's mock must not also run one.
+      callServiceDelegated: optionsRef.current?.callService === void 0 && (syncOnly ? void 0 : optionsRef.current?.persistence) === void 0
     });
     const persistence = syncOnly ? void 0 : optionsRef.current?.persistence;
     let handlers = clientHandlers;
@@ -53986,6 +54051,11 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     const _perfT0 = perfStart("processEvent:total");
     const bindings = traitBindingsRef.current;
     const currentManager = managerRef.current;
+    if (sourceTrait === void 0 && tick === void 0) {
+      for (const snap of traitSnapshotDataRef.current.values()) {
+        snap.cascadeReceived = [];
+      }
+    }
     crossTraitLog.debug("processEvent:enter", () => ({
       event: normalizedEvent,
       payload: JSON.stringify(payload ?? null),
@@ -54024,7 +54094,6 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     });
     const emittedByTrait = /* @__PURE__ */ new Map();
     const serverEffectResultsByTrait = /* @__PURE__ */ new Map();
-    bridgeEchoPendingRef.current.clear();
     for (const { traitName, result } of results) {
       const binding = bindingMap.get(traitName);
       const traitState = currentManager.getState(traitName);
@@ -54082,12 +54151,6 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         perfEnd("processEvent:executeAll", _perfT2);
         emittedByTrait.set(traitName, emittedDuringExec);
         serverEffectResultsByTrait.set(traitName, transitionServerEffectResults);
-        for (const emittedKey of emittedDuringExec) {
-          bridgeEchoPendingRef.current.set(
-            emittedKey,
-            (bridgeEchoPendingRef.current.get(emittedKey) ?? 0) + 1
-          );
-        }
         await reRenderCallsiteCaptureChildren(traitName, payload ?? {}, entityByTrait, stateLog);
       } else if (!result.executed) {
         if (result.guardResult === false) {
@@ -54161,6 +54224,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
               // the verifier reads emittedEvents only.
               orbitalName: "",
               success: true,
+              transitioned: true,
               clientEffects: effectTraces.length,
               dataEntities: {},
               emittedEvents,
@@ -54182,7 +54246,8 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         if (orbital) dispatchedOrbitals.add(orbital);
       }
       const relayPayload = targetTrait !== void 0 ? { ...payload ?? {}, _targetTrait: targetTrait } : payload;
-      void onEventProcessed(normalizedEvent, relayPayload, dispatchedOrbitals, tick, sourceTrait);
+      const locallyEmitted = Array.from(emittedByTrait.values()).flat();
+      void onEventProcessed(normalizedEvent, relayPayload, dispatchedOrbitals, tick, sourceTrait, locallyEmitted);
     }
     perfEnd("processEvent:total", _perfT0);
     perfEnd(`event:${normalizedEvent}`, _perfT0);
@@ -54249,14 +54314,9 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         subscribedBusKeys.add(selfBusKey);
         crossTraitLog.debug("self:subscribe", { traitName, busKey: selfBusKey, eventKey });
         const unsub = eventBus.on(selfBusKey, (event) => {
-          if (event.source && event.source.dispatched) {
-            const pendingEchoes = bridgeEchoPendingRef.current.get(eventKey) ?? 0;
-            if (pendingEchoes > 0) {
-              bridgeEchoPendingRef.current.set(eventKey, pendingEchoes - 1);
-              crossTraitLog.debug("self:fire-skipped-bridge-echo", { traitName, busKey: selfBusKey, eventKey });
-              return;
-            }
-            crossTraitLog.debug("self:fire-server-cascade", { traitName, busKey: selfBusKey, eventKey });
+          if (event.source?.dispatched) {
+            crossTraitLog.debug("self:fire-skipped-bridge-echo", { traitName, busKey: selfBusKey, eventKey });
+            return;
           }
           crossTraitLog.debug("self:fire", { traitName, busKey: selfBusKey, eventKey });
           enqueueAndDrain(eventKey, event.payload, traitName, event.source?.tick, event.source?.trait);
@@ -54625,7 +54685,7 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
     [serverActiveTraits]
   );
   const uiSlots = useUISlots();
-  const onEventProcessed = useCallback((event, payload, dispatchedOrbitals, tick, sourceTrait) => {
+  const onEventProcessed = useCallback((event, payload, dispatchedOrbitals, tick, sourceTrait, locallyEmitted) => {
     if (!bridge.connected || !orbitalNames?.length) return;
     const targets = dispatchedOrbitals && dispatchedOrbitals.size > 0 ? orbitalNames.filter((n) => dispatchedOrbitals.has(n)) : orbitalNames;
     xOrbitalLog.debug("TraitInitializer:fanout", () => ({
@@ -54639,7 +54699,7 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
         void bridge.sendEvent(name, event, withActiveTraits(payload), tick, sourceTrait);
         continue;
       }
-      void bridge.sendEvent(name, event, withActiveTraits(payload)).then(({ effects, meta }) => {
+      void bridge.sendEvent(name, event, withActiveTraits(payload), void 0, void 0, locallyEmitted).then(({ effects, meta }) => {
         recordServerResponse(name, event, { ...meta, effectResults: effectResultsToTraces(meta.effectResults) });
         applyServerEffects(effects, uiSlots, onNavigate, embeddedTraits, activeTraitNames, onNavigateBack);
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/ui",
-  "version": "6.14.0",
+  "version": "6.16.0",
   "description": "React UI components, hooks, and providers for Almadar",
   "type": "module",
   "sideEffects": [
@@ -118,11 +118,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@almadar/core": "^10.90.0",
+    "@almadar/core": "^10.92.0",
     "@almadar/evaluator": "^2.45.0",
     "@almadar/logger": "^1.12.0",
-    "@almadar/runtime": "^6.75.0",
-    "@almadar/std": "^16.211.0",
+    "@almadar/runtime": "^6.77.0",
+    "@almadar/std": "^16.213.0",
     "@almadar/syntax": "^1.17.0",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",