@almadar/ui 6.9.0 → 6.11.0

package/dist/runtime/index.js

@@ -5,8 +5,8 @@ export { EntitySchemaProvider, ServerBridgeProvider, TraitContext, TraitProvider
 import { createLogger, setNamespaceLevel, isLogLevelEnabled } from '@almadar/logger';
 import { perfStore, pushPerfEntry, wrapCallbackForEvent, perfStart, perfEnd, perfGauge, prepareSchemaForPreview, perfTimeAsync, collectTraitRefsFromResolvedTrait, buildOrbitalsByTrait, collectEmbeddedTraits } from '@almadar/runtime/ui';
 export { PERF_NAMESPACE, adjustSchemaForMockData, buildMockData, clearPerf, perfEnd, perfStart, perfTime, prepareSchemaForPreview, wrapCallbackForEvent } from '@almadar/runtime/ui';
-import { StateMachineManager, collectDeclaredConfigDefaults, resolveCallSitePayloadCaptures, createServerEffectHandlers, EffectExecutor, createContextFromBindings, createTickScheduler, isValidCronExpression, parseDurationString, InMemoryPersistence, normalizeCallSiteConfigToValues, interpolateValue } from '@almadar/runtime';
-import { UI_SLOTS, mergeEntityFrame, isCircuitEvent, applyListenPayloadMapping, schemaToIR, getPage, clearSchemaCache as clearSchemaCache$1, walkSExpr, buildResolvedTraitConfigs, isRenderBindingMarker, isFileValue, isInlineTrait, containsEntityBinding, isSExpr, isEventPayloadValue, RENDER_BINDING_MARKER } from '@almadar/core';
+import { StateMachineManager, collectDeclaredConfigDefaults, createServerEffectHandlers, EffectExecutor, LIFECYCLE_EVENTS, createContextFromBindings, createTickScheduler, isValidCronExpression, parseDurationString, InMemoryPersistence, normalizeCallSiteConfigToValues, interpolateValue } from '@almadar/runtime';
+import { UI_SLOTS, mergeEntityFrame, isCircuitEvent, applyListenPayloadMapping, schemaToIR, getPage, clearSchemaCache as clearSchemaCache$1, walkSExpr, buildResolvedTraitConfigs, collectCallsiteCaptureChildren, isRenderBindingMarker, getNestedValue, isFileValue, isInlineTrait, containsEntityBinding, isSExpr, isEventPayloadValue, RENDER_BINDING_MARKER } from '@almadar/core';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import * as LucideIcons2 from 'lucide-react';
@@ -20,7 +20,8 @@ import { Link, Outlet, useLocation } from 'react-router-dom';
 import ELK from 'elkjs/lib/elk.bundled.js';
 import SyntaxHighlighter from 'react-syntax-highlighter/dist/esm/prism-light.js';
 import dark from 'react-syntax-highlighter/dist/esm/styles/prism/vsc-dark-plus.js';
-import { orbLanguage, loloLanguage, ORB_COLORS } from '@almadar/syntax';
+import { orbLanguage, loloLanguage, ORB_COLORS, translateLolo, translateOrb } from '@almadar/syntax';
+import { coreTables } from '@almadar/core/i18n';
 import langJson from 'react-syntax-highlighter/dist/esm/languages/prism/json.js';
 import langJavascript from 'react-syntax-highlighter/dist/esm/languages/prism/javascript.js';
 import langTypescript from 'react-syntax-highlighter/dist/esm/languages/prism/typescript.js';
@@ -7656,8 +7657,9 @@ function getTransitions() {
   return [...getState().transitions];
 }
 function recordServerResponse(orbitalName, event, response) {
+  const { effectResults, ...responseFields } = response;
   const serverResponse = {
-    ...response,
+    ...responseFields,
     orbitalName,
     timestamp: Date.now()
   };
@@ -7667,7 +7669,7 @@ function recordServerResponse(orbitalName, event, response) {
     from: "server",
     to: "server",
     event,
-    effects: [],
+    effects: effectResults ?? [],
     serverResponse,
     timestamp: Date.now()
   };
@@ -18279,6 +18281,15 @@ function buildLineProps(errorLines, extraClassName) {
     };
   };
 }
