@almadar/runtime 6.31.0 → 6.33.0

package/dist/{OrbitalServerRuntime-DpAwIrmv.d.ts → OrbitalServerRuntime-Cep380it.d.ts}

@@ -1,6 +1,6 @@
 import { Router } from 'express';
-import { I as IEventBus, g as RuntimeEvent, f as EventListener, U as Unsubscribe, T as TraitDefinition, R as RuntimeConfig, i as TransitionObserver, C as ConfigContext, h as TraitState, j as TransitionResult, E as EvaluationContextExtensions, a as EffectHandlers } from './types-D-9feVsj.js';
-import { EventPayload, EntityRow, Orbital, ServiceCallResult, TraitConfig, DeclaredTraitConfig, Entity, CallSiteConfig, OrbitalSchema, Trait, PatternConfig, ResolvedPatternProps, SExpr, BusEventSource, OrbitalDefinition, TraitTick } from '@almadar/core';
+import { I as IEventBus, R as RuntimeEvent, a as EventListener, U as Unsubscribe, T as TraitDefinition, b as RuntimeConfig, c as TransitionObserver, C as ConfigContext, d as TraitState, e as TransitionResult, f as EvaluationContextExtensions, E as EffectHandlers } from './types-ConZnrpe.js';
+import { EventPayload, EntityRow, Orbital, ServiceCallResult, TraitConfig, DeclaredTraitConfig, Entity, OrbitalSchema, Trait, PatternConfig, ResolvedPatternProps, SExpr, BusEventSource, OrbitalDefinition, TraitTick } from '@almadar/core';
 
 /**
  * EventBus - Platform-Agnostic Pub/Sub Implementation
@@ -358,17 +358,6 @@ interface SubstrateServices {
 declare function collectDeclaredConfigDefaults(trait: {
     config?: DeclaredTraitConfig;
 } | undefined): TraitConfig | undefined;
-/**
- * Convert a call-site config map into plain runtime values.
- *
- * A `CallSiteConfig` may contain either plain wiring values
- * (`TraitConfigValue`) or annotated `ConfigFieldDeclaration` objects
- * (`{ type, default, label, ... }`). The runtime binding context expects
- * only values, so this helper extracts `.default` from declarations and
- * passes plain values through unchanged. Entries that are not recognized as
- * declarations by `isCallSiteConfigDeclaration` are returned as-is.
- */
-declare function normalizeCallSiteConfigToValues(config: CallSiteConfig | undefined): TraitConfig | undefined;
 /**
  * Walk an entity's `fields` array and return a flat `{ fieldName: default, … }`
  * map. Seeds the `@entity` binding context with declared field defaults before
@@ -1063,6 +1052,16 @@ declare class OrbitalServerRuntime {
     private substrateHandlers;
     private substrateHandlersPromise;
     private resolvedSchema;
+    /**
+     * Trait name -> resolved `TraitConfig`, computed once per `register()` via
+     * `buildResolvedTraitConfigs` (`@almadar/core`). An embedded sub-trait's
+     * OWN declared config schema (`registered.traits` / `collectDeclaredConfigDefaults`)
+     * carries `@config.X` forwards verbatim — this map chains those through to
+     * the trait that actually embeds it (see `embedded-trait-config.ts` for the
+     * full rationale). Used as a fallback layer in `buildBindingContext` behind
+     * `declaredDefaults` and ahead of `callSiteOverride`.
+     */
+    private resolvedTraitConfigs;
     constructor(config?: OrbitalServerRuntimeConfig);
     /**
      * Lazily wire the OS-level effect handlers (fs/net/child_process), merging
@@ -1311,4 +1310,4 @@ declare class OrbitalServerRuntime {
  */
 declare function createOrbitalServerRuntime(config?: OrbitalServerRuntimeConfig): OrbitalServerRuntime;
 
