@almadar/ui 6.52.0 → 6.53.0

package/dist/chunk-CBIJP5PL.js

@@ -0,0 +1,284 @@
+import { Icon, Button, Switch, Input } from './chunk-3EF5SDIJ.js';
+import { VStack, HStack } from './chunk-7LM6I3NA.js';
+import { Typography } from './chunk-GMDMOYXD.js';
+import { cn } from './chunk-64WACXM7.js';
+import React from 'react';
+import { useTranslate } from '@almadar/ui/hooks';
+import { jsx, jsxs } from 'react/jsx-runtime';
+
+var isObj = (v) => v !== null && typeof v === "object" && !Array.isArray(v);
+var isArr = (v) => Array.isArray(v);
+function kindOf(v) {
+  if (v === null) return "null";
+  if (isArr(v)) return "array";
+  if (isObj(v)) return "object";
+  if (typeof v === "number") return "number";
+  if (typeof v === "boolean") return "boolean";
+  return "string";
+}
+var TYPE_LABEL_KEY = {
+  string: "jsonTree.type.text",
+  number: "jsonTree.type.number",
+  boolean: "jsonTree.type.boolean"
+};
+var TYPE_LABEL_SYMBOL = {
+  object: "{}",
+  array: "[]",
+  null: "\u2014"
+};
+function typeLabel(kind, t) {
+  if (kind === "object" || kind === "array" || kind === "null") return TYPE_LABEL_SYMBOL[kind];
+  return t(TYPE_LABEL_KEY[kind] ?? "");
+}
+var KIND_OPTIONS = ["string", "number", "boolean", "object", "array"];
+function emptyOf(kind) {
+  switch (kind) {
+    case "object":
+      return {};
+    case "array":
+      return [];
+    case "number":
+      return 0;
+    case "boolean":
+      return false;
+    case "null":
+      return null;
+    default:
+      return "";
+  }
+}
+function templateFrom(arr) {
+  if (arr.length === 0) return "";
+  const first = arr[0];
+  if (isObj(first)) {
+    const blank = {};
+    for (const k of Object.keys(first)) blank[k] = isObj(first[k]) ? {} : isArr(first[k]) ? [] : first[k];
+    return blank;
+  }
+  if (isArr(first)) return [];
+  return emptyOf(kindOf(first));
+}
+function ScalarControl({
+  value,
+  onChange
+}) {
+  if (typeof value === "boolean") {
+    return /* @__PURE__ */ jsx(Switch, { checked: value, onChange: (c) => onChange(c) });
+  }
+  const numeric = typeof value === "number";
+  const initial = value === null ? "" : String(value);
+  const [draft, setDraft] = React.useState(initial);
+  React.useEffect(() => setDraft(initial), [initial]);
+  const commit = () => {
+    if (numeric) {
+      const n = draft.trim() === "" ? 0 : Number(draft);
+      onChange(Number.isNaN(n) ? 0 : n);
+    } else {
+      onChange(draft);
+    }
+  };
+  return /* @__PURE__ */ jsx(
+    Input,
+    {
+      inputType: numeric ? "number" : "text",
+      value: draft,
+      placeholder: value === null ? "null" : void 0,
+      onChange: (e) => setDraft(e.target.value),
+      onBlur: commit,
+      onKeyDown: (e) => {
+        if (e.key === "Enter") commit();
+      }
+    }
+  );
+}
+function KindSelect({
+  kind,
+  onChange
+}) {
+  const { t } = useTranslate();
+  return /* @__PURE__ */ jsx(
+    "select",
+    {
+      value: kind === "null" ? "string" : kind,
+      onChange: (e) => onChange(e.target.value),
+      "aria-label": t("jsonTree.valueType"),
+      className: cn(
+        "h-6 rounded-interactive bg-muted text-muted-foreground text-[10px] font-mono px-1",
+        "border-[length:var(--border-width-thin)] border-border",
+        "hover:bg-card focus:outline-none focus:ring-1 focus:ring-ring"
+      ),
+      children: KIND_OPTIONS.map((k) => /* @__PURE__ */ jsx("option", { value: k, children: typeLabel(k, t) }, k))
+    }
+  );
+}
+function ValueNode({
+  value,
+  onChange,
+  depth,
+  readonly
+}) {
+  const kind = kindOf(value);
+  if (kind === "object" || kind === "array") {
+    return /* @__PURE__ */ jsx(ContainerNode, { value, onChange, depth, readonly });
+  }
+  if (readonly) {
+    return /* @__PURE__ */ jsx(Typography, { variant: "caption", className: "font-mono text-foreground", children: value === null ? "null" : String(value) });
+  }
+  return /* @__PURE__ */ jsx(ScalarControl, { value, onChange });
+}
+function Row({
+  rowKey,
+  isArrayItem,
+  value,
+  depth,
+  onValue,
+  onRenameKey,
+  onChangeKind,
+  onRemove,
+  readonly
+}) {
+  const { t } = useTranslate();
+  const [keyDraft, setKeyDraft] = React.useState(rowKey);
+  React.useEffect(() => setKeyDraft(rowKey), [rowKey]);
+  const container = isObj(value) || isArr(value);
+  return /* @__PURE__ */ jsxs(VStack, { gap: "none", className: "group w-max min-w-full", children: [
+    /* @__PURE__ */ jsxs(HStack, { gap: "xs", align: "center", className: "py-0.5 w-max", children: [
+      readonly ? /* @__PURE__ */ jsx("span", { className: cn(
+        "h-6 rounded-interactive bg-muted text-muted-foreground text-[10px] font-mono px-1 flex items-center",
+        "border-[length:var(--border-width-thin)] border-border"
+      ), children: typeLabel(kindOf(value), t) }) : /* @__PURE__ */ jsx(KindSelect, { kind: kindOf(value), onChange: onChangeKind }),
+      isArrayItem ? /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "muted", className: "w-6 shrink-0 font-mono", children: rowKey }) : readonly ? /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "muted", className: "w-20 shrink-0 font-mono truncate", children: rowKey }) : /* @__PURE__ */ jsx("div", { className: "w-20 shrink-0", children: /* @__PURE__ */ jsx(
+        Input,
+        {
+          inputType: "text",
+          value: keyDraft,
+          onChange: (e) => setKeyDraft(e.target.value),
+          onBlur: () => keyDraft !== rowKey && onRenameKey(keyDraft),
+          onKeyDown: (e) => {
+            if (e.key === "Enter" && keyDraft !== rowKey) onRenameKey(keyDraft);
+          },
+          className: "font-mono"
+        }
+      ) }),
+      !container && /* @__PURE__ */ jsx("div", { className: "w-48 shrink-0", children: /* @__PURE__ */ jsx(ValueNode, { value, onChange: onValue, depth: depth + 1, readonly }) }),
+      !readonly && /* @__PURE__ */ jsx(
+        Button,
+        {
+          variant: "ghost",
+          size: "sm",
+          icon: "x",
+          onClick: onRemove,
+          "aria-label": t("common.remove"),
+          className: "shrink-0 text-muted-foreground hover:text-error"
+        }
+      )
+    ] }),
+    container && /* @__PURE__ */ jsx("div", { className: "pl-2", children: /* @__PURE__ */ jsx(ValueNode, { value, onChange: onValue, depth: depth + 1, readonly }) })
+  ] });
+}
+function ContainerNode({
+  value,
+  onChange,
+  depth,
+  readonly
+}) {
+  const { t } = useTranslate();
+  const [open, setOpen] = React.useState(depth < 2);
+  const array = isArr(value);
+  const entries = array ? value.map((v, i) => [String(i), v]) : Object.entries(value);
+  const setObjValue = (key, next) => {
+    onChange({ ...value, [key]: next });
+  };
+  const renameKey = (oldKey, newKey) => {
+    if (!newKey || newKey === oldKey) return;
+    const out = {};
+    for (const [k, v] of Object.entries(value)) out[k === oldKey ? newKey : k] = v;
+    onChange(out);
+  };
+  const removeObjKey = (key) => {
+    const out = {};
+    for (const [k, v] of Object.entries(value)) if (k !== key) out[k] = v;
+    onChange(out);
+  };
+  const changeObjKind = (key, k) => setObjValue(key, emptyOf(k));
+  const setArrValue = (idx, next) => {
+    const copy = [...value];
+    copy[idx] = next;
+    onChange(copy);
+  };
+  const removeArrIdx = (idx) => onChange(value.filter((_, i) => i !== idx));
+  const changeArrKind = (idx, k) => setArrValue(idx, emptyOf(k));
+  const add = () => {
+    if (array) {
+      onChange([...value, templateFrom(value)]);
+    } else {
+      const obj = value;
+      let key = "key";
+      let n = 1;
+      while (key in obj) {
+        key = `key${n}`;
+        n += 1;
+      }
+      onChange({ ...obj, [key]: "" });
+    }
+  };
+  const summaryKey = array ? entries.length === 1 ? "jsonTree.itemCountOne" : "jsonTree.itemCountOther" : entries.length === 1 ? "jsonTree.fieldCountOne" : "jsonTree.fieldCountOther";
+  const summary = t(summaryKey, { count: entries.length });
+  return /* @__PURE__ */ jsxs(VStack, { gap: "none", className: "w-full", children: [
+    /* @__PURE__ */ jsx(HStack, { gap: "xs", align: "center", children: /* @__PURE__ */ jsxs(
+      "button",
+      {
+        type: "button",
+        onClick: () => setOpen((o) => !o),
+        className: "flex items-center gap-1 text-muted-foreground hover:text-foreground",
+        "aria-label": open ? t("jsonTree.collapse") : t("jsonTree.expand"),
+        children: [
+          /* @__PURE__ */ jsx(Icon, { name: open ? "chevron-down" : "chevron-right", size: "sm" }),
+          /* @__PURE__ */ jsx("span", { className: "font-mono text-xs", children: array ? "[ ]" : "{ }" }),
+          /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "muted", children: summary })
+        ]
+      }
+    ) }),
+    open && /* @__PURE__ */ jsxs(
+      VStack,
+      {
+        gap: "none",
+        className: cn("ml-1.5 pl-1.5 w-max min-w-full border-l-[length:var(--border-width-thin)] border-border"),
+        children: [
+          entries.map(([k, v], idx) => /* @__PURE__ */ jsx(
+            Row,
+            {
+              rowKey: k,
+              isArrayItem: array,
+              value: v,
+              depth,
+              onValue: (next) => array ? setArrValue(idx, next) : setObjValue(k, next),
+              onRenameKey: (nk) => renameKey(k, nk),
+              onChangeKind: (kind) => array ? changeArrKind(idx, kind) : changeObjKind(k, kind),
+              onRemove: () => array ? removeArrIdx(idx) : removeObjKey(k),
+              readonly
+            },
+            array ? idx : k
+          )),
+          !readonly && /* @__PURE__ */ jsx(
+            Button,
+            {
+              variant: "ghost",
+              size: "sm",
+              icon: "plus",
+              label: array ? t("jsonTree.addItem") : t("jsonTree.addField"),
+              onClick: add,
+              className: "self-start text-muted-foreground"
+            }
+          )
+        ]
+      }
+    )
+  ] });
+}
+var JsonTreeEditor = ({ value, onChange, className, readonly }) => {
+  const root = value ?? "";
+  return /* @__PURE__ */ jsx("div", { className: cn("w-full overflow-x-auto rounded-container bg-card/40 p-2 border-[length:var(--border-width-thin)] border-border", className), children: /* @__PURE__ */ jsx(ValueNode, { value: root, onChange, depth: 0, readonly }) });
+};
+
+export { JsonTreeEditor };

