@almadar/runtime 6.72.0 → 6.73.0

package/dist/OrbitalServerRuntime.js

@@ -1,5 +1,5 @@
-import { createTickScheduler, EventBus, createUnifiedLoader, MockPersistenceAdapter, InMemoryPersistence, preprocessSchema, normalizeCallSiteConfigToValues, StateMachineManager, parseDurationString, validateEventPayload, formatPayloadValidationError, collectDeclaredConfigDefaults, collectDeclaredEntityDefaults, EffectExecutor, LIFECYCLE_EVENTS } from './chunk-A474B57C.js';
-export { InMemoryPersistence, collectDeclaredConfigDefaults } from './chunk-A474B57C.js';
+import { createTickScheduler, EventBus, createUnifiedLoader, MockPersistenceAdapter, InMemoryPersistence, preprocessSchema, normalizeCallSiteConfigToValues, StateMachineManager, parseDurationString, validateEventPayload, formatPayloadValidationError, collectDeclaredConfigDefaults, collectDeclaredEntityDefaults, EffectExecutor, LIFECYCLE_EVENTS } from './chunk-H7HQQVQJ.js';
+export { InMemoryPersistence, collectDeclaredConfigDefaults } from './chunk-H7HQQVQJ.js';
 import { isValidCronExpression } from './chunk-OU3ITB5S.js';
 import { createContextFromBindings, checkMutationAccess, applyRowAccess, accessDeniedMessage } from './chunk-ZWAOJT6R.js';
 import './chunk-T4VDAB4C.js';

package/dist/{chunk-A474B57C.js → chunk-H7HQQVQJ.js}

@@ -4,7 +4,7 @@ import { seedRandom, randomArrayElement, randomInt, shuffleArray, randomPastDate
 import { collectTraitRefsFromValue, collectTraitRefsFromEffects } from './chunk-SCRAHWOC.js';
 import { createLogger, setNamespaceLevel } from '@almadar/logger';
 import { evaluateGuard, SExpressionEvaluator } from '@almadar/evaluator';
-import { OrbitalSchemaSchema, isInlineTrait, isEntityCall, isEntityReference, parseEntityRef, parseImportedTraitRef, isPageReference, isPageReferenceString, isPageReferenceObject, parsePageRef, parseOrbitalRef, overrideDeclaredKnobs, asTraitId, asEntityId, asPageId, asOrbitalId, deriveId, isReferenceConfigType, configRefEventKnob, normalizeCallSiteConfigToValues, resolveConfigRefEventName, isCallSiteConfigDeclaration, idPrefix, eventListPropsOf } from '@almadar/core';
+import { OrbitalSchemaSchema, isInlineTrait, isEntityCall, isEntityReference, parseEntityRef, parseImportedTraitRef, isPageReference, isPageReferenceString, isPageReferenceObject, parsePageRef, parseOrbitalRef, overrideDeclaredKnobs, asTraitId, asEntityId, asPageId, asOrbitalId, deriveId, isReferenceConfigType, configRefEventKnob, normalizeCallSiteConfigToValues, resolveConfigRefEventName, isCallSiteConfigDeclaration, asEventId, ledgerRename, idPrefix, eventListPropsOf } from '@almadar/core';
 export { normalizeCallSiteConfigToValues } from '@almadar/core';
 import { sampleRowCount, sampleRow, identityEntitiesOf, roleVocabularyOf } from '@almadar/core/mock';
 
@@ -3852,6 +3852,13 @@ function resolveSentinelFields(fields, entityDef, subs, declaredNames) {
   }
   return changed;
 }