-export { normalizeCallSiteConfigToValues as A, normalizeEventKey as B, parseNamespacedEvent as C, preprocessSchema as D, type EntitySharingMap as E, processEvent as F, type ClientEffectTuple as G, type ClientNavigateTuple as H, type ImportChainLike as I, type ClientNotifyTuple as J, type ClientRenderUITuple as K, type LoadResult as L, type EffectResult as M, type LoaderConfig as N, type OrbitalEventRequest as O, type PersistenceAdapter as P, OrbitalServerRuntime as Q, type RegisteredOrbital as R, type SchemaLoader as S, type RuntimeTraitTick as T, type UnifiedLoaderOptions as U, createOrbitalServerRuntime as V, type LoadedSchema as a, type LoadedOrbital as b, EventBus as c, type EventNamespaceMap as d, InMemoryPersistence as e, type OrbitalEventResponse as f, type OrbitalServerRuntimeConfig as g, type PreprocessOptions as h, type PreprocessResult as i, type PreprocessedSchema as j, type ProcessEventOptions as k, type RuntimeOrbital as l, type RuntimeOrbitalSchema as m, type RuntimeTrait as n, StateMachineManager as o, collectDeclaredConfigDefaults as p, collectDeclaredEntityDefaults as q, createInitialTraitState as r, findInitialState as s, findTransition as t, getIsolatedCollectionName as u, getNamespacedEvent as v, isBrowser as w, isElectron as x, isNamespacedEvent as y, isNode as z };
+export { normalizeEventKey as A, parseNamespacedEvent as B, preprocessSchema as C, processEvent as D, type EntitySharingMap as E, type ClientEffectTuple as F, type ClientNavigateTuple as G, type ClientNotifyTuple as H, type ImportChainLike as I, type ClientRenderUITuple as J, type EffectResult as K, type LoadResult as L, type LoaderConfig as M, OrbitalServerRuntime as N, type OrbitalEventRequest as O, type PersistenceAdapter as P, type RuntimeTraitTick as Q, type RegisteredOrbital as R, type SchemaLoader as S, createOrbitalServerRuntime as T, type UnifiedLoaderOptions as U, type LoadedSchema as a, type LoadedOrbital as b, EventBus as c, type EventNamespaceMap as d, InMemoryPersistence as e, type OrbitalEventResponse as f, type OrbitalServerRuntimeConfig as g, type PreprocessOptions as h, type PreprocessResult as i, type PreprocessedSchema as j, type ProcessEventOptions as k, type RuntimeOrbital as l, type RuntimeOrbitalSchema as m, type RuntimeTrait as n, StateMachineManager as o, collectDeclaredConfigDefaults as p, collectDeclaredEntityDefaults as q, createInitialTraitState as r, findInitialState as s, findTransition as t, getIsolatedCollectionName as u, getNamespacedEvent as v, isBrowser as w, isElectron as x, isNamespacedEvent as y, isNode as z };

package/dist/OrbitalServerRuntime.d.ts

@@ -1,4 +1,4 @@
 import 'express';
-export { G as ClientEffectTuple, H as ClientNavigateTuple, J as ClientNotifyTuple, K as ClientRenderUITuple, M as EffectResult, e as InMemoryPersistence, N as LoaderConfig, O as OrbitalEventRequest, f as OrbitalEventResponse, Q as OrbitalServerRuntime, g as OrbitalServerRuntimeConfig, P as PersistenceAdapter, R as RegisteredOrbital, l as RuntimeOrbital, m as RuntimeOrbitalSchema, n as RuntimeTrait, T as RuntimeTraitTick, p as collectDeclaredConfigDefaults, V as createOrbitalServerRuntime } from './OrbitalServerRuntime-DpAwIrmv.js';
-import './types-D-9feVsj.js';
+export { F as ClientEffectTuple, G as ClientNavigateTuple, H as ClientNotifyTuple, J as ClientRenderUITuple, K as EffectResult, e as InMemoryPersistence, M as LoaderConfig, O as OrbitalEventRequest, f as OrbitalEventResponse, N as OrbitalServerRuntime, g as OrbitalServerRuntimeConfig, P as PersistenceAdapter, R as RegisteredOrbital, l as RuntimeOrbital, m as RuntimeOrbitalSchema, n as RuntimeTrait, Q as RuntimeTraitTick, p as collectDeclaredConfigDefaults, T as createOrbitalServerRuntime } from './OrbitalServerRuntime-Cep380it.js';
+import './types-ConZnrpe.js';
 import '@almadar/core';