package/dist/{chunk-CLSLVFSP.js → chunk-GMDMOYXD.js}

@@ -1,5 +1,5 @@
-import { cn, domPassthrough } from './chunk-IN3BVW2Z.js';
-import { formatValue } from './chunk-V5AGW2JN.js';
+import { cn, domPassthrough } from './chunk-64WACXM7.js';
+import { formatValue } from './chunk-4OZDHCZV.js';
 import React from 'react';
 import { useFormatContext } from '@almadar/ui/hooks';
 

package/dist/{chunk-NCNP2RKZ.js → chunk-GODZKHAL.js}

@@ -1,5 +1,5 @@
-import { DEFAULT_CURRENCY } from './chunk-V5AGW2JN.js';
-import { en_default } from './chunk-WB2A6V3I.js';
+import { DEFAULT_CURRENCY } from './chunk-4OZDHCZV.js';
+import { en_default } from './chunk-UGHAADU5.js';
 import React, { createContext, useEffect, useContext, useMemo } from 'react';
 
 var { $meta: _meta, ...coreMessages } = en_default;

package/dist/{chunk-QWDKMVLX.js → chunk-IKULQIDX.js}

@@ -1,18 +1,18 @@
 import { runTickFrame } from './chunk-DQTV6QVS.js';
-import { ALL_SLOTS } from './chunk-2QB2PXOO.js';
-import { UISlotRenderer } from './chunk-EERAGPBW.js';
-import { Box } from './chunk-BHZG4PDZ.js';
-import { Typography } from './chunk-CLSLVFSP.js';
-import { beginPending, endPending } from './chunk-TWHYH25Q.js';
+import { ALL_SLOTS } from './chunk-VHTJRS2N.js';
+import { UISlotRenderer } from './chunk-3EF5SDIJ.js';
+import { Box } from './chunk-7LM6I3NA.js';
+import { Typography } from './chunk-GMDMOYXD.js';
+import { beginPending, endPending } from './chunk-JRW33U35.js';
 import { useEventBus } from './chunk-6EV3OEBQ.js';