+function resolvePayloadEntitySchema(payloadEntity, setPayloadSchema, entitiesByName) {
+  if (!payloadEntity) return false;
+  const entity = entitiesByName.get(payloadEntity);
+  if (!entity) return false;
+  setPayloadSchema(entityFieldsToPayloadFields(entity));
+  return true;
+}
 function resolveTraitTypeParamSentinels(trait, entityDef, entitiesByName, typesByName, typeArgs) {
   const declared = trait.typeParams ?? [];
   const subs = /* @__PURE__ */ new Map();
@@ -3872,6 +3879,16 @@ function resolveTraitTypeParamSentinels(trait, entityDef, entitiesByName, typesB
   let changed = false;
   for (const emit of trait.emits ?? []) {
     if (!emit.payloadSchema) continue;
+    if (resolvePayloadEntitySchema(
+      emit.payloadEntity,
+      (schema2) => {
+        emit.payloadSchema = schema2;
+      },
+      entitiesByName
+    )) {
+      changed = true;
+      continue;
+    }
     const schema = emit.payloadSchema;
     if (flattenBareEntityPayload(schema, entityDef, subs)) {
       changed = true;
@@ -3881,6 +3898,16 @@ function resolveTraitTypeParamSentinels(trait, entityDef, entitiesByName, typesB
   }
   for (const ev of trait.stateMachine?.events ?? []) {
     if (!ev.payloadSchema) continue;
+    if (resolvePayloadEntitySchema(
+      ev.payloadEntity,
+      (schema2) => {
+        ev.payloadSchema = schema2;
+      },
+      entitiesByName
+    )) {
+      changed = true;
+      continue;
+    }
     const schema = ev.payloadSchema;
     if (flattenBareEntityPayload(schema, entityDef, subs)) {
       changed = true;
@@ -4445,7 +4472,7 @@ function applyLinkedEntityRename(trait, linkedEntity, entityIds) {
   const atomLinked = trait.linkedEntity;
   const entitySubs = consumerKnownEntityRebindSubs(trait, entityIds);
   if (!linkedEntity || !atomLinked || linkedEntity === atomLinked) {
-    return rewriteEntityRefIds(trait, entitySubs, entityIds);
+    return rewriteEntityTypedConfigValues(rewriteEntityRefIds(trait, entitySubs, entityIds), entitySubs, entityIds);
   }
   for (const [from, to] of staleEntityRebindSubs(trait, linkedEntity)) {
     entitySubs.set(from, to);
@@ -4459,7 +4486,11 @@ function applyLinkedEntityRename(trait, linkedEntity, entityIds) {
     linkedEntityId: entityIds.get(linkedEntity)
   };
   if (!sm) {
-    return renamePayloadEntityMarkers(rewriteEntityRefIds(rebound, entitySubs, entityIds), rename);
+    return rewriteEntityTypedConfigValues(
+      renamePayloadEntityMarkers(rewriteEntityRefIds(rebound, entitySubs, entityIds), rename),
+      entitySubs,
+      entityIds
+    );
   }
   const nextTransitions = (sm.transitions ?? []).map((t) => {
     const nextEffects = t.effects ? renameEntityInEffects(
@@ -4475,13 +4506,17 @@ function applyLinkedEntityRename(trait, linkedEntity, entityIds) {
     to: linkedEntity,
     transitionCount: nextTransitions.length
   });
-  return renamePayloadEntityMarkers(
-    rewriteEntityRefIds(
-      { ...rebound, stateMachine: { ...sm, transitions: nextTransitions } },
-      entitySubs,
-      entityIds
+  return rewriteEntityTypedConfigValues(
+    renamePayloadEntityMarkers(
+      rewriteEntityRefIds(
+        { ...rebound, stateMachine: { ...sm, transitions: nextTransitions } },
+        entitySubs,
+        entityIds
+      ),
+      rename
     ),
-    rename
+    entitySubs,
+    entityIds
   );
 }
 function resolveEntityTokensById(trait, idIndex) {
@@ -4566,7 +4601,7 @@ function resolveConfigRefsById(trait, idIndex) {
   });
   return { ...trait, config: nextSchema };
 }
-function applyEventRenames(trait, renames) {
+function applyEventRenames(trait, renames, keptFinalNames) {
   if (!renames || Object.keys(renames).length === 0) return trait;
   const rename = (k) => k !== void 0 && k in renames ? renames[k] : k;
   const sm = trait.stateMachine;
@@ -4596,7 +4631,9 @@ function applyEventRenames(trait, renames) {
   );
   const nextListens = (trait.listens ?? []).map((l) => {
     const sourced = l.source !== void 0 && l.source.kind !== "any";
-    const nextEvent = sourced ? l.event : rename(l.event) ?? l.event;
+    const sourceTraitName = l.source && l.source.kind !== "any" ? l.source.trait : void 0;
+    const fromThisImport = sourceTraitName !== void 0 && keptFinalNames !== void 0 && keptFinalNames.has(sourceTraitName);
+    const nextEvent = sourced && !fromThisImport ? l.event : rename(l.event) ?? l.event;
     const nextTriggers = rename(l.triggers) ?? l.triggers;
     return nextEvent === l.event && nextTriggers === l.triggers ? l : { ...l, event: nextEvent, triggers: nextTriggers };
   });
@@ -4759,26 +4796,73 @@ function foldCallSiteConfigOntoTrait(trait, callSiteConfig) {
   }
   return { ...trait, config: nextConfig };
 }
-var ENTITY_FIELD_TOKEN_PREFIX = "@entity.";
+var ROW_ALIAS_TOKEN_PREFIXES = ["@entity.", "@item.", "@row."];
+var ROW_ALIAS_ROOTS = /* @__PURE__ */ new Set(["@entity", "@item", "@row"]);
+var FIELD_NAME_MEMBER_KEYS = ["key", "name", "field"];
 function rewriteEntityFieldTokensInValue(node, subs) {
   if (node === null || node === void 0) return node;
   if (typeof node === "string") {
-    if (!node.startsWith(ENTITY_FIELD_TOKEN_PREFIX)) return node;
-    const rest = node.slice(ENTITY_FIELD_TOKEN_PREFIX.length);
-    const dot = rest.search(/[.[]/);
-    const name = dot === -1 ? rest : rest.slice(0, dot);
-    const suffix = dot === -1 ? "" : rest.slice(dot);
-    const to = subs.get(name);
-    return to === void 0 ? node : `${ENTITY_FIELD_TOKEN_PREFIX}${to}${suffix}`;
+    for (const prefix of ROW_ALIAS_TOKEN_PREFIXES) {
+      if (!node.startsWith(prefix)) continue;
+      const rest = node.slice(prefix.length);
+      const dot = rest.search(/[.[]/);
+      const name = dot === -1 ? rest : rest.slice(0, dot);
+      const suffix = dot === -1 ? "" : rest.slice(dot);
+      const to = subs.get(name);
+      return to === void 0 ? node : `${prefix}${to}${suffix}`;
+    }
+    return node;
+  }
+  if (Array.isArray(node)) {
+    if (node.length >= 3 && node[0] === "object/get" && typeof node[1] === "string" && ROW_ALIAS_ROOTS.has(node[1]) && typeof node[2] === "string") {
+      const to = subs.get(node[2]);
+      if (to !== void 0) {
+        const rewritten = node.map((item) => rewriteEntityFieldTokensInValue(item, subs));
+        rewritten[2] = to;
+        return rewritten;
+      }
+    }
+    return node.map((item) => rewriteEntityFieldTokensInValue(item, subs));
   }
-  if (Array.isArray(node)) return node.map((item) => rewriteEntityFieldTokensInValue(item, subs));
   if (typeof node !== "object") return node;
   const next = {};
   for (const [key, value] of Object.entries(node)) {
+    if (FIELD_NAME_MEMBER_KEYS.includes(key) && typeof value === "string") {
+      const to = subs.get(value);
+      next[key] = to === void 0 ? value : to;
+      continue;
+    }
     next[key] = rewriteEntityFieldTokensInValue(value, subs);
   }
   return next;
 }
+function rewriteBareFieldNameConfigDefault(value, fieldSubs) {
+  if (typeof value === "string") {
+    if (value === "" || value.startsWith("@")) return value;
+    return fieldSubs.get(value) ?? value;
+  }
+  if (Array.isArray(value) && value.every((v) => typeof v === "string")) {
+    return value.map((v) => v === "" || v.startsWith("@") ? v : fieldSubs.get(v) ?? v);
+  }
+  return value;
+}
+function rewriteEntityFieldsInConfig(config, fieldSubs) {
+  if (fieldSubs.size === 0 || !config) return config;
+  const rewrite = (v) => rewriteEntityFieldTokensInValue(v, fieldSubs);
+  const nextConfig = {};
+  for (const [key, field] of Object.entries(config)) {
+    if (field.default === void 0) {
+      nextConfig[key] = field;
+      continue;
+    }
+    const afterSigils = rewrite(field.default);
+    nextConfig[key] = {
+      ...field,
+      default: rewriteBareFieldNameConfigDefault(afterSigils, fieldSubs)
+    };
+  }
+  return nextConfig;
+}
 function rewriteEntityFieldsInTrait(trait, fieldSubs) {
   if (fieldSubs.size === 0) return trait;
   const rewrite = (v) => rewriteEntityFieldTokensInValue(v, fieldSubs);
@@ -4812,11 +4896,7 @@ function rewriteEntityFieldsInTrait(trait, fieldSubs) {
     next.initialEffects = rewrite(trait.initialEffects);
   }
   if (trait.config) {
-    const nextConfig = {};
-    for (const [key, field] of Object.entries(trait.config)) {
-      nextConfig[key] = field.default === void 0 ? field : { ...field, default: rewrite(field.default) };
-    }
-    next.config = nextConfig;
+    next.config = rewriteEntityFieldsInConfig(trait.config, fieldSubs);
   }
   return next;
 }
@@ -4993,12 +5073,24 @@ function renamePayloadEntity(fields, rename) {
 }
 function renamePayloadEntityMarkers(trait, rename) {
   const sm = trait.stateMachine;
-  const nextEvents = sm?.events ? sm.events.map(
-    (ev) => ev.payloadSchema ? { ...ev, payloadSchema: renamePayloadEntity(ev.payloadSchema, rename) } : ev
-  ) : void 0;
-  const nextEmits = trait.emits ? trait.emits.map(
-    (em) => em.payloadSchema ? { ...em, payloadSchema: renamePayloadEntity(em.payloadSchema, rename) } : em
-  ) : void 0;
+  const nextEvents = sm?.events ? sm.events.map((ev) => {
+    const renamedEntity = ev.payloadEntity !== void 0 ? rename(ev.payloadEntity) : void 0;
+    if (!ev.payloadSchema && renamedEntity === void 0) return ev;
+    return {
+      ...ev,
+      ...ev.payloadSchema ? { payloadSchema: renamePayloadEntity(ev.payloadSchema, rename) } : {},
+      ...renamedEntity !== void 0 ? { payloadEntity: renamedEntity } : {}
+    };
+  }) : void 0;
+  const nextEmits = trait.emits ? trait.emits.map((em) => {
+    const renamedEntity = em.payloadEntity !== void 0 ? rename(em.payloadEntity) : void 0;
+    if (!em.payloadSchema && renamedEntity === void 0) return em;
+    return {
+      ...em,
+      ...em.payloadSchema ? { payloadSchema: renamePayloadEntity(em.payloadSchema, rename) } : {},
+      ...renamedEntity !== void 0 ? { payloadEntity: renamedEntity } : {}
+    };
+  }) : void 0;
   return {
     ...trait,
     ...sm && nextEvents ? { stateMachine: { ...sm, events: nextEvents } } : {},
@@ -5012,7 +5104,7 @@ function walkEntityInPayloadMapping(payloadMapping, rename, props) {
   }
   return next;
 }
-function renameEntitiesInTrait(trait, entitySubs) {
+function renameEntitiesInTrait(trait, entitySubs, entityIds) {
   if (entitySubs.size === 0) return trait;
   const rename = (name) => entitySubs.get(name);
   const withTokens = (value) => renameEntityNameTokensInValue(value, entitySubs);
@@ -5042,16 +5134,20 @@ function renameEntitiesInTrait(trait, entitySubs) {
     rename,
     REBIND_ENTITY_PROPS
   )) : trait.initialEffects;
-  return renamePayloadEntityMarkers(
-    {
-      ...trait,
-      linkedEntity: nextLinked,
-      ...sm ? { stateMachine: { ...sm, transitions: nextTransitions ?? [] } } : {},
-      ...nextTicks !== void 0 ? { ticks: nextTicks } : {},
-      ...nextListens !== void 0 ? { listens: nextListens } : {},
-      ...nextInitial !== void 0 ? { initialEffects: nextInitial } : {}
-    },
-    rename
+  return rewriteEntityTypedConfigValues(
+    renamePayloadEntityMarkers(
+      {
+        ...trait,
+        linkedEntity: nextLinked,
+        ...sm ? { stateMachine: { ...sm, transitions: nextTransitions ?? [] } } : {},
+        ...nextTicks !== void 0 ? { ticks: nextTicks } : {},
+        ...nextListens !== void 0 ? { listens: nextListens } : {},
+        ...nextInitial !== void 0 ? { initialEffects: nextInitial } : {}
+      },
+      rename
+    ),
+    entitySubs,
+    entityIds
   );
 }
 function rewriteEntityRefIds(trait, entitySubs, entityIds) {
@@ -5064,6 +5160,19 @@ function rewriteEntityRefIds(trait, entitySubs, entityIds) {
   }
   return { ...trait, entityRefIds: out };
 }
+function rewriteEntityTypedConfigValues(trait, entitySubs, entityIds) {
+  if (entitySubs.size === 0 || !trait.config) return trait;
+  let changed = false;
+  const nextConfig = { ...trait.config };
+  for (const [key, field] of Object.entries(trait.config)) {
+    if (field.type !== "entity" || typeof field.default !== "string") continue;
+    const to = entitySubs.get(field.default);
+    if (to === void 0) continue;
+    changed = true;
+    nextConfig[key] = { ...field, default: to, refId: entityIds.get(to) };
+  }
+  return changed ? { ...trait, config: nextConfig } : trait;
+}
 function applyAliasEntityRenames(trait, subs, entityIds) {
   if (subs.size === 0) return trait;
   const rename = (name) => subs.get(name);
@@ -5126,7 +5235,7 @@ function relationTargetsOfEntity(entity, candidates) {
   for (const field of entity.fields) collectRelationTargets(field, candidates, out);
   return out;
 }
-function rewriteListenSources(trait, subs, idByName, orbitalRename) {
+function rewriteListenSources(trait, subs, idByName, orbitalRename, alias, listenSourceTargets) {
   const listens = trait.listens;
   if (!listens || listens.length === 0) return trait;
   let changed = false;
@@ -5143,19 +5252,35 @@ function rewriteListenSources(trait, subs, idByName, orbitalRename) {
         source: { kind: "trait", trait: target, ...traitId ? { traitId } : {} }
       };
     }
-    if (source.kind === "orbital" && orbitalRename && source.orbital === orbitalRename.from) {
-      const targetTrait = subs.get(source.trait) ?? source.trait;
-      changed = true;
-      const traitId = idByName.get(targetTrait);
-      return {
-        ...listen,
-        source: {
-          kind: "orbital",
-          orbital: orbitalRename.to,
-          trait: targetTrait,
-          ...traitId ? { traitId } : {}
-        }
-      };
+    if (source.kind === "orbital") {
+      if (orbitalRename && source.orbital === orbitalRename.from) {
+        const targetTrait = subs.get(source.trait) ?? source.trait;
+        changed = true;
+        const traitId = idByName.get(targetTrait);
+        return {
+          ...listen,
+          source: {
+            kind: "orbital",
+            orbital: orbitalRename.to,
+            trait: targetTrait,
+            ...traitId ? { traitId } : {}
+          }
+        };
+      }
+      const info = alias && listenSourceTargets ? listenSourceTargets.get(siblingImportKey(alias, source.orbital)) : void 0;
+      if (info) {
+        const target = info.traitSubs.get(source.trait);
+        changed = true;
+        return {
+          ...listen,
+          source: {
+            kind: "orbital",
+            orbital: info.localName,
+            trait: target?.finalName ?? source.trait,
+            ...target?.finalId ? { traitId: target.finalId } : {}
+          }
+        };
+      }
     }
     return listen;
   });
@@ -5335,6 +5460,25 @@ function materializedPrimaryEntity(upstreamEntity, upstreamOrbitalId, ref, local
   );
   return { name, id };
 }
+function materializedTraitSubs(upstreamId, traits, ref, localName) {
+  const onlySet = ref.only ? new Set(ref.only) : void 0;
+  const omitSet = new Set(ref.omit ?? []);
+  const out = /* @__PURE__ */ new Map();
+  for (const rt of traits) {
+    const name = rt.trait.name;
+    if (!name) continue;
+    const keep = onlySet ? onlySet.has(name) : !omitSet.has(name);
+    if (!keep) continue;
+    out.set(name, {
+      finalName: `${localName}${name}`,
+      finalId: asTraitId(deriveMaterializedId(rt.trait.id, upstreamId, name, localName, "trait"))
+    });
+  }
+  return out;
+}
+function siblingImportKey(alias, upstreamOrbitalName) {
+  return `${alias}\0${upstreamOrbitalName}`;
+}
 function applyExtendFields(entity, extend, fieldSubs, consumerEntityIds, localName) {
   if (!extend || extend.length === 0) return { entity, errors: [] };
   const errors = [];
@@ -6842,6 +6986,7 @@ var ReferenceResolver = class _ReferenceResolver {
     for (const [name, id] of await this.precomputeReferenceFormPrimaryIds(schema, chain)) {
       if (!consumerEntityIds.has(name)) consumerEntityIds.set(name, id);
     }
+    const listenSourceTargets = await this.precomputeReferenceFormListenTargets(schema.orbitals, chain);
     const consumerRoster = identityEntitiesOf(schema.orbitals);
     for (const orbital of schema.orbitals) {
       if (!orbital.reference) {
@@ -6856,14 +7001,31 @@ var ReferenceResolver = class _ReferenceResolver {
         flattened.push(orbital);
         continue;
       }
-      const result = await this.resolveOrbitalRefChain(orbital, void 0, chain, visiting, consumerEntityIds, consumerRoster);
+      const result = await this.resolveOrbitalRefChain(
+        orbital,
+        void 0,
+        chain,
+        visiting,
+        consumerEntityIds,
+        consumerRoster,
+        listenSourceTargets
+      );
       if (!result.success) {
         errors.push(...result.errors);
         continue;
       }
+      if (!opts?.skipTypeParamSentinels && isInlineEntity(result.data.entity)) {
+        resolveOrbitalTypeParamSentinels(
+          result.data.traits.filter(isInlineTrait).map((t) => ({ trait: t })),
+          result.data.entity,
+          (result.data.auxiliaryEntities ?? []).filter(isInlineEntity),
+          result.data.types
+        );
+      }
       flattened.push(result.data);
     }
     if (errors.length > 0) return { success: false, errors };
+    reconcileOrbitalRefEventIdRenames(schema, flattened);
     return { success: true, data: flattened, warnings: [] };
   }
   /**
@@ -6906,6 +7068,58 @@ var ReferenceResolver = class _ReferenceResolver {
     }
     return out;
   }
+  /**
+   * G1 (`docs/Almadar_Compiler_Gaps.md` §82): every reference-form
+   * orbital's OWN materialized trait set, keyed by {@link siblingImportKey}
+   * (upstream alias + upstream orbital name), mapped to that import's local
+   * orbital name + every kept trait's final name/id ({@link
+   * materializedTraitSubs}). Computed order-free — WITHOUT requiring any
+   * other orbital in `schema` to have resolved first — same precompute
+   * shape as {@link precomputeReferenceFormPrimaryIds}, but for LISTEN-
+   * SOURCE rewriting: consulted by {@link rewriteListenSources} so a source
+   * naming ANY reference-form orbital of this schema resolves regardless of
+   * declaration order. Unlike the entity-id precompute, this resolves the
+   * upstream's OWN traits via the ordinary `this.resolve()` pass (the same
+   * call {@link materializeOrbitalRef} makes on its own upstream, with the
+   * same `schemaConfig` save/restore) rather than reading the raw unresolved
+   * schema — the JS identity model has no pre-resolve declaration id for a
+   * COMPOSED trait reference (unlike the compiled path's V4 dual-carry
+   * `TraitReference::Reference.id`), so a shallow read would silently
+   * under-report every composed trait's id.
+   *
+   * Best-effort: a reference this pre-pass cannot resolve (unknown alias,
+   * malformed reference string, upstream orbital not found, itself still
+   * reference-form, load/resolve failure) is silently skipped here — the
+   * REAL `resolveOrbitalRefChain`/`materializeOrbitalRef` call moments
+   * later still surfaces the actual error for it.
+   */
+  async precomputeReferenceFormListenTargets(orbitals, chain) {
+    const out = /* @__PURE__ */ new Map();
+    for (const orbital of orbitals) {
+      const ref = orbital.reference;
+      if (!ref) continue;
+      const parsed = parseOrbitalRef(ref.ref);
+      if (!parsed) continue;
+      const importsResult = await this.resolveImports(orbital.uses ?? [], void 0, chain);
+      if (!importsResult.success) continue;
+      const imported = importsResult.data.orbitals.get(parsed.alias);
+      if (!imported) continue;
+      const upstream = importedOrbitals(imported).find((o) => o.name === parsed.orbitalName);
+      if (!upstream || upstream.reference) continue;
+      const savedSchemaConfig = this.schemaConfig;
+      this.schemaConfig = imported.schemaConfig;
+      let resolvedUpstream;
+      try {
+        resolvedUpstream = await this.resolve(upstream, imported.sourcePath, chain);
+      } finally {
+        this.schemaConfig = savedSchemaConfig;
+      }
+      if (!resolvedUpstream.success) continue;
+      const traitSubs = materializedTraitSubs(upstream.id, resolvedUpstream.data.traits, ref, orbital.name);
+      out.set(siblingImportKey(parsed.alias, parsed.orbitalName), { localName: orbital.name, traitSubs });
+    }
+    return out;
+  }
   /**
    * Resolve one reference-form orbital, recursing into the upstream first
    * when IT is also reference-form ("already fully inlined because inline
@@ -6913,7 +7127,7 @@ var ReferenceResolver = class _ReferenceResolver {
    * step 3 — the JS resolver needs its own cycle guard since it has no
    * file-level inline-order pass to lean on).
    */
-  async resolveOrbitalRefChain(orbital, sourcePath, chain, visiting, consumerEntityIds, consumerRoster) {
+  async resolveOrbitalRefChain(orbital, sourcePath, chain, visiting, consumerEntityIds, consumerRoster, listenSourceTargets) {
     const ref = orbital.reference;
     if (!ref) return { success: true, data: orbital, warnings: [] };
     const parsed = parseOrbitalRef(ref.ref);
@@ -6955,13 +7169,15 @@ var ReferenceResolver = class _ReferenceResolver {
     }
     visiting.add(cycleKey);
     if (upstream.reference) {
+      const nestedListenSourceTargets = await this.precomputeReferenceFormListenTargets(candidates, chain);
       const nested = await this.resolveOrbitalRefChain(
         upstream,
         imported.sourcePath,
         chain,
         visiting,
         consumerEntityIds,
-        consumerRoster
+        consumerRoster,
+        nestedListenSourceTargets
       );
       if (!nested.success) {
         visiting.delete(cycleKey);
@@ -6980,7 +7196,9 @@ var ReferenceResolver = class _ReferenceResolver {
       candidates,
       consumerEntityIds,
       consumerRoster,
-      imported.schemaConfig
+      imported.schemaConfig,
+      parsed.alias,
+      listenSourceTargets
     );
     if (!materialized.success) return materialized;
     const siblingTraits = orbital.traits ?? [];
@@ -7001,7 +7219,7 @@ var ReferenceResolver = class _ReferenceResolver {
    * §4.3). JS twin of the (not-yet-landed) compiler's
    * `resolve_orbital_reference`.
    */
-  async materializeOrbitalRef(upstream, ref, localName, localId, sourcePath, chain, aliasOrbitals, consumerEntityIds, consumerRoster, importedSchemaConfig) {
+  async materializeOrbitalRef(upstream, ref, localName, localId, sourcePath, chain, aliasOrbitals, consumerEntityIds, consumerRoster, importedSchemaConfig, alias, listenSourceTargets) {
     const savedSchemaConfig = this.schemaConfig;
     this.schemaConfig = importedSchemaConfig;
     let resolvedUpstream;
@@ -7051,6 +7269,7 @@ var ReferenceResolver = class _ReferenceResolver {
     let auxEntities = upstreamAuxiliaryEntities ?? [];
     const subs = /* @__PURE__ */ new Map();
     for (const rt of keptTraits) subs.set(rt.trait.name, `${localName}${rt.trait.name}`);
+    const keptFinalNames = new Set(subs.values());
     const { name: primaryFinalName, id: primaryId } = materializedPrimaryEntity(
       upstreamEntity,
       upstream.id,
@@ -7247,7 +7466,7 @@ var ReferenceResolver = class _ReferenceResolver {
     const orbitalRename = upstream.name !== localName ? { from: upstream.name, to: localName } : void 0;
     const finalTraits = materializedTraits.map((trait) => {
       let next = renameTraitEmbeds(trait, subs);
-      next = renameEntitiesInTrait(next, subs);
+      next = renameEntitiesInTrait(next, subs, entityIds);
       if (next.linkedEntity !== void 0) {
         const linkedEntityId = entityIds.get(next.linkedEntity);
         if (linkedEntityId !== void 0) next = { ...next, linkedEntityId };
@@ -7256,7 +7475,7 @@ var ReferenceResolver = class _ReferenceResolver {
       next = renameSourceEntityDefinition(next, subs, entityIds);
       next = rewriteRoleLiteralsInTrait(next, roleFields, ref.roles ?? {});
       if (fieldSubs.size > 0) next = rewriteEntityFieldsInTrait(next, fieldSubs);
-      next = rewriteListenSources(next, subs, idByName, orbitalRename);
+      next = rewriteListenSources(next, subs, idByName, orbitalRename, alias, listenSourceTargets);
       if (pathMap.size > 0) {
         next = rewriteTraitNavigateTargets(next, pathMap);
       }
@@ -7266,10 +7485,13 @@ var ReferenceResolver = class _ReferenceResolver {
       }
       next = resolveForwardedSiblingConfigFrom(next, transitiveEmbedderChain(trait.name));
       next = resolveForwardedSiblingConfigFrom(next, [], foldedConfig, importedSchemaConfig);
+      if (fieldSubs.size > 0 && next.config) {
+        next = { ...next, config: rewriteEntityFieldsInConfig(next.config, fieldSubs) };
+      }
       if (pathMap.size > 0) {
         next = rewriteTraitConfigPagePaths(next, pathMap);
       }
-      next = applyEventRenames(next, ref.events);
+      next = applyEventRenames(next, ref.events, keptFinalNames);
       return next;
     });
     const renamedPrimaryEntity = rewriteRoleLiteralsInEntity(
@@ -7402,6 +7624,117 @@ var ReferenceResolver = class _ReferenceResolver {
     this.loader?.clearCache();
   }
 };
+function isInlineTraitWithStateMachine(tr) {
+  return isInlineTrait(tr);
+}
+function reconcileOrbitalRefEventIdRenames(schema, flattened) {
+  if (!schema.ledger) return;
+  const renamedRefs = schema.orbitals.filter((o) => o.reference?.events && Object.keys(o.reference.events).length > 0).map((o) => ({ localName: o.name, eventSubs: o.reference.events }));
+  if (renamedRefs.length === 0) return;
+  const sites = [];
+  for (const { localName, eventSubs } of renamedRefs) {
+    const newKeys = new Set(Object.values(eventSubs));
+    const orbital = flattened.find((o) => o.name === localName);
+    if (!orbital) continue;
+    for (const tr of orbital.traits) {
+      if (!isInlineTraitWithStateMachine(tr)) continue;
+      for (const ev of tr.stateMachine?.events ?? []) {
+        if (!ev.id || !newKeys.has(ev.key)) continue;
+        const entry = schema.ledger.entries[ev.id];
+        if (!entry || entry.curName === ev.key) continue;
+        sites.push({ orbitalName: orbital.name, traitName: tr.name, oldId: ev.id, newKey: ev.key });
+      }
+    }
+  }
+  if (sites.length === 0) return;
+  const candidateIds = new Set(sites.map((s) => s.oldId));
+  const owners = /* @__PURE__ */ new Map();
+  for (const orbital of flattened) {
+    for (const tr of orbital.traits) {
+      if (!isInlineTraitWithStateMachine(tr)) continue;
+      for (const ev of tr.stateMachine?.events ?? []) {
+        if (ev.id && candidateIds.has(ev.id)) {
+          const ownerKey = `${orbital.name}\0${tr.name}`;
+          const set = owners.get(ev.id) ?? /* @__PURE__ */ new Set();
+          set.add(ownerKey);
+          owners.set(ev.id, set);
+        }
+      }
+    }
+  }
+  const renameInPlace = /* @__PURE__ */ new Map();
+  const deriveSites = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const site of sites) {
+    const ownerCount = owners.get(site.oldId)?.size ?? 1;
+    if (ownerCount <= 1) {
+      renameInPlace.set(site.oldId, site.newKey);
+    } else if (!seen.has(site.oldId)) {
+      seen.add(site.oldId);
+      deriveSites.push({ site, newId: asEventId(deriveId(site.oldId, site.newKey)) });
+    }
+  }
+  for (const { site, newId } of deriveSites) {
+    const orbital = flattened.find((o) => o.name === site.orbitalName);
+    if (!orbital) continue;
+    orbital.traits = orbital.traits.map((tr) => {
+      if (!isInlineTraitWithStateMachine(tr) || tr.name !== site.traitName) return tr;
+      let next = tr;
+      if (next.stateMachine?.events) {
+        next = {
+          ...next,
+          stateMachine: {
+            ...next.stateMachine,
+            events: next.stateMachine.events.map((ev) => ev.id === site.oldId ? { ...ev, id: newId } : ev),
+            transitions: (next.stateMachine.transitions ?? []).map(
+              (t) => t.eventId === site.oldId ? { ...t, eventId: newId } : t
+            )
+          }
+        };
+      }
+      if (next.emits) {
+        next = {
+          ...next,
+          emits: next.emits.map(
+            (e) => typeof e !== "string" && e.eventId === site.oldId ? { ...e, eventId: newId } : e
+          )
+        };
+      }
+      if (next.listens) {
+        next = {
+          ...next,
+          listens: next.listens.map((l) => {
+            const eventId = l.eventId === site.oldId ? newId : l.eventId;
+            const triggersId = l.triggersId === site.oldId ? newId : l.triggersId;
+            return eventId === l.eventId && triggersId === l.triggersId ? l : { ...l, eventId, triggersId };
+          })
+        };
+      }
+      return next;
+    });
+  }
+  const at = (/* @__PURE__ */ new Date()).toISOString();
+  let ledger = schema.ledger;
+  for (const [oldId, newKey] of renameInPlace) {
+    ledger = ledgerRename(ledger, oldId, newKey, at);
+  }
+  for (const { site, newId } of deriveSites) {
+    const src = ledger.entries[site.oldId];
+    if (!src) continue;
+    const ownerTrait = flattened.find((o) => o.name === site.orbitalName)?.traits.find((tr) => isInlineTraitWithStateMachine(tr) && tr.name === site.traitName);
+    const newEntry = {
+      id: newId,
+      kind: src.kind,
+      bakedName: src.bakedName,
+      curName: site.newKey,
+      renames: [...src.renames, { from: src.curName, to: site.newKey, at }],
+      owner: src.owner,
+      ...ownerTrait?.id !== void 0 ? { parent: ownerTrait.id } : {}
+    };
+    ledger = { ...ledger, entries: { ...ledger.entries, [newId]: newEntry } };
+  }
+  schema.ledger = ledger;
+}
 async function resolveSchema(schema, options) {
   const resolver = new ReferenceResolver({ ...options, schemaConfig: schema.config });
   const errors = [];

package/dist/index.js

@@ -1,5 +1,5 @@
-import { EffectExecutor } from './chunk-A474B57C.js';
-export { EffectExecutor, EventBus, HANDLER_MANIFEST, InMemoryPersistence, LIFECYCLE_EVENTS, MockPersistenceAdapter, StateMachineManager, TickScheduler, buildEmitsFromTraits, collectDeclaredConfigDefaults, collectDeclaredEntityDefaults, createInitialTraitState, createMockPersistence, createTestExecutor, createTickScheduler, createUnifiedLoader, findInitialState, findTransition, formatPayloadValidationError, getIsolatedCollectionName, getNamespacedEvent, isBrowser, isElectron, isNamespacedEvent, isNode, isValidDurationString, normalizeCallSiteConfigToValues, normalizeEventKey, parseDurationString, parseNamespacedEvent, preprocessSchema, processEvent, validateEventPayload, validatePayloadShapes } from './chunk-A474B57C.js';
+import { EffectExecutor } from './chunk-H7HQQVQJ.js';
+export { EffectExecutor, EventBus, HANDLER_MANIFEST, InMemoryPersistence, LIFECYCLE_EVENTS, MockPersistenceAdapter, StateMachineManager, TickScheduler, buildEmitsFromTraits, collectDeclaredConfigDefaults, collectDeclaredEntityDefaults, createInitialTraitState, createMockPersistence, createTestExecutor, createTickScheduler, createUnifiedLoader, findInitialState, findTransition, formatPayloadValidationError, getIsolatedCollectionName, getNamespacedEvent, isBrowser, isElectron, isNamespacedEvent, isNode, isValidDurationString, normalizeCallSiteConfigToValues, normalizeEventKey, parseDurationString, parseNamespacedEvent, preprocessSchema, processEvent, validateEventPayload, validatePayloadShapes } from './chunk-H7HQQVQJ.js';
 export { cronMatches, cronMinuteKey, isValidCronExpression, parseCron, parseCronField } from './chunk-OU3ITB5S.js';
 import { createContextFromBindings, applyRowAccess, checkMutationAccess, accessDeniedMessage } from './chunk-ZWAOJT6R.js';
 export { applyRowAccess, checkMutationAccess, containsBindings, createContextFromBindings, createMinimalContext, deferEntityBindings, extractBindings, interpolateProps, interpolateValue } from './chunk-ZWAOJT6R.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/runtime",
-  "version": "6.72.0",
+  "version": "6.73.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.87.0",
+    "@almadar/core": "^10.88.0",
     "@almadar/evaluator": "^2.45.0",
     "@almadar/logger": "^1.12.0",
     "@almadar/server": "^2.40.0",
-    "@almadar/std": "^16.208.0"
+    "@almadar/std": "^16.209.0"
   },
   "peerDependencies": {
     "express": "^5.0.0"