package/dist/OrbitalServerRuntime.js

@@ -1,11 +1,13 @@
-import { createTickScheduler, EventBus, createUnifiedLoader, MockPersistenceAdapter, InMemoryPersistence, preprocessSchema, normalizeCallSiteConfigToValues, StateMachineManager, parseDurationString, createContextFromBindings, validateEventPayload, formatPayloadValidationError, collectDeclaredConfigDefaults, collectDeclaredEntityDefaults, EffectExecutor } from './chunk-YFH577FH.js';
-export { InMemoryPersistence, collectDeclaredConfigDefaults } from './chunk-YFH577FH.js';
+import { createTickScheduler, EventBus, createUnifiedLoader, MockPersistenceAdapter, InMemoryPersistence, preprocessSchema, normalizeCallSiteConfigToValues, StateMachineManager, parseDurationString, createContextFromBindings, validateEventPayload, formatPayloadValidationError, collectDeclaredConfigDefaults, resolveCallSitePayloadCaptures, collectDeclaredEntityDefaults, EffectExecutor } from './chunk-JZDLN2FS.js';
+export { InMemoryPersistence, collectDeclaredConfigDefaults } from './chunk-JZDLN2FS.js';
 import { isValidCronExpression } from './chunk-OU3ITB5S.js';
+import './chunk-OQJIK6PZ.js';
+import './chunk-SCRAHWOC.js';
 import './chunk-MLKGABMK.js';
 import { createLogger } from '@almadar/logger';
 import * as nodeModule from 'module';
 import { evaluateGuard, evaluate } from '@almadar/evaluator';