+function translateProgram(source, language, lang) {
+  if (lang === "en") return source;
+  if (language === "lolo") return translateLolo(source, lang);
+  if (language === "orb") {
+    const translated = translateOrb(source, lang);
+    return typeof translated === "string" ? translated : source;
+  }
+  return source;
+}
 var dynamicallyLoaded, codeLanguageLoader, orbStyleOverrides, orbStyle, loloStyleOverrides, loloStyle, log6, CODE_LANGUAGES, CODE_LANGUAGE_SET, DIFF_STYLES, DIFF_STYLE_FALLBACK, LINE_PROPS_FN, HIDDEN_LINE_NUMBERS, HIGHLIGHT_CAPACITY_BYTES, MONO_FONT_FAMILY, VIEWER_LINE_NUMBER_STYLE, CodeBlock;
 var init_CodeBlock = __esm({
   "components/core/molecules/markdown/CodeBlock.tsx"() {
@@ -18544,6 +18555,7 @@ var init_CodeBlock = __esm({
         showLineNumbers = false,
         wordWrap = false,
         files,
+        naturalLanguages,
         actions,
         isLoading = false,
         error,
@@ -18590,7 +18602,48 @@ var init_CodeBlock = __esm({
           "replace"
         ]
       }) => {
-        const code = typeof rawCode === "string" ? rawCode : String(rawCode ?? "");
+        const englishCode = typeof rawCode === "string" ? rawCode : String(rawCode ?? "");
+        const naturalTabs = !editable && naturalLanguages && naturalLanguages.length > 1 ? naturalLanguages : void 0;
+        const [naturalLanguage, setNaturalLanguage] = useState(() => naturalTabs?.[0] ?? "en");
+        const activeNaturalLanguage = naturalTabs?.includes(naturalLanguage) === true ? naturalLanguage : naturalTabs?.[0] ?? "en";
+        const translationCache = useMemo(() => /* @__PURE__ */ new Map(), [englishCode, files]);
+        const translateFor = useCallback(
+          (source, sourceLanguage, cacheKey) => {
+            if (activeNaturalLanguage === "en") return source;
+            const key = `${cacheKey}|${sourceLanguage}|${activeNaturalLanguage}`;
+            const hit = translationCache.get(key);
+            if (hit !== void 0) return hit;
+            const translated = translateProgram(source, sourceLanguage, activeNaturalLanguage);
+            translationCache.set(key, translated);
+            return translated;
+          },
+          [translationCache, activeNaturalLanguage]
+        );
+        const code = translateFor(englishCode, language, "code");
+        const naturalTabItems = naturalTabs?.map((lang) => ({
+          id: `lang-${lang}`,
+          label: coreTables[lang].meta.name,
+          content: null
+        }));
+        const naturalTabStrip = naturalTabs && naturalTabItems ? /* @__PURE__ */ jsx(
+          Box,
+          {
+            className: "border-b border-border",
+            dir: coreTables[activeNaturalLanguage].meta.rtl ? "rtl" : "ltr",
+            "data-testid": "codeblock-language-tabs",
+            children: /* @__PURE__ */ jsx(
+              Tabs,
+              {
+                tabs: naturalTabItems,
+                activeTab: `lang-${activeNaturalLanguage}`,
+                onTabChange: (id) => {
+                  const next = naturalTabs.find((lang) => `lang-${lang}` === id);
+                  if (next) setNaturalLanguage(next);
+                }
+              }
+            )
+          }
+        ) : null;
         const activeStyle = resolveHighlightStyle(language);
         const overCapacity = code.length > HIGHLIGHT_CAPACITY_BYTES;
         const plainCodeColor = plainCodeColorOf(activeStyle);
@@ -18603,8 +18656,8 @@ var init_CodeBlock = __esm({
         const [wrap, setWrap] = useState(wordWrap);
         const [activeFileIndex, setActiveFileIndex] = useState(0);
         const activeFile = files?.[activeFileIndex];
-        const activeCode = activeFile?.code ?? code;
         const activeLanguage = activeFile?.language ?? language;
+        const activeCode = activeFile ? translateFor(activeFile.code, activeLanguage, `file-${activeFileIndex}`) : code;
         const languageReady = useLanguageReady(activeLanguage);
         const viewerStyle = resolveHighlightStyle(activeLanguage);
         const viewerPlainCodeColor = plainCodeColorOf(viewerStyle);
@@ -19089,6 +19142,7 @@ var init_CodeBlock = __esm({
             content: null
           }));
           return /* @__PURE__ */ jsx(Card, { className: cn("overflow-hidden", className), children: /* @__PURE__ */ jsxs("div", { style: { display: "flex", flexDirection: "column" }, children: [
+            naturalTabStrip,
             tabItems && tabItems.length > 1 && /* @__PURE__ */ jsx(Box, { className: "border-b border-border", children: /* @__PURE__ */ jsx(
               Tabs,
               {
@@ -19150,7 +19204,7 @@ var init_CodeBlock = __esm({
                 ]
               }
             ),
-            /* @__PURE__ */ jsx(Box, { className: "overflow-auto bg-muted/20", style: { maxHeight }, children: diffLines ? /* @__PURE__ */ jsx("div", { style: { display: "flex", flexDirection: "column" }, className: "font-mono text-xs", children: diffRowElements }) : /* @__PURE__ */ jsx("div", { className: "font-mono text-xs", children: viewerHighlightedElement }) })
+            /* @__PURE__ */ jsx(Box, { className: "overflow-auto bg-muted/20", style: { maxHeight }, dir: "ltr", children: diffLines ? /* @__PURE__ */ jsx("div", { style: { display: "flex", flexDirection: "column" }, className: "font-mono text-xs", children: diffRowElements }) : /* @__PURE__ */ jsx("div", { className: "font-mono text-xs", children: viewerHighlightedElement }) })
           ] }) });
         }
         const hasHeader = showLanguageBadge || effectiveCopy;
@@ -19177,6 +19231,7 @@ var init_CodeBlock = __esm({
               ]
             }
           ),
+          naturalTabStrip,
           editable ? (
             /* GAP-77 / GAP-82 / GAP-83: editable mode = transparent textarea on
                          top of a Prism-highlighted SyntaxHighlighter overlay.
@@ -19328,6 +19383,7 @@ var init_CodeBlock = __esm({
             {
               ref: scrollRef,
               onCopy: handleSelectionCopy,
+              dir: "ltr",
               style: {
                 flex: 1,
                 minHeight: 0,
@@ -19346,7 +19402,7 @@ var init_CodeBlock = __esm({
           )
         ] });
       },
-      (prev, next) => prev.language === next.language && prev.code === next.code && prev.showCopyButton === next.showCopyButton && prev.showCopy === next.showCopy && prev.maxHeight === next.maxHeight && prev.foldable === next.foldable && prev.editable === next.editable && prev.onChange === next.onChange && prev.errorLines === next.errorLines && prev.mode === next.mode && prev.title === next.title && prev.diff === next.diff && prev.files === next.files && prev.actions === next.actions && prev.isLoading === next.isLoading && prev.error === next.error && prev.editorId === next.editorId && prev.onEditorFocus === next.onEditorFocus && prev.onEditorBlur === next.onEditorBlur && prev.onMotion === next.onMotion && prev.onOperate === next.onOperate && prev.onInsertText === next.onInsertText && prev.onSetMode === next.onSetMode && prev.motions === next.motions && prev.operators === next.operators
+      (prev, next) => prev.language === next.language && prev.code === next.code && prev.showCopyButton === next.showCopyButton && prev.showCopy === next.showCopy && prev.maxHeight === next.maxHeight && prev.foldable === next.foldable && prev.editable === next.editable && prev.onChange === next.onChange && prev.errorLines === next.errorLines && prev.mode === next.mode && prev.title === next.title && prev.diff === next.diff && prev.files === next.files && prev.naturalLanguages === next.naturalLanguages && prev.actions === next.actions && prev.isLoading === next.isLoading && prev.error === next.error && prev.editorId === next.editorId && prev.onEditorFocus === next.onEditorFocus && prev.onEditorBlur === next.onEditorBlur && prev.onMotion === next.onMotion && prev.onOperate === next.onOperate && prev.onInsertText === next.onInsertText && prev.onSetMode === next.onSetMode && prev.motions === next.motions && prev.operators === next.operators
     );
     CodeBlock.displayName = "CodeBlock";
   }
@@ -22991,26 +23047,6 @@ var init_ButtonGroup = __esm({
     ButtonGroup.displayName = "ButtonGroup";
   }
 });
-function getNestedValue(obj, path) {
-  if (obj === null || obj === void 0 || !path) {
-    return void 0;
-  }
-  if (!path.includes(".")) {
-    return obj[path];
-  }
-  const parts = path.split(".");
-  let value = obj;
-  for (const part of parts) {
-    if (value === null || value === void 0) {
-      return void 0;
-    }
-    if (typeof value !== "object" || Array.isArray(value)) {
-      return void 0;
-    }
-    value = value[part];
-  }
-  return value;
-}
 function resolveImageUrl(value) {
   if (typeof value === "string") {
     return value;
@@ -41598,11 +41634,11 @@ var init_WizardContainer = __esm({
 });
 function calculateComplexity(schema) {
   if (!schema) return 1;
-  const entities = schema.dataEntities?.length || 0;
+  const entities = schema.dataEntities || 0;
   const pages = schema.ui?.pages?.length || 0;
-  const traits2 = schema.traits?.length || 0;
+  const traits2 = schema.traits || 0;
   const sections = schema.ui?.pages?.reduce(
-    (acc, page) => acc + (page.sections?.length || 0),
+    (acc, page) => acc + (page.sections || 0),
     0
   ) || 0;
   return entities * 3 + pages * 2 + traits2 * 2 + sections * 1;
@@ -52377,15 +52413,19 @@ function runTickFrame(entityId, orderedWriters, store) {
 }
 var log3 = createLogger("almadar:ui:effects:client-handlers");
 function createClientEffectHandlers(options) {
-  const { eventBus, slotSetter, navigate, navigateBack, notify, callService, liveEntity } = options;
+  const { eventBus, slotSetter, navigate, navigateBack, notify, callService, liveEntity, persistDelegated } = options;
   return {
     emit: (event, payload, source) => {
       const prefixedEvent = event.startsWith("UI:") ? event : `UI:${event}`;
       eventBus.emit(prefixedEvent, payload, source);
     },
     persist: async () => {
-      log3.warn("persist is server-side only, ignored on client");
+      log3.debug("persist is server-side only, ignored on client");
     },
+    // Bridge mode: the server runs every persist and the response
+    // carries its outcome — tell the executor so the placeholder above is
+    // never read as a denial (see `EffectHandlers.persistDelegated`).
+    ...persistDelegated === true ? { persistDelegated: true } : {},
     // @almadar/runtime EffectHandlers.set types value:unknown — should be FieldValue (upstream fix queued)
     set: ((_entityId, field, value) => {
       if (!liveEntity) {
@@ -52654,7 +52694,6 @@ var SYNC_TICK_OPERATORS = /* @__PURE__ */ new Set([
   "do",
   "when"
 ]);
-var LIFECYCLE_EVENTS = ["INIT", "LOAD", "$MOUNT"];
 function toTraitDefinition(binding) {
   return {
     name: binding.trait.name,
@@ -52694,17 +52733,14 @@ function classifySharedTick(tick) {
   if (renders) return "renderer";
   return "neither";
 }
-function buildTraitRenderConfig(binding, traitConfigsByName, payload) {
+function buildTraitRenderConfig(binding, traitConfigsByName) {
   const declaredDefaults = collectDeclaredConfigDefaults(binding.trait);
   const resolvedDefaults = traitConfigsByName?.[binding.trait.name];
   const callSiteConfig = getBindingConfig(binding);
-  const callSiteOverrides = callSiteConfig ? resolveCallSitePayloadCaptures(
-    Object.fromEntries(
-      Object.entries(callSiteConfig).filter(
-        ([, v]) => !containsConfigForward(v)
-      )
-    ),
-    payload
+  const callSiteOverrides = callSiteConfig ? Object.fromEntries(
+    Object.entries(callSiteConfig).filter(
+      ([, v]) => !containsConfigForward(v)
+    )
   ) : void 0;
   if (declaredDefaults || resolvedDefaults || callSiteOverrides) {
     return {
@@ -52775,12 +52811,40 @@ function evalFieldDefault(value) {
     return value;
   }
 }
+function isPersistTraceAction(value) {
+  return value === "create" || value === "update" || value === "delete" || value === "batch";
+}
+function overlayServerEffectResults(effectTraces, serverResults) {
+  if (serverResults.length === 0) return effectTraces;
+  const queues = /* @__PURE__ */ new Map();
+  for (const result of serverResults) {
+    const queue = queues.get(result.effect);
+    if (queue) queue.push(result);
+    else queues.set(result.effect, [result]);
+  }
+  return effectTraces.map((trace) => {
+    const match = queues.get(trace.type)?.shift();
+    if (!match) return trace;
+    const resultId = match.data && typeof match.data === "object" && !Array.isArray(match.data) ? match.data.id : void 0;
+    const outcome = match.success ? "success" : match.denied ? "denied" : "failed";
+    return {
+      ...trace,
+      ...match.entityType !== void 0 ? { entityName: match.entityType } : {},
+      ...match.action !== void 0 && isPersistTraceAction(match.action) ? { action: match.action } : {},
+      ...resultId !== void 0 ? { resultId } : {},
+      outcome,
+      status: match.success ? "executed" : "failed",
+      ...match.error !== void 0 ? { error: match.error } : {}
+    };
+  });
+}
 function useTraitStateMachine(traitBindings, uiSlots, options) {
   sharedEntityLog.debug("useTraitStateMachine start", { traitBindingsCount: traitBindings.length, traitNames: traitBindings.map((b) => b.trait.name) });
   const eventBus = useEventBus();
   const { entities } = useEntitySchema();
   const traitConfigsByName = options?.traitConfigsByName;
   const orbitalsByTrait = options?.orbitalsByTrait;
+  const callsiteCaptureChildrenByTrait = options?.callsiteCaptureChildrenByTrait;
   const sharedEntityStore = useSharedEntityStore();
   const sharedGroups = useMemo(() => {
     const groups = /* @__PURE__ */ new Map();
@@ -53038,7 +53102,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     };
   }, [traitBindings]);
   const executeTransitionEffects = useCallback(async (params) => {
-    const { binding, previousState, newState, payload, flushEvent, syncOnly, log: log11 } = params;
+    const { binding, previousState, newState, payload, flushEvent, syncOnly, log: log11, callsitePayload } = params;
     const traitName = binding.trait.name;
     const linkedEntity = binding.linkedEntity || "";
     const entityId = payload?.entityId;
@@ -53060,7 +53124,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     const effects = syncOnly ? params.effects.filter(
       (e) => Array.isArray(e) && SYNC_TICK_OPERATORS.has(String(e[0]))
     ) : params.effects;
-    if (effects.length === 0) return [];
+    if (effects.length === 0) return { emitted: [], serverEffectResults: [] };
     const pendingSlots = /* @__PURE__ */ new Map();
     ({
       traitDefinition: binding.trait
@@ -53097,10 +53161,15 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       // the trait's one live store — the same object bound below. This is
       // what makes a [runtime] entity's set (from ticks AND events) reach
       // the render-ui + next tick + guards.
-      liveEntity
+      liveEntity,
+      // 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
     });
     const persistence = syncOnly ? void 0 : optionsRef.current?.persistence;
     let handlers = clientHandlers;
+    const serverEffectResults = [];
     if (persistence) {
       const sharedBindings = {
         // Seed `@entity` from the trait's scalar field state (a real
@@ -53112,16 +53181,16 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         payload: payload || {},
         state: previousState
       };
+      if (callsitePayload) {
+        sharedBindings.callsitePayload = callsitePayload;
+      }
       const sharedDeclared = collectDeclaredConfigDefaults(binding.trait);
       const sharedResolved = traitConfigsByName?.[traitName];
       const sharedCallSiteRaw = getBindingConfig(binding);
-      const sharedCallSite = sharedCallSiteRaw ? resolveCallSitePayloadCaptures(
-        Object.fromEntries(
-          Object.entries(sharedCallSiteRaw).filter(
-            ([, v]) => !containsConfigForward(v)
-          )
-        ),
-        payload || {}
+      const sharedCallSite = sharedCallSiteRaw ? Object.fromEntries(
+        Object.entries(sharedCallSiteRaw).filter(
+          ([, v]) => !containsConfigForward(v)
+        )
       ) : void 0;
       if (sharedDeclared || sharedResolved || sharedCallSite) {
         sharedBindings.config = {
@@ -53145,7 +53214,8 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         },
         source: { trait: traitName },
         // @almadar/runtime callService types params:unknown/Promise<unknown> — should be ServiceParams/EventPayload (upstream fix queued)
-        callService: optionsRef.current?.callService
+        callService: optionsRef.current?.callService,
+        effectResults: serverEffectResults
       });
       handlers = {
         ...serverHandlers,
@@ -53180,7 +53250,10 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       payload: payload || {},
       state: previousState
     };
-    const renderConfig = buildTraitRenderConfig(binding, traitConfigsByName, payload || {});
+    if (callsitePayload) {
+      bindingCtx.callsitePayload = callsitePayload;
+    }
+    const renderConfig = buildTraitRenderConfig(binding, traitConfigsByName);
     if (renderConfig !== void 0) {
       bindingCtx.config = renderConfig;
     }
@@ -53271,8 +53344,42 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
         effectCount: effects.length
       });
     }
-    return emittedDuringExec;
+    return { emitted: emittedDuringExec, serverEffectResults };
   }, [eventBus, flushSlot, sharedEntityStore, publishBindingSnapshot, orbitalsByTrait]);
+  const reRenderCallsiteCaptureChildren = useCallback(async (traitName, callsitePayload, entityByTrait, log11, visited = /* @__PURE__ */ new Set()) => {
+    const children = callsiteCaptureChildrenByTrait?.get(traitName);
+    if (!children || children.size === 0) return;
+    const mgr = managerRef.current;
+    const bindingMap = new Map(traitBindingsRef.current.map((b) => [b.trait.name, b]));
+    for (const childName of children) {
+      if (visited.has(childName)) continue;
+      visited.add(childName);
+      const childBinding = bindingMap.get(childName);
+      if (!childBinding) continue;
+      const lifecycleEvent = LIFECYCLE_EVENTS.find((evt) => mgr.canHandleEvent(childName, evt));
+      if (lifecycleEvent === void 0) continue;
+      const [entry] = mgr.sendEvent(lifecycleEvent, {}, void 0, entityByTrait, void 0, childName);
+      if (!entry || !entry.result.executed) continue;
+      log11.debug("callsite-capture-child:rerender", {
+        referrer: traitName,
+        child: childName,
+        lifecycleEvent,
+        callsitePayload: JSON.stringify(callsitePayload)
+      });
+      await executeTransitionEffects({
+        binding: childBinding,
+        effects: entry.result.effects,
+        previousState: entry.result.previousState,
+        newState: entry.result.newState,
+        payload: {},
+        flushEvent: lifecycleEvent,
+        syncOnly: false,
+        log: log11,
+        callsitePayload
+      });
+      await reRenderCallsiteCaptureChildren(childName, callsitePayload, entityByTrait, log11, visited);
+    }
+  }, [callsiteCaptureChildrenByTrait, executeTransitionEffects]);
   const runTickEffects = useCallback((tick, binding) => {
     const traitName = binding.trait.name;
     const currentState = traitStatesRef.current.get(traitName)?.currentState ?? "";
@@ -53410,6 +53517,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
       executedTraits: results.map((r) => r.traitName).join(",")
     });
     const emittedByTrait = /* @__PURE__ */ new Map();
+    const serverEffectResultsByTrait = /* @__PURE__ */ new Map();
     bridgeEchoPendingRef.current.clear();
     for (const { traitName, result } of results) {
       const binding = bindingMap.get(traitName);
@@ -53454,7 +53562,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
           effects: JSON.stringify(result.effects)
         }));
         const _perfT2 = perfStart("processEvent:executeAll");
-        const emittedDuringExec = await executeTransitionEffects({
+        const { emitted: emittedDuringExec, serverEffectResults: transitionServerEffectResults } = await executeTransitionEffects({
           binding,
           // upstream gap: /runtime TransitionResult.effects is unknown[] — they are SExpr at runtime (see Almadar_UI_Gaps.md)
           effects: result.effects,
@@ -53467,12 +53575,14 @@ 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) {
           stateLog.debug("guard-blocked-transition", {
@@ -53501,7 +53611,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     for (const { traitName, result } of results) {
       if (result.executed) {
         updateTraitState(traitName, result.newState);
-        const effectTraces = result.effects.map(
+        const reconstructedEffectTraces = result.effects.map(
           (e) => {
             if (Array.isArray(e)) {
               const head = String(e[0] ?? "unknown");
@@ -53520,6 +53630,10 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
             };
           }
         );
+        const effectTraces = overlayServerEffectResults(
+          reconstructedEffectTraces,
+          serverEffectResultsByTrait.get(traitName) ?? []
+        );
         const emittedEvents = emittedByTrait.get(traitName) ?? [];
         recordTransition({
           traitName,
@@ -53566,7 +53680,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     }
     perfEnd("processEvent:total", _perfT0);
     perfEnd(`event:${normalizedEvent}`, _perfT0);
-  }, [entities, eventBus, sharedEntityStore]);
+  }, [entities, eventBus, sharedEntityStore, reRenderCallsiteCaptureChildren]);
   const drainEventQueue = useCallback(async () => {
     if (processingRef.current) return;
     processingRef.current = true;
@@ -53741,7 +53855,7 @@ function useTraitStateMachine(traitBindings, uiSlots, options) {
     getConfig: (traitName) => {
       const binding = traitBindingsRef.current.find((b) => b.trait.name === traitName);
       if (binding === void 0) return void 0;
-      return buildTraitRenderConfig(binding, traitConfigsByName, {});
+      return buildTraitRenderConfig(binding, traitConfigsByName);
     },
     getState: (traitName) => traitStatesRef.current.get(traitName)?.currentState ?? "",
     subscribe: (traitName, callback) => {
@@ -53893,6 +54007,23 @@ function normalizeChild(child) {
     props: { ...rest, ...normalizedChildren !== void 0 ? { children: normalizedChildren } : {} }
   };
 }
+function effectResultsToTraces(results) {
+  if (!results) return [];
+  return results.map((r) => {
+    const resultId = r.data !== void 0 && r.data !== null && "id" in r.data && typeof r.data.id === "string" ? r.data.id : void 0;
+    const outcome = r.denied ? "denied" : r.success ? "success" : "failed";
+    return {
+      type: r.effect,
+      ...r.entityType !== void 0 ? { entityName: r.entityType } : {},
+      ...r.action !== void 0 && (r.action === "create" || r.action === "update" || r.action === "delete" || r.action === "batch") ? { action: r.action } : {},
+      ...resultId !== void 0 ? { resultId } : {},
+      outcome,
+      args: [],
+      status: outcome === "success" ? "executed" : "failed",
+      error: r.error
+    };
+  });
+}
 function applyServerEffects(effects, uiSlots, onNavigate, embeddedTraits, activeTraits, onNavigateBack) {
   for (const eff of effects) {
     if (eff.type === "render-ui" && eff.slot && eff.pattern) {
@@ -53974,7 +54105,7 @@ function NavStackRefBridge({ apiRef }) {
   }, [api, apiRef]);
   return null;
 }
-function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNavigate, onNavigateBack, onLocalFallback, persistence, traitConfigsByName, orbitalsByTrait, embeddedTraits, serverActiveTraits, children }) {
+function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNavigate, onNavigateBack, onLocalFallback, persistence, traitConfigsByName, orbitalsByTrait, embeddedTraits, callsiteCaptureChildrenByTrait, serverActiveTraits, children }) {
   const bridge = useServerBridge();
   const activeTraitNames = useMemo(
     () => new Set(traits2.map((b) => b.trait.name).filter((n) => !!n)),
@@ -54003,12 +54134,12 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
         continue;
       }
       void bridge.sendEvent(name, event, withActiveTraits(payload)).then(({ effects, meta }) => {
-        recordServerResponse(name, event, meta);
+        recordServerResponse(name, event, { ...meta, effectResults: effectResultsToTraces(meta.effectResults) });
         applyServerEffects(effects, uiSlots, onNavigate, embeddedTraits, activeTraitNames, onNavigateBack);
       });
     }
   }, [bridge.connected, bridge.sendEvent, orbitalNames, uiSlots, onNavigate, onNavigateBack, embeddedTraits, activeTraitNames, withActiveTraits]);
-  const opts = orbitalNames ? { onEventProcessed, navigate: onNavigate, navigateBack: onNavigateBack, traitConfigsByName, orbitalsByTrait, embeddedTraits, initPayload: routeParams } : { navigate: onNavigate, navigateBack: onNavigateBack, persistence, traitConfigsByName, orbitalsByTrait, embeddedTraits, initPayload: routeParams };
+  const opts = orbitalNames ? { onEventProcessed, navigate: onNavigate, navigateBack: onNavigateBack, traitConfigsByName, orbitalsByTrait, embeddedTraits, callsiteCaptureChildrenByTrait, initPayload: routeParams } : { navigate: onNavigate, navigateBack: onNavigateBack, persistence, traitConfigsByName, orbitalsByTrait, embeddedTraits, callsiteCaptureChildrenByTrait, initPayload: routeParams };
   const { sendEvent, entityBindingSource } = useTraitStateMachine(traits2, uiSlots, opts);
   const initSentRef = useRef(false);
   const prevTraitsRef = useRef(void 0);
@@ -54050,7 +54181,7 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
     (async () => {
       for (const name of orbitalNames) {
         const { effects, meta } = await bridge.sendEvent(name, "INIT", withActiveTraits({ ...routeParams ?? {} }));
-        recordServerResponse(name, "INIT", meta);
+        recordServerResponse(name, "INIT", { ...meta, effectResults: effectResultsToTraces(meta.effectResults) });
         const effectTraces = [
           { type: "fetch", args: [], status: "executed" },
           ...effects.map((eff) => ({
@@ -54073,7 +54204,7 @@ function TraitInitializer({ traits: traits2, routeParams, orbitalNames, onNaviga
   }, [bridge.connected, orbitalNames, bridge.sendEvent, uiSlots, onNavigate, onNavigateBack, embeddedTraits, activeTraitNames, withActiveTraits, routeParams]);
   return /* @__PURE__ */ jsx(EntityBindingContext.Provider, { value: entityBindingSource, children });
 }
-function SchemaRunner({ schema, serverUrl, transport, mockData, pageName, routeParams, onNavigate, onNavigateBack, onLocalFallback, persistence }) {
+function SchemaRunner({ schema, serverUrl, transport, getAccessToken, mockData, pageName, routeParams, onNavigate, onNavigateBack, onLocalFallback, persistence }) {
   const { traits: traits2, allEntities, allTraits, ir } = useResolvedSchema(schema, pageName);
   const allPageTraits = useMemo(() => {
     let base;
@@ -54183,6 +54314,18 @@ function SchemaRunner({ schema, serverUrl, transport, mockData, pageName, routeP
     () => buildResolvedTraitConfigs(schema),
     [schema]
   );
+  const callsiteCaptureChildrenByTrait = useMemo(() => {
+    const merged = /* @__PURE__ */ new Map();
+    const orbitals = schema?.orbitals;
+    if (orbitals) {
+      for (const orbital of orbitals) {
+        for (const [referrer, children] of collectCallsiteCaptureChildren(orbital)) {
+          merged.set(referrer, children);
+        }
+      }
+    }
+    return merged;
+  }, [schema]);
   const embeddedTraits = useMemo(() => {
     const set = collectEmbeddedTraits(schema);
     xOrbitalLog.info("SchemaRunner:embeddedTraits", {
@@ -54219,6 +54362,7 @@ function SchemaRunner({ schema, serverUrl, transport, mockData, pageName, routeP
           traitConfigsByName,
           orbitalsByTrait,
           embeddedTraits,
+          callsiteCaptureChildrenByTrait,
           serverActiveTraits,
           onNavigate,
           onNavigateBack,
@@ -54230,7 +54374,7 @@ function SchemaRunner({ schema, serverUrl, transport, mockData, pageName, routeP
     }
   ) });
   if (serverUrl || transport) {
-    return /* @__PURE__ */ jsx(ServerBridgeProvider, { schema, serverUrl, transport, children: inner });
+    return /* @__PURE__ */ jsx(ServerBridgeProvider, { schema, serverUrl, transport, getAccessToken, children: inner });
   }
   return inner;
 }
@@ -54242,6 +54386,7 @@ function OrbPreview({
   className,
   serverUrl,
   transport,
+  getAccessToken,
   initialPagePath,
   isolated = false
 }) {
@@ -54422,6 +54567,7 @@ function OrbPreview({
                   schema: parseResult.schema,
                   serverUrl,
                   transport,
+                  getAccessToken,
                   mockData: effectiveMockData,
                   pageName: currentPage,
                   routeParams,