@almadar/runtime 6.70.0 → 6.71.0

package/dist/{OrbitalServerRuntime-ut1b36Nv.d.ts → OrbitalServerRuntime-DnDJhpLS.d.ts}

@@ -1362,6 +1362,32 @@ declare class OrbitalServerRuntime {
      * Register a single orbital (sync wrapper for backward compatibility)
      */
     private registerOrbital;
+    /**
+     * The id of the SOURCE event a `listens {}` entry names, derived from the
+     * emitting trait's own declared `emits[]` contract rather than trusted
+     * from `listener.eventId` alone.
+     *
+     * `TraitEventListener.eventId` is "optional until the Phase-7 flip" (see
+     * `@almadar/core`'s `trait.ts`) — the compose/resolve pipeline stamps a
+     * V4 ledger id onto every `emits[]` entry (the emitter's own contract)
+     * well before it stamps the matching id onto every `listens[]` entry that
+     * names that event (source-qualified `Trait.EVENT -> X` listens compiled
+     * from `uses`-resolved atoms carry `triggersId` for their OWN triggered
+     * event but no `eventId` for the event they're listening to). The emit
+     * handler (`executeEffects`'s `emit` closure below) always looks up and
+     * stamps `emittingTrait.emits[].eventId` when present, so during that
+     * transitional window the emit side routes under an id-qualified bus key
+     * while the listen side — reading only its own possibly-absent
+     * `eventId` — subscribes under the bare name, and the two never meet.
+     *
+     * Fix: derive the SAME id the emitter will stamp by resolving the
+     * listener's declared `source` (trait/orbital, name or id) to the actual
+     * registered trait and reading ITS `emits[]` contract for `listener.event`
+     * — the single canonical place an event's id lives. `kind: "any"` sources
+     * are left alone (no single emitter to resolve against; bare-name routing
+     * is already the correct, safe default there).
+     */
+    private resolveSourceEmitEventId;
     /**
      * Set up event listeners for cross-orbital communication
      */

package/dist/OrbitalServerRuntime.d.ts

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

package/dist/OrbitalServerRuntime.js

@@ -760,6 +760,40 @@ var OrbitalServerRuntime = class {
       });
     });
   }
+  /**
+   * The id of the SOURCE event a `listens {}` entry names, derived from the
+   * emitting trait's own declared `emits[]` contract rather than trusted
+   * from `listener.eventId` alone.
+   *
+   * `TraitEventListener.eventId` is "optional until the Phase-7 flip" (see
+   * `@almadar/core`'s `trait.ts`) — the compose/resolve pipeline stamps a
+   * V4 ledger id onto every `emits[]` entry (the emitter's own contract)
+   * well before it stamps the matching id onto every `listens[]` entry that
+   * names that event (source-qualified `Trait.EVENT -> X` listens compiled
+   * from `uses`-resolved atoms carry `triggersId` for their OWN triggered
+   * event but no `eventId` for the event they're listening to). The emit
+   * handler (`executeEffects`'s `emit` closure below) always looks up and
+   * stamps `emittingTrait.emits[].eventId` when present, so during that
+   * transitional window the emit side routes under an id-qualified bus key
+   * while the listen side — reading only its own possibly-absent
+   * `eventId` — subscribes under the bare name, and the two never meet.
+   *
+   * Fix: derive the SAME id the emitter will stamp by resolving the
+   * listener's declared `source` (trait/orbital, name or id) to the actual
+   * registered trait and reading ITS `emits[]` contract for `listener.event`
+   * — the single canonical place an event's id lives. `kind: "any"` sources
+   * are left alone (no single emitter to resolve against; bare-name routing
+   * is already the correct, safe default there).
+   */
+  resolveSourceEmitEventId(source, event, listenerOrbital) {
+    if (!source || source.kind === "any") return void 0;
+    const ownerOrbitalName = source.kind === "orbital" ? source.orbital : listenerOrbital;
+    const owner = this.orbitals.get(ownerOrbitalName);
+    if (!owner) return void 0;
+    const sourceTrait = source.traitId !== void 0 ? owner.traits.find((t) => t.id === source.traitId) : owner.traits.find((t) => t.name === source.trait);
+    if (!sourceTrait) return void 0;
+    return sourceTrait.emits?.find((e) => e.event === event)?.eventId;
+  }
   /**
    * Set up event listeners for cross-orbital communication
    */