-import { registerTrait, unregisterTrait, perfTimeAsync } from './chunk-G4GMXYMY.js';
+import { registerTrait, unregisterTrait, perfTimeAsync } from './chunk-KQXXO42S.js';
 import { bindTraitStateGetter, registerTraitSnapshot, recordTransition, recordingTransport, recordServerResponse } from './chunk-O7OLVVBR.js';
-import { isNotificationSlot } from './chunk-YHY5K2Y7.js';
+import { isNotificationSlot } from './chunk-PEST66PN.js';
 import React, { useState, useMemo, useEffect, useRef, useCallback, useSyncExternalStore } from 'react';
 import { schemaToIR, getPage, clearSchemaCache as clearSchemaCache$1, applyListenPayloadMapping, buildResolvedTraitConfigs, collectCallsiteCaptureChildren, walkSExpr, isRenderBindingMarker, containsEntityBinding, isSExpr, isEventPayloadValue, RENDER_BINDING_MARKER } from '@almadar/core';
 import { createLogger } from '@almadar/logger';
-import { LIFECYCLE_EVENTS, InMemoryPersistence, createInProcessTransport, buildTraitIndex, createMemoryCircuitStore, createIndexStageRunner, evaluateOrbitalEvent, createClientKernel, collectListenerTargets, createTickScheduler, isValidCronExpression, parseDurationString, UNMOUNT_EVENT, createClientEffectHandlers, EffectExecutor, isSExpression, collectDeclaredConfigDefaults, createContextFromBindings, normalizeCallSiteConfigToValues } from '@almadar/runtime';
-import { useUser, useArbitraryClassStyles, getAllPages, matchPathAmong, CurrentPagePathProvider, NavStackProvider, OrbitalProvider, useNavStack, VerificationProvider, EntitySchemaProvider, OrbitalThemeProvider, ServerBridgeProvider, useServerBridge, EntityBindingContext } from '@almadar/ui/providers';
+import { collectListenerTargets, LIFECYCLE_EVENTS, InMemoryPersistence, createInProcessTransport, buildTraitIndex, createMemoryCircuitStore, createIndexStageRunner, evaluateOrbitalEvent, createClientKernel, createTickScheduler, isValidCronExpression, parseDurationString, UNMOUNT_EVENT, createClientEffectHandlers, EffectExecutor, isSExpression, collectDeclaredConfigDefaults, createContextFromBindings, normalizeCallSiteConfigToValues } from '@almadar/runtime';
+import { useUser, useArbitraryClassStyles, getAllPages, matchPathAmong, CurrentPagePathProvider, NavStackProvider, OrbitalProvider, useNavStack, VerificationProvider, EntitySchemaProvider, OrbitalThemeProvider, ServerBridgeProvider, useServerBridge, EntityBindingContext, AwaitingSkeletonContext } from '@almadar/ui/providers';
 import { evaluateListenPayloadExpr, evaluate, createMinimalContext, evaluateGuard, executeEffects } from '@almadar/evaluator';
 import { getPatternDefinition } from '@almadar/core/patterns';
 import { isKnownStdOperator } from '@almadar/std/registry';