-import { isInlineTrait, isEntityCall } from '@almadar/core';
+import { buildResolvedTraitConfigs, isInlineTrait, isEntityCall } from '@almadar/core';
 
 var _resolvedNodeRequire = null;
 function nodeRequire(modulePath) {
@@ -72,6 +74,16 @@ var OrbitalServerRuntime = class {
   substrateHandlers = null;
   substrateHandlersPromise = null;
   resolvedSchema = null;
+  /**
+   * Trait name -> resolved `TraitConfig`, computed once per `register()` via
+   * `buildResolvedTraitConfigs` (`@almadar/core`). An embedded sub-trait's
+   * OWN declared config schema (`registered.traits` / `collectDeclaredConfigDefaults`)
+   * carries `@config.X` forwards verbatim — this map chains those through to
+   * the trait that actually embeds it (see `embedded-trait-config.ts` for the
+   * full rationale). Used as a fallback layer in `buildBindingContext` behind
+   * `declaredDefaults` and ahead of `callSiteOverride`.
+   */
+  resolvedTraitConfigs = {};
   constructor(config = {}) {
     this.config = {
       mode: "mock",
@@ -257,6 +269,7 @@ var OrbitalServerRuntime = class {
     this.setupEventListeners();
     this.setupTicks();
     this.resolvedSchema = schema;
+    this.resolvedTraitConfigs = buildResolvedTraitConfigs(schema);
   }
   /**
    * Register an OrbitalSchema synchronously (for backward compatibility).
@@ -273,6 +286,7 @@ var OrbitalServerRuntime = class {
     this.setupEventListeners();
     this.setupTicks();
     this.resolvedSchema = schema;
+    this.resolvedTraitConfigs = buildResolvedTraitConfigs(schema);
   }
   /**
    * Returns the schema that this runtime is currently executing, post-
@@ -814,146 +828,163 @@ var OrbitalServerRuntime = class {
    * response as they arrive rather than buffering and flushing at the end.
    */
   async processOrbitalEvent(orbitalName, request, onPush) {
-    await this.ensureOsHandlers();
-    await this.ensureAgentSubstrateHandlers();
-    const registered = this.orbitals.get(orbitalName);
-    if (!registered) {
-      return {
-        success: false,
-        transitioned: false,
-        states: {},
-        emittedEvents: [],
-        error: `Orbital not found: ${orbitalName}`
-      };
-    }
-    const payloadRow = request.payload?.["row"];
-    const payloadRowAsPayload = payloadRow !== null && typeof payloadRow === "object" && !Array.isArray(payloadRow) ? payloadRow : void 0;
-    const payloadRowId = payloadRowAsPayload?.["id"];
-    renderLog.debug("processOrbitalEvent:enter", {
-      orbital: orbitalName,
-      event: request.event,
-      hasPayloadRow: payloadRowAsPayload !== void 0,
-      payloadRowId: typeof payloadRowId === "string" || typeof payloadRowId === "number" ? payloadRowId : void 0,
-      entityId: request.entityId
-    });
-    busLog.debug("bus:incoming", () => ({
-      orbital: orbitalName,
-      event: request.event,
-      payload: JSON.stringify(request.payload ?? null),
-      entityId: request.entityId,
-      traitStates: JSON.stringify(
-        Array.from(registered.manager.getAllStates().entries()).map(([traitName, state]) => ({
-          traitName,
-          currentState: state.currentState
-        }))
-      )
-    }));
-    xOrbitalLog.info("processOrbitalEvent:enter", () => ({
-      orbital: orbitalName,
-      event: request.event,
-      traitsInOrbital: registered.traits.map((t) => t.name).join(","),
-      payloadActiveTraits: JSON.stringify(
-        request.payload?.["_activeTraits"] ?? null
-      )
-    }));
-    const { event, payload, entityId, user } = request;
-    const validationFailures = [];
-    for (const trait of registered.traits) {
-      const eventSchema = trait.stateMachine?.events?.find((e) => e.key === event);
-      if (eventSchema?.payloadSchema && eventSchema.payloadSchema.length > 0) {
-        validationFailures.push(
-          ...validateEventPayload(event, payload, eventSchema.payloadSchema)
+    try {
+      await this.ensureOsHandlers();
+      await this.ensureAgentSubstrateHandlers();
+      const registered = this.orbitals.get(orbitalName);
+      if (!registered) {
+        return {
+          success: false,
+          transitioned: false,
+          states: {},
+          emittedEvents: [],
+          error: `Orbital not found: ${orbitalName}`
+        };
+      }
+      const payloadRow = request.payload?.["row"];
+      const payloadRowAsPayload = payloadRow !== null && typeof payloadRow === "object" && !Array.isArray(payloadRow) ? payloadRow : void 0;
+      const payloadRowId = payloadRowAsPayload?.["id"];
+      renderLog.debug("processOrbitalEvent:enter", {
+        orbital: orbitalName,
+        event: request.event,
+        hasPayloadRow: payloadRowAsPayload !== void 0,
+        payloadRowId: typeof payloadRowId === "string" || typeof payloadRowId === "number" ? payloadRowId : void 0,
+        entityId: request.entityId
+      });
+      busLog.debug("bus:incoming", () => ({
+        orbital: orbitalName,
+        event: request.event,
+        payload: JSON.stringify(request.payload ?? null),
+        entityId: request.entityId,
+        traitStates: JSON.stringify(
+          Array.from(registered.manager.getAllStates().entries()).map(([traitName, state]) => ({
+            traitName,
+            currentState: state.currentState
+          }))
+        )
+      }));
+      xOrbitalLog.info("processOrbitalEvent:enter", () => ({
+        orbital: orbitalName,
+        event: request.event,
+        traitsInOrbital: registered.traits.map((t) => t.name).join(","),
+        payloadActiveTraits: JSON.stringify(
+          request.payload?.["_activeTraits"] ?? null
+        )
+      }));
+      const { event, payload, entityId, user } = request;
+      const validationFailures = [];
+      for (const trait of registered.traits) {
+        const eventSchema = trait.stateMachine?.events?.find((e) => e.key === event);
+        if (eventSchema?.payloadSchema && eventSchema.payloadSchema.length > 0) {
+          validationFailures.push(
+            ...validateEventPayload(event, payload, eventSchema.payloadSchema)
+          );
+        }
+      }
+      if (validationFailures.length > 0) {
+        return {
+          success: false,
+          transitioned: false,
+          states: {},
+          emittedEvents: [],
+          error: formatPayloadValidationError(validationFailures)
+        };
+      }
+      const emittedEvents = [];
+      const fetchedData = {};
+      const clientEffects = [];
+      const clientEffectsByTrait = [];
+      const effectResults = [];
+      const activeTraits = payload?._activeTraits;
+      const cleanPayload = payload ? { ...payload } : void 0;
+      if (cleanPayload) {
+        delete cleanPayload._activeTraits;
+      }
+      let entityData = {};
+      if (entityId) {
+        const stored = await this.persistence.getById(
+          registered.entity.name,
+          entityId
         );
+        if (stored) {
+          entityData = stored;
+        }
       }
-    }
-    if (validationFailures.length > 0) {
+      const entityByTrait = {};
+      for (const [name, fields] of registered.traitFieldStates) {
+        if (fields && Object.keys(fields).length > 0) {
+          entityByTrait[name] = fields;
+        }
+      }
+      const results = registered.manager.sendEvent(
+        event,
+        cleanPayload,
+        entityData,
+        entityByTrait
+      );
+      const filteredResults = activeTraits && activeTraits.length > 0 ? results.filter(({ traitName }) => activeTraits.includes(traitName)) : results;
+      if (this.config.debug && activeTraits) {
+        busLog.debug("dispatch:filter-traits", () => ({
+          total: results.length,
+          active: filteredResults.length,
+          activeTraits: activeTraits.join(",")
+        }));
+      }
+      for (const { traitName, result } of filteredResults) {
+        if (result.effects.length > 0) {
+          await this.executeEffects(
+            registered,
+            traitName,
+            result.effects,
+            cleanPayload,
+            entityData,
+            entityId,
+            emittedEvents,
+            fetchedData,
+            clientEffects,
+            effectResults,
+            user,
+            clientEffectsByTrait,
+            onPush
+          );
+        }
+      }
+      const states = {};
+      for (const [name, state] of registered.manager.getAllStates()) {
+        states[name] = state.currentState;
+      }
+      const response = {
+        success: true,
+        transitioned: results.length > 0,
+        states,
+        emittedEvents
+      };
+      if (clientEffects.length > 0) {
+        response.clientEffects = clientEffects;
+      }
+      if (clientEffectsByTrait.length > 0) {
+        response.clientEffectsByTrait = clientEffectsByTrait;
+      }
+      if (effectResults.length > 0) {
+        response.effectResults = effectResults;
+      }
+      return response;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      xOrbitalLog.error("processOrbitalEvent:error", {
+        orbital: orbitalName,
+        event: request.event,
+        entityId: request.entityId,
+        error: message
+      });
       return {
         success: false,
         transitioned: false,
         states: {},
         emittedEvents: [],
-        error: formatPayloadValidationError(validationFailures)
+        error: message
       };
     }
-    const emittedEvents = [];
-    const fetchedData = {};
-    const clientEffects = [];
-    const clientEffectsByTrait = [];
-    const effectResults = [];
-    const activeTraits = payload?._activeTraits;
-    const cleanPayload = payload ? { ...payload } : void 0;
-    if (cleanPayload) {
-      delete cleanPayload._activeTraits;
-    }
-    let entityData = {};
-    if (entityId) {
-      const stored = await this.persistence.getById(
-        registered.entity.name,
-        entityId
-      );
-      if (stored) {
-        entityData = stored;
-      }
-    }
-    const entityByTrait = {};
-    for (const [name, fields] of registered.traitFieldStates) {
-      if (fields && Object.keys(fields).length > 0) {
-        entityByTrait[name] = fields;
-      }
-    }
-    const results = registered.manager.sendEvent(
-      event,
-      cleanPayload,
-      entityData,
-      entityByTrait
-    );
-    const filteredResults = activeTraits && activeTraits.length > 0 ? results.filter(({ traitName }) => activeTraits.includes(traitName)) : results;
-    if (this.config.debug && activeTraits) {
-      busLog.debug("dispatch:filter-traits", () => ({
-        total: results.length,
-        active: filteredResults.length,
-        activeTraits: activeTraits.join(",")
-      }));
-    }
-    for (const { traitName, result } of filteredResults) {
-      if (result.effects.length > 0) {
-        await this.executeEffects(
-          registered,
-          traitName,
-          result.effects,
-          cleanPayload,
-          entityData,
-          entityId,
-          emittedEvents,
-          fetchedData,
-          clientEffects,
-          effectResults,
-          user,
-          clientEffectsByTrait,
-          onPush
-        );
-      }
-    }
-    const states = {};
-    for (const [name, state] of registered.manager.getAllStates()) {
-      states[name] = state.currentState;
-    }
-    const response = {
-      success: true,
-      transitioned: results.length > 0,
-      states,
-      emittedEvents
-    };
-    if (clientEffects.length > 0) {
-      response.clientEffects = clientEffects;
-    }
-    if (clientEffectsByTrait.length > 0) {
-      response.clientEffectsByTrait = clientEffectsByTrait;
-    }
-    if (effectResults.length > 0) {
-      response.effectResults = effectResults;
-    }
-    return response;
   }
   /**
    * Execute effects from a transition
@@ -1446,9 +1477,22 @@ var OrbitalServerRuntime = class {
     };
     const traitDef = registered.traits.find((t) => t.name === traitName);
     const declaredDefaults = collectDeclaredConfigDefaults(traitDef);
-    const callSiteOverride = registered.configByTrait.get(traitName);
-    if (declaredDefaults || callSiteOverride) {
-      bindings.config = { ...declaredDefaults ?? {}, ...callSiteOverride ?? {} };
+    const resolvedDefaults = this.resolvedTraitConfigs[traitName];
+    const callSiteOverrideRaw = registered.configByTrait.get(traitName);
+    const callSiteOverride = callSiteOverrideRaw ? resolveCallSitePayloadCaptures(
+      Object.fromEntries(
+        Object.entries(callSiteOverrideRaw).filter(
+          ([, v]) => !(typeof v === "string" && v.startsWith("@config."))
+        )
+      ),
+      payload
+    ) : void 0;
+    if (declaredDefaults || resolvedDefaults || callSiteOverride) {
+      bindings.config = {
+        ...declaredDefaults ?? {},
+        ...resolvedDefaults ?? {},
+        ...callSiteOverride ?? {}
+      };
     }
     const entityFieldDefaults = collectDeclaredEntityDefaults(registered.entity);
     const traitFieldState = registered.traitFieldStates.get(traitName);

package/dist/ServerBridge.d.ts

@@ -1,4 +1,4 @@
-import { I as IEventBus } from './types-D-9feVsj.js';
+import { I as IEventBus } from './types-ConZnrpe.js';
 import { EventPayload } from '@almadar/core';
 
 /**