@@ -773,7 +807,8 @@ var OrbitalServerRuntime = class {
         if (!trait.listens) continue;
         for (const listener of trait.listens) {
           const { bareEvent, matcher } = parseListenSource(listener, orbitalName);
-          const routeKey = eventRouteKey(bareEvent, listener.eventId);
+          const effectiveEventId = listener.eventId ?? this.resolveSourceEmitEventId(listener.source, bareEvent, orbitalName);
+          const routeKey = eventRouteKey(bareEvent, effectiveEventId);
           const cleanup = this.eventBus.on(routeKey, async (event) => {
             if (!matcher(event.source)) return;
             if (event.source?.originClientId !== void 0) {

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { g as RuntimePatternValue, B as BindingContext, f as EvaluationContextExtensions, P as PatternProps, E as EffectHandlers, h as EffectContext, i as ExecutionEnvironment, j as EffectResult, S as ServiceCallContext, T as TraitDefinition } from './types-BaD_ox7e.js';
 export { k as BrowserFileMeta, l as BrowserFilePickerOptions, m as BrowserGeolocationOptions, n as BrowserGeolocationPosition, C as ConfigContext, o as Effect, a as EventListener, H as HANDLER_MANIFEST, I as IEventBus, b as RuntimeConfig, R as RuntimeEvent, d as TraitState, c as TransitionObserver, e as TransitionResult, U as Unsubscribe } from './types-BaD_ox7e.js';
-import { U as UnifiedLoaderOptions, S as SchemaLoader, I as ImportChainLike, L as LoadResult, a as LoadedSchema, b as LoadedOrbital, P as PersistenceAdapter } from './OrbitalServerRuntime-ut1b36Nv.js';
-export { E as EntitySharingMap, c as EventBus, d as EventNamespaceMap, e as InMemoryPersistence, O as OrbitalEventRequest, f as OrbitalEventResponse, g as OrbitalServerRuntimeConfig, h as PreprocessOptions, i as PreprocessResult, j as PreprocessedSchema, k as ProcessEventOptions, R as RegisteredOrbital, l as RuntimeOrbital, m as RuntimeOrbitalSchema, n as RuntimeTrait, o as StateMachineManager, p as collectDeclaredConfigDefaults, q as collectDeclaredEntityDefaults, r as createInitialTraitState, s as findInitialState, t as findTransition, u as getIsolatedCollectionName, v as getNamespacedEvent, w as isBrowser, x as isElectron, y as isNamespacedEvent, z as isNode, A as normalizeEventKey, B as parseNamespacedEvent, C as preprocessSchema, D as processEvent } from './OrbitalServerRuntime-ut1b36Nv.js';
+import { U as UnifiedLoaderOptions, S as SchemaLoader, I as ImportChainLike, L as LoadResult, a as LoadedSchema, b as LoadedOrbital, P as PersistenceAdapter } from './OrbitalServerRuntime-DnDJhpLS.js';
+export { E as EntitySharingMap, c as EventBus, d as EventNamespaceMap, e as InMemoryPersistence, O as OrbitalEventRequest, f as OrbitalEventResponse, g as OrbitalServerRuntimeConfig, h as PreprocessOptions, i as PreprocessResult, j as PreprocessedSchema, k as ProcessEventOptions, R as RegisteredOrbital, l as RuntimeOrbital, m as RuntimeOrbitalSchema, n as RuntimeTrait, o as StateMachineManager, p as collectDeclaredConfigDefaults, q as collectDeclaredEntityDefaults, r as createInitialTraitState, s as findInitialState, t as findTransition, u as getIsolatedCollectionName, v as getNamespacedEvent, w as isBrowser, x as isElectron, y as isNamespacedEvent, z as isNode, A as normalizeEventKey, B as parseNamespacedEvent, C as preprocessSchema, D as processEvent } from './OrbitalServerRuntime-DnDJhpLS.js';
 import { EvaluationContext, SExpressionEvaluator } from '@almadar/evaluator';
 export { EvaluationContext, createMinimalContext } from '@almadar/evaluator';
 import { RenderBindingMarker, SExpr, RuntimeValue, TraitConfigObject, EventPayload, PatternConfig, EntityId, EntityField, EntityRow, EntityPersistence, ServiceParams, EntityAccessPolicies, PayloadField, OrbitalDefinition, OrbitalSchema } from '@almadar/core';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/runtime",
-  "version": "6.70.0",
+  "version": "6.71.0",
   "description": "Interpreted runtime for Almadar orbital applications (OrbitalServerRuntime)",
   "type": "module",
   "main": "./dist/index.js",
@@ -57,11 +57,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@almadar/core": "^10.83.0",
+    "@almadar/core": "^10.84.0",
     "@almadar/evaluator": "^2.44.0",
     "@almadar/logger": "^1.12.0",
     "@almadar/server": "^2.39.0",
-    "@almadar/std": "^16.203.0"
+    "@almadar/std": "^16.204.0"
   },
   "peerDependencies": {
     "express": "^5.0.0"