@@ -270,6 +270,18 @@ function useCircuitKernel(traitBindings, options) {
     [baseTransport]
   );
   const orbitalName = options.orbitals[0]?.name ?? "";
+  const topology = useMemo(() => {
+    let resolve = () => void 0;
+    const promise = new Promise((r) => {
+      resolve = r;
+    });
+    return { promise, resolve };
+  }, [effectiveTransport]);
+  const awaitTopology = options.awaitTopology === true;
+  const confirmedCarries = options.carriesCircuitState ?? false;
+  useEffect(() => {
+    if (!awaitTopology) topology.resolve({ carriesCircuitState: confirmedCarries });
+  }, [awaitTopology, confirmedCarries, topology]);
   const rawKernel = useMemo(() => createClientKernel({
     orbitalName,
     traitIndex,
@@ -282,7 +294,8 @@ function useCircuitKernel(traitBindings, options) {
     ...options.contextExtensions !== void 0 ? { contextExtensions: options.contextExtensions } : {},
     ...options.debug !== void 0 ? { debug: options.debug } : {},
     ...options.logContext !== void 0 ? { logContext: options.logContext } : {},
-    carriesCircuitState: options.carriesCircuitState ?? false,
+    carriesCircuitState: false,
+    topology: topology.promise,
     ...effectiveTransport !== void 0 ? { transport: effectiveTransport } : {}
   }), [
     orbitalName,
@@ -296,50 +309,16 @@ function useCircuitKernel(traitBindings, options) {
     options.contextExtensions,
     options.debug,
     options.logContext,
-    options.carriesCircuitState,
+    topology,
     effectiveTransport
   ]);
-  const rawKernelRef = useRef(rawKernel);
-  rawKernelRef.current = rawKernel;
-  const awaitTopology = options.awaitTopology === true;
-  const holdRef = useRef(awaitTopology);
-  holdRef.current = awaitTopology;
-  const heldRef = useRef([]);
-  useEffect(() => {
-    if (awaitTopology) return;
-    const held = heldRef.current;
-    heldRef.current = [];
-    for (const release of held) release();
-  }, [awaitTopology, rawKernel]);
   const kernel = useMemo(() => ({
     store: rawKernel.store,
-    dispatch: (request) => {
-      const stamped = request.clientId !== void 0 ? request : { ...request, clientId: getTabClientId() };
-      if (!holdRef.current) return rawKernel.dispatch(stamped);
-      return new Promise((resolve, reject) => {
-        heldRef.current.push(() => {
-          rawKernelRef.current.dispatch(stamped).then(resolve, reject);
-        });
-      });
-    }
+    dispatch: (request, hooks) => rawKernel.dispatch(request.clientId !== void 0 ? request : { ...request, clientId: getTabClientId() }, hooks),
+    dispatchMount: (seeds, hooks, base = {}) => rawKernel.dispatchMount(seeds, hooks, base.clientId !== void 0 ? base : { ...base, clientId: getTabClientId() }),
+    dispatchProgress: (request) => rawKernel.dispatchProgress(request.clientId !== void 0 ? request : { ...request, clientId: getTabClientId() })
   }), [rawKernel]);
-  const kernelRef = useRef(kernel);
-  kernelRef.current = kernel;
-  useEffect(() => {
-    if (!effectiveTransport?.subscribe) return;
-    return effectiveTransport.subscribe((emitted) => {
-      const targets = collectListenerTargets(traitIndex, emitted.source, emitted.event, emitted.payload);
-      for (const target of targets) {
-        void kernelRef.current.dispatch({
-          event: target.triggers,
-          ...target.payload !== void 0 ? { payload: target.payload } : {},
-          ...target.entityId !== void 0 ? { entityId: target.entityId } : {},
-          targetTrait: target.listenerTrait
-        });
-      }
-    }, { clientId: getTabClientId() });
-  }, [effectiveTransport, traitIndex]);
-  return { kernel, store, traitIndex };
+  return { kernel, store, traitIndex, transport: effectiveTransport };
 }
 var log2 = createLogger("almadar:ui:circuit:bus-ingress");
 function useBusIngress(traitBindings, traitIndex, settle, eventBus) {
@@ -519,7 +498,7 @@ function resolveLambdaBindings(body, params, item, index) {
   return body;
 }
 var LazySlotContentRenderer = React.lazy(
-  () => import('./UISlotRenderer-CR7SCAMR.js').then((m) => ({ default: m.SlotContentRenderer }))
+  () => import('./UISlotRenderer-JT34I3O7.js').then((m) => ({ default: m.SlotContentRenderer }))
 );
 function deferLambdaEntityExprs(value) {
   if (typeof value === "string") {
@@ -1131,6 +1110,25 @@ function sameFields(a, b) {
   }
   return true;
 }
+function useAwaitingSkeletonSource(store, traitIndex, embeddedTraits) {
+  return useMemo(() => {
+    const activeRenders = () => {
+      const renders = [];
+      for (const awaiting of store.awaiting.list()) {
+        const transitions = traitIndex.byName.get(awaiting.trait)?.irTrait.stateMachine?.transitions ?? [];
+        const taken = transitions.find((t) => t.event === awaiting.event && t.from === awaiting.from);
+        if (taken?.awaitRender) renders.push(...taken.awaitRender);
+      }
+      return renders;
+    };
+    return {
+      forSlot: (slot) => activeRenders().find((r) => r.slot === slot && !(embeddedTraits?.has(r.trait) ?? false))?.skeleton,
+      forTrait: (traitName) => activeRenders().find((r) => r.trait === traitName)?.skeleton,
+      subscribe: (callback) => store.awaiting.subscribeAll(callback),
+      getVersion: () => store.awaiting.getVersion()
+    };
+  }, [store, traitIndex, embeddedTraits]);
+}
 
 // hooks/useTraitStateMachine.ts
 var stateLog = createLogger("almadar:ui:state-transitions");
@@ -1149,7 +1147,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
   const { user: contextViewer } = useUser();
   const userContext = options.user ?? contextViewer ?? void 0;
   const observer = useMemo(() => createCircuitVerificationObserver(), []);
-  const { kernel, store, traitIndex } = useCircuitKernel(traitBindings, {
+  const { kernel, store, traitIndex, transport } = useCircuitKernel(traitBindings, {
     orbitals: options.orbitals,
     ...options.traitConfigsByName !== void 0 ? { traitConfigsByName: options.traitConfigsByName } : {},
     ...options.transport !== void 0 ? { transport: options.transport } : {},
@@ -1179,6 +1177,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     ...userContext !== void 0 ? { user: userContext } : {}
   });
   const entityBindingSource = useEntityBindingSource(store, traitIndex);
+  const awaitingSkeletonSource = useAwaitingSkeletonSource(store, traitIndex, options.embeddedTraits);
   const activeTraitNamesRef = useRef(/* @__PURE__ */ new Set());
   useEffect(() => {
     activeTraitNamesRef.current = new Set(traitIndex.byName.keys());
@@ -1226,6 +1225,35 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       for (const unreg of snapshotUnregs) unreg();
     };
   }, [traitBindings, store, traitIndex]);
+  const afterSettle = useCallback(async (traitName, eventKey, payload, transitioned, repaints, composedBefore) => {
+    if (transitioned) {
+      const entityByTrait = {};
+      for (const [name, entry] of traitIndex.byName) {
+        const row = store.frames.get(entry.frameKey);
+        if (row !== void 0) entityByTrait[name] = row;
+      }
+      const repainted = new Set(repaints.map((e) => e.traitName));
+      const serverComposed = new Set([...store.callsitePayloads].filter(([child, composed]) => composedBefore.get(child) !== composed).map(([child]) => child));
+      await reRenderCallsiteCaptureChildren(traitName, payload ?? {}, entityByTrait, repainted, serverComposed);
+    }
+    options.onEventProcessed?.(eventKey, payload);
+  }, [traitIndex, store, reRenderCallsiteCaptureChildren, options.onEventProcessed]);
+  const settleOutcome = useCallback(async (traitName, eventKey, payload, outcome, composedBefore) => {
+    recordDispatchVerdict(traitIndex.byName.get(traitName)?.orbitalName ?? traitName, eventKey, { response: outcome.response });
+    const settledEffects = outcome.localPainted && outcome.serverEffects !== void 0 ? outcome.serverEffects : outcome.response;
+    slotFlush.applyClientEffects(
+      settledEffects.clientEffects ?? [],
+      settledEffects.clientEffectsByTrait,
+      options.navigate,
+      options.navigateBack,
+      activeTraitNamesRef.current
+    );
+    for (const emitted of outcome.response.emittedEvents) {
+      eventBus.emit(`UI:${emitted.event}`, emitted.payload, { ...emitted.source ?? {}, dispatched: true });
+    }
+    stateLog.debug("dispatch:settled", { traitName, eventKey, mode: outcome.mode, transitioned: outcome.response.transitioned });
+    await afterSettle(traitName, eventKey, payload, outcome.response.transitioned, outcome.response.clientEffectsByTrait ?? [], composedBefore);
+  }, [slotFlush, traitIndex, eventBus, options.navigate, options.navigateBack, afterSettle]);
   const dispatchAndSettle = useCallback(async (traitName, eventKey, payload, tick) => {
     const entityId = typeof payload?.entityId === "string" ? payload.entityId : void 0;
     const orbitalName = traitIndex.byName.get(traitName)?.orbitalName ?? traitName;
@@ -1256,34 +1284,63 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       recordDispatchVerdict(orbitalName, eventKey, { error: err instanceof Error ? err : String(err) });
       throw err;
     }
-    recordDispatchVerdict(orbitalName, eventKey, { response: outcome.response });
     if (outcome.localPainted && !outcome.response.success && beforeLocalPaint !== void 0) {
       slotFlush.rollback(beforeLocalPaint);
     }
-    const settledEffects = outcome.localPainted && outcome.serverEffects !== void 0 ? outcome.serverEffects : outcome.response;
-    slotFlush.applyClientEffects(
-      settledEffects.clientEffects ?? [],
-      settledEffects.clientEffectsByTrait,
-      options.navigate,
-      options.navigateBack,
-      activeTraitNamesRef.current
-    );
-    for (const emitted of outcome.response.emittedEvents) {
-      eventBus.emit(`UI:${emitted.event}`, emitted.payload, { ...emitted.source ?? {}, dispatched: true });
-    }
-    stateLog.debug("dispatch:settled", { traitName, eventKey, mode: outcome.mode, transitioned: outcome.response.transitioned });
-    if (outcome.response.transitioned) {
-      const entityByTrait = {};
-      for (const [name, entry] of traitIndex.byName) {
-        const row = store.frames.get(entry.frameKey);
-        if (row !== void 0) entityByTrait[name] = row;
+    await settleOutcome(traitName, eventKey, payload, outcome, composedBefore);
+  }, [kernel, slotFlush, traitIndex, store, options.navigate, options.navigateBack, settleOutcome]);
+  const progressAndSettle = useCallback(async (traitName, eventKey, payload) => {
+    const entityId = typeof payload?.entityId === "string" ? payload.entityId : void 0;
+    const composedBefore = new Map(store.callsitePayloads);
+    const outcome = await kernel.dispatchProgress({
+      event: eventKey,
+      ...payload !== void 0 ? { payload } : {},
+      ...entityId !== void 0 ? { entityId } : {},
+      targetTrait: traitName
+    });
+    await settleOutcome(traitName, eventKey, payload, outcome, composedBefore);
+  }, [kernel, store, settleOutcome]);
+  useEffect(() => {
+    if (!transport?.subscribe) return;
+    return transport.subscribe((emitted, target) => {
+      for (const t of collectListenerTargets(traitIndex, emitted.source, emitted.event, emitted.payload)) {
+        void (target === "origin" ? progressAndSettle(t.listenerTrait, t.triggers, t.payload) : dispatchAndSettle(t.listenerTrait, t.triggers, t.payload));
       }
-      const repainted = new Set((outcome.response.clientEffectsByTrait ?? []).map((e) => e.traitName));
-      const serverComposed = new Set([...store.callsitePayloads].filter(([child, composed]) => composedBefore.get(child) !== composed).map(([child]) => child));
-      await reRenderCallsiteCaptureChildren(traitName, payload ?? {}, entityByTrait, repainted, serverComposed);
+    }, { clientId: getTabClientId() });
+  }, [transport, traitIndex, progressAndSettle, dispatchAndSettle]);
+  const mountAndSettle = useCallback(async (seeds, payload) => {
+    const composedBefore = new Map(store.callsitePayloads);
+    let beforeLocalPaint;
+    let outcome;
+    try {
+      outcome = await kernel.dispatchMount(seeds, {
+        onLocal: (_trait, local) => {
+          if (beforeLocalPaint === void 0) beforeLocalPaint = slotFlush.checkpoint();
+          slotFlush.applyClientEffects(local.clientEffects ?? [], local.clientEffectsByTrait, options.navigate, options.navigateBack, activeTraitNamesRef.current);
+        }
+      }, { payload });
+    } catch (err) {
+      if (beforeLocalPaint !== void 0) slotFlush.rollback(beforeLocalPaint);
+      for (const seed of seeds) {
+        recordDispatchVerdict(traitIndex.byName.get(seed.trait)?.orbitalName ?? seed.trait, seed.event, { error: err instanceof Error ? err : String(err) });
+      }
+      throw err;
     }
-    options.onEventProcessed?.(eventKey, payload);
-  }, [kernel, slotFlush, traitIndex, store, eventBus, reRenderCallsiteCaptureChildren, options.navigate, options.navigateBack, options.onEventProcessed]);
+    if (!outcome.success && beforeLocalPaint !== void 0) slotFlush.rollback(beforeLocalPaint);
+    slotFlush.applyClientEffects(outcome.serverEffects.clientEffects ?? [], outcome.serverEffects.clientEffectsByTrait, options.navigate, options.navigateBack, activeTraitNamesRef.current);
+    const emitted = [...outcome.seeds.flatMap((seed) => seed.local.emittedEvents), ...outcome.emittedEvents];
+    for (const e of emitted) {
+      eventBus.emit(`UI:${e.event}`, e.payload, { ...e.source ?? {}, dispatched: true });
+    }
+    const serverRepaints = outcome.serverEffects.clientEffectsByTrait ?? [];
+    for (const seed of outcome.seeds) {
+      recordDispatchVerdict(traitIndex.byName.get(seed.trait)?.orbitalName ?? seed.trait, seed.event, {
+        response: { ...seed.local, success: outcome.success, ...outcome.error !== void 0 ? { error: outcome.error } : {} }
+      });
+      stateLog.debug("mount:settled", { traitName: seed.trait, eventKey: seed.event, mode: seed.mode, transitioned: seed.local.transitioned });
+      await afterSettle(seed.trait, seed.event, payload, seed.local.transitioned, [...seed.local.clientEffectsByTrait ?? [], ...serverRepaints], composedBefore);
+    }
+  }, [kernel, slotFlush, traitIndex, store, eventBus, options.navigate, options.navigateBack, afterSettle]);
   useBusIngress(traitBindings, traitIndex, dispatchAndSettle, eventBus);
   const sendEvent = useCallback((eventKey, payload) => {
     const normalized = normalizeEventKey(eventKey);
@@ -1324,17 +1381,19 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       if (mount.initialized.has(traitName)) continue;
       mount.initialized.add(traitName);
       const lifecycleEvent = LIFECYCLE_EVENTS.find((evt) => store.manager.canHandleEvent(traitName, evt));
-      if (lifecycleEvent !== void 0) entering.push({ traitName, lifecycleEvent });
+      if (lifecycleEvent !== void 0) entering.push({ trait: traitName, event: lifecycleEvent });
     }
-    store.mount.mounting(entering.map((e) => e.traitName));
-    for (const { traitName, lifecycleEvent } of entering) {
-      void dispatchAndSettle(traitName, lifecycleEvent, { ...options.initPayload ?? {} });
+    store.mount.mounting(entering.map((e) => e.trait));
+    if (entering.length > 0) {
+      void mountAndSettle(entering, { ...options.initPayload ?? {} }).catch((err) => {
+        stateLog.warn("mount:failed", { traits: entering.map((e) => e.trait), error: String(err) });
+      });
     }
     mountedRef.current = mount;
-  }, [traitBindings, store, dispatchAndSettle, mountKey]);
+  }, [traitBindings, store, mountAndSettle, mountKey]);
   useSyncExternalStore(store.subscribe, store.getVersion, store.getVersion);
   const traitStates = useMemo(() => store.manager.getAllStates(), [store, store.getVersion()]);
-  return { traitStates, sendEvent, getTraitState, canHandleEvent, entityBindingSource };
+  return { traitStates, sendEvent, getTraitState, canHandleEvent, entityBindingSource, awaitingSkeletonSource };
 }
 
 // runtime/fitContent.ts
@@ -1405,7 +1464,7 @@ function TraitInitializer({ traits, routeParams, mountKey, orbitals, onNavigate,
     }, localFallbackTimeoutMs ?? 5e3);
     return () => clearTimeout(timer);
   }, [hasBridge, bridge.connected, onLocalFallback, localFallbackTimeoutMs]);
-  const { entityBindingSource } = useTraitStateMachine(traits, uiSlots, {
+  const { entityBindingSource, awaitingSkeletonSource } = useTraitStateMachine(traits, uiSlots, {
     orbitals,
     ...onNavigate !== void 0 ? { navigate: onNavigate } : {},
     ...onNavigateBack !== void 0 ? { navigateBack: onNavigateBack } : {},
@@ -1416,7 +1475,7 @@ function TraitInitializer({ traits, routeParams, mountKey, orbitals, onNavigate,
     ...mountKey !== void 0 ? { mountKey } : {},
     ...hasBridge ? { transport: bridge.transport, carriesCircuitState: bridge.carriesCircuitState, awaitTopology: !bridge.topologyKnown } : { persistence }
   });
-  return /* @__PURE__ */ jsx(EntityBindingContext.Provider, { value: entityBindingSource, children });
+  return /* @__PURE__ */ jsx(EntityBindingContext.Provider, { value: entityBindingSource, children: /* @__PURE__ */ jsx(AwaitingSkeletonContext.Provider, { value: awaitingSkeletonSource, children }) });
 }
 var CONTENT_STAGE_WIDTH = 480;
 function FitToBox({ children, mode = "box" }) {