@almadar/runtime 6.74.0 → 6.75.0

package/dist/{OrbitalServerRuntime-BiEntWd-.d.ts → OrbitalServerRuntime-Buvz7dd7.d.ts}

@@ -1,6 +1,6 @@
 import { Router } from 'express';
-import { I as IEventBus, R as RuntimeEvent, a as EventListener, U as Unsubscribe, T as TraitDefinition, b as RuntimeConfig, c as TransitionObserver, d as TraitState, C as ConfigContext, e as TransitionResult, f as EvaluationContextExtensions, B as BindingContext, g as EffectContext, S as ServiceCallContext, E as EffectHandlers } from './types-CWaIuEQn.js';
-import { EventPayload, EventId, EntityRow, UserContext, ServiceParams, EntityAccessPolicies, Orbital, ServiceCallResult, TraitConfig, DeclaredTraitConfig, Entity, OrbitalSchema, Trait, PatternConfig, ResolvedPatternProps, SExpr, BusEventSource, RawUserClaims, 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, d as TraitState, C as ConfigContext, e as TransitionResult, f as EvaluationContextExtensions, B as BindingContext, g as EffectContext, S as ServiceCallContext, E as EffectHandlers } from './types-BO4tbEPp.js';
+import { EventPayload, EventId, EntityRow, UserContext, ServiceParams, EntityAccessPolicies, Orbital, ServiceCallResult, TraitConfig, DeclaredTraitConfig, Entity, OrbitalSchema, Trait, PatternConfig, ResolvedPatternProps, BusEventSource, RawUserClaims, OrbitalDefinition, TraitTick } from '@almadar/core';
 
 /**
  * EventBus - Platform-Agnostic Pub/Sub Implementation
@@ -538,7 +538,7 @@ interface CreateServerEffectHandlersOptions {
  * transition, call this factory again.
  *
  * Intentionally does NOT implement:
- * - `renderUI` / `notify` / `navigate` — these are client-side, provided
+ * - `renderUI` / `navigate` — these are client-side, provided
  *   by `createClientEffectHandlers`. A mock runtime merges both handler
  *   sets.
  * - `os/watch-*` observers — these are a no-op outside the server.
@@ -1030,19 +1030,19 @@ declare function parseNamespacedEvent(eventName: string): {
 
 /**
  * Client-side effect tuple shipped in `OrbitalEventResponse.clientEffects`.
- * Restricted to the three effect kinds the client knows how to apply to the
- * UI: render-ui (slot mutation), navigate (route change), notify (toast).
+ * Restricted to the effect kinds the client knows how to apply to the
+ * UI: render-ui (slot mutation, including the `toast` slot that carries
+ * what used to be the separate notify effect) and navigate (route change).
  * Server-only effects (persist, set, fetch, ...) execute on the server and
  * surface their results via `effectResults` and `emittedEvents`, not here.
  *
  * Shape note: the wire form is broader than `RenderUIEffect` /
- * `NavigateEffect` / `NotifyEffect` from `@almadar/core/types/effect.ts` in
- * two places — the runtime appends an interpolated `props` object plus an
- * optional `priority` slot to render-ui (slot 4 + 5), and `navigate` /
- * `notify` may surface their optional argument as `undefined` rather than
- * absent. The local union spells those variants out explicitly so consumers
- * (ServerBridge.tsx parser, debugger inspector) get accurate completions
- * instead of `unknown[]`.
+ * `NavigateEffect` from `@almadar/core/types/effect.ts` in two places — the
+ * runtime appends an interpolated `props` object plus an optional `priority`
+ * slot to render-ui (slot 4 + 5), and `navigate`'s optional argument may
+ * surface as `undefined` rather than absent. The local union spells those
+ * variants out explicitly so consumers (ServerBridge.tsx parser, debugger
+ * inspector) get accurate completions instead of `unknown[]`.
  *
  * `slot` is a plain `string` in this wire shape (not `UISlot`'s literal
  * union) because the runtime forwards the raw string from the trait's
@@ -1054,10 +1054,7 @@ type ClientNavigateTuple = ['navigate', string] | ['navigate', string, Record<st
     crumb?: string;
 }];
 type ClientNavigateBackTuple = ['navigate-back'];
-type ClientNotifyTuple = ['notify', string, string | SExpr | undefined] | ['notify', string, string | SExpr | undefined, {
-    type?: string;
-}];
-type ClientEffectTuple = ClientRenderUITuple | ClientNavigateTuple | ClientNavigateBackTuple | ClientNotifyTuple;
+type ClientEffectTuple = ClientRenderUITuple | ClientNavigateTuple | ClientNavigateBackTuple;
 
 /** @deprecated Use OrbitalSchema from @almadar/core */
 type RuntimeOrbitalSchema = OrbitalSchema;
@@ -1174,7 +1171,7 @@ interface OrbitalEventResponse {
         payload?: EventPayload;
         source?: BusEventSource;
     }>;
-    /** Client-side effects to execute (render-ui, navigate, notify) */
+    /** Client-side effects to execute (render-ui, navigate) */
     clientEffects?: ClientEffectTuple[];
     /**
      * Same effects as `clientEffects`, paired with the producing trait name.
@@ -1638,6 +1635,12 @@ declare class OrbitalServerRuntime {
      *  entity, its auxiliary entities, then other registered orbitals' primary
      *  entities (cross-orbital binds like a membership rail in the chat page). */
     private isSharedEntity;
+    /** Names of an entity's `@intrinsic` fields — trait-owned view state
+     *  (`ChatMessage.activeChannel`, `ChannelMember.pendingChannelId`, …) that
+     *  is NEVER a persisted column. Resolves the entity by name the same way
+     *  `isSharedEntity` does: the orbital's own entity, its auxiliary
+     *  entities, then other registered orbitals' primary entities. */
+    private intrinsicFieldNames;
     /**
      * Process an event for an orbital
      *
@@ -1763,4 +1766,4 @@ declare class OrbitalServerRuntime {
  */
 declare function createOrbitalServerRuntime(config?: OrbitalServerRuntimeConfig): OrbitalServerRuntime;
 
-export { isElectron as A, isNamespacedEvent as B, type CreateServerEffectHandlersOptions as C, isNode as D, type EntitySharingMap as E, normalizeEventKey as F, parseNamespacedEvent as G, preprocessSchema as H, type ImportChainLike as I, processEvent as J, type ClientEffectTuple as K, type LoadResult as L, type ClientNavigateBackTuple as M, type ClientNavigateTuple as N, type OrbitalEventRequest as O, type PersistenceAdapter as P, type ClientNotifyTuple as Q, type RegisteredOrbital as R, type SchemaLoader as S, type ClientRenderUITuple as T, type UnifiedLoaderOptions as U, type LiveBroadcastItem as V, type LoaderConfig as W, OrbitalServerRuntime as X, type RuntimeTraitTick as Y, createOrbitalServerRuntime as Z, type LoadedSchema as a, type LoadedOrbital as b, EventBus as c, type EventNamespaceMap as d, InMemoryPersistence as e, LIFECYCLE_EVENTS as f, type OrbitalEventResponse as g, type OrbitalServerRuntimeConfig as h, type PreprocessOptions as i, type PreprocessResult as j, type PreprocessedSchema as k, type ProcessEventOptions as l, type RuntimeOrbital as m, type RuntimeOrbitalSchema as n, type RuntimeTrait as o, type ServerEffectResult as p, StateMachineManager as q, collectDeclaredConfigDefaults as r, collectDeclaredEntityDefaults as s, createInitialTraitState as t, createServerEffectHandlers as u, findInitialState as v, findTransition as w, getIsolatedCollectionName as x, getNamespacedEvent as y, isBrowser as z };
+export { isElectron as A, isNamespacedEvent as B, type CreateServerEffectHandlersOptions as C, isNode as D, type EntitySharingMap as E, normalizeEventKey as F, parseNamespacedEvent as G, preprocessSchema as H, type ImportChainLike as I, processEvent as J, type ClientEffectTuple as K, type LoadResult as L, type ClientNavigateBackTuple as M, type ClientNavigateTuple as N, type OrbitalEventRequest as O, type PersistenceAdapter as P, type ClientRenderUITuple as Q, type RegisteredOrbital as R, type SchemaLoader as S, type LiveBroadcastItem as T, type UnifiedLoaderOptions as U, type LoaderConfig as V, OrbitalServerRuntime as W, type RuntimeTraitTick as X, createOrbitalServerRuntime as Y, type LoadedSchema as a, type LoadedOrbital as b, EventBus as c, type EventNamespaceMap as d, InMemoryPersistence as e, LIFECYCLE_EVENTS as f, type OrbitalEventResponse as g, type OrbitalServerRuntimeConfig as h, type PreprocessOptions as i, type PreprocessResult as j, type PreprocessedSchema as k, type ProcessEventOptions as l, type RuntimeOrbital as m, type RuntimeOrbitalSchema as n, type RuntimeTrait as o, type ServerEffectResult as p, StateMachineManager as q, collectDeclaredConfigDefaults as r, collectDeclaredEntityDefaults as s, createInitialTraitState as t, createServerEffectHandlers as u, findInitialState as v, findTransition as w, getIsolatedCollectionName as x, getNamespacedEvent as y, isBrowser as z };

package/dist/OrbitalServerRuntime.d.ts

@@ -1,4 +1,4 @@
 import 'express';
-export { K as ClientEffectTuple, M as ClientNavigateBackTuple, N as ClientNavigateTuple, Q as ClientNotifyTuple, T as ClientRenderUITuple, e as InMemoryPersistence, V as LiveBroadcastItem, W as LoaderConfig, O as OrbitalEventRequest, g as OrbitalEventResponse, X as OrbitalServerRuntime, h as OrbitalServerRuntimeConfig, P as PersistenceAdapter, R as RegisteredOrbital, m as RuntimeOrbital, n as RuntimeOrbitalSchema, o as RuntimeTrait, Y as RuntimeTraitTick, r as collectDeclaredConfigDefaults, Z as createOrbitalServerRuntime } from './OrbitalServerRuntime-BiEntWd-.js';
-import './types-CWaIuEQn.js';
+export { K as ClientEffectTuple, M as ClientNavigateBackTuple, N as ClientNavigateTuple, Q as ClientRenderUITuple, e as InMemoryPersistence, T as LiveBroadcastItem, V as LoaderConfig, O as OrbitalEventRequest, g as OrbitalEventResponse, W as OrbitalServerRuntime, h as OrbitalServerRuntimeConfig, P as PersistenceAdapter, R as RegisteredOrbital, m as RuntimeOrbital, n as RuntimeOrbitalSchema, o as RuntimeTrait, X as RuntimeTraitTick, r as collectDeclaredConfigDefaults, Y as createOrbitalServerRuntime } from './OrbitalServerRuntime-Buvz7dd7.js';
+import './types-BO4tbEPp.js';
 import '@almadar/core';

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-QUW37QRQ.js';
-export { InMemoryPersistence, collectDeclaredConfigDefaults } from './chunk-QUW37QRQ.js';
+import { createTickScheduler, EventBus, createUnifiedLoader, MockPersistenceAdapter, InMemoryPersistence, preprocessSchema, normalizeCallSiteConfigToValues, StateMachineManager, parseDurationString, validateEventPayload, formatPayloadValidationError, collectDeclaredConfigDefaults, collectDeclaredEntityDefaults, EffectExecutor, LIFECYCLE_EVENTS } from './chunk-CEYC3Z2O.js';
+export { InMemoryPersistence, collectDeclaredConfigDefaults } from './chunk-CEYC3Z2O.js';
 import { isValidCronExpression } from './chunk-OU3ITB5S.js';
 import { createContextFromBindings, checkMutationAccess, applyRowAccess, accessDeniedMessage } from './chunk-ZWAOJT6R.js';
 import './chunk-T4VDAB4C.js';
@@ -8,7 +8,7 @@ import './chunk-MLKGABMK.js';
 import { createLogger } from '@almadar/logger';
 import * as nodeModule from 'module';
 import { evaluateListenPayloadExpr, evaluateGuard, evaluate } from '@almadar/evaluator';
-import { DEFAULT_VIEWER, buildResolvedTraitConfigs, collectCallsiteCaptureChildren, isInlineTrait, isEntityCall, applyListenPayloadMapping, personaFromIdentityRow, normalizeUserContext, isRuntimeEntity, isPageReference } from '@almadar/core';
+import { DEFAULT_VIEWER, buildResolvedTraitConfigs, collectCallsiteCaptureChildren, isInlineTrait, isEntityCall, applyListenPayloadMapping, personaFromIdentityRow, normalizeUserContext, isRuntimeEntity, omitFrameFields, isPageReference } from '@almadar/core';
 import { ownerFieldsFromSchema, identityEntityName, entityAccessPoliciesByStoreKey, entityAccessPolicies } from '@almadar/core/mock';
 import { getPatternFieldsContract } from '@almadar/core/patterns';
 
@@ -1266,6 +1266,24 @@ var OrbitalServerRuntime = class {
     }
     return false;
   }
+  /** Names of an entity's `@intrinsic` fields — trait-owned view state
+   *  (`ChatMessage.activeChannel`, `ChannelMember.pendingChannelId`, …) that
+   *  is NEVER a persisted column. Resolves the entity by name the same way
+   *  `isSharedEntity` does: the orbital's own entity, its auxiliary
+   *  entities, then other registered orbitals' primary entities. */
+  intrinsicFieldNames(registered, entityName) {
+    const namesOf = (entity) => entity.fields.filter((field) => field.intrinsic === true && typeof field.name === "string").map((field) => field.name);
+    if (registered.entity.name === entityName) return namesOf(registered.entity);
+    for (const aux of registered.schema.auxiliaryEntities ?? []) {
+      if (typeof aux === "object" && !isEntityCall(aux) && aux.name === entityName) {
+        return namesOf(aux);
+      }
+    }
+    for (const other of this.orbitals.values()) {
+      if (other.entity.name === entityName) return namesOf(other.entity);
+    }
+    return [];
+  }
   /**
    * Process an event for an orbital
    *
@@ -1321,8 +1339,14 @@ var OrbitalServerRuntime = class {
       const { event, eventId, payload, entityId, user: requestUser, clientId } = request;
       const viewer = normalizeUserContext(requestUser) ?? this.config.defaultUser;
       const targetTrait = request.targetTrait ?? payload?.["_targetTrait"];
+      const activeTraits = payload?._activeTraits;
+      const dispatchTargetTraits = registered.traits.filter((trait) => {
+        if (targetTrait !== void 0) return trait.name === targetTrait;
+        if (activeTraits && activeTraits.length > 0 && !activeTraits.includes(trait.name)) return false;
+        return registered.manager.canHandleEvent(trait.name, event, entityId, eventId);
+      });
       const validationFailures = [];
-      for (const trait of registered.traits) {
+      for (const trait of dispatchTargetTraits) {
         const eventSchema = trait.stateMachine?.events?.find((e) => e.key === event);
         if (eventSchema?.payloadSchema && eventSchema.payloadSchema.length > 0) {
           validationFailures.push(
@@ -1344,7 +1368,6 @@ var OrbitalServerRuntime = class {
       const clientEffects = [];
       const clientEffectsByTrait = [];
       const effectResults = [];
-      const activeTraits = payload?._activeTraits;
       const cleanPayload = payload ? { ...payload } : void 0;
       if (cleanPayload) {
         delete cleanPayload._activeTraits;
@@ -1577,7 +1600,8 @@ var OrbitalServerRuntime = class {
             try {
               switch (opAction) {
                 case "create": {
-                  const createData = opRest[0] || {};
+                  const createIntrinsicFields = this.intrinsicFieldNames(registered, opEntityType);
+                  const createData = createIntrinsicFields.length > 0 ? omitFrameFields(opRest[0] || {}, createIntrinsicFields) : opRest[0] || {};
                   const { id: newId } = await this.persistence.create(opEntityType, createData);
                   batchResults.push({ ...createData, action: "create", entityType: opEntityType, id: newId });
                   completed.push({ action: "create", entityType: opEntityType, id: newId });
@@ -1585,7 +1609,8 @@ var OrbitalServerRuntime = class {
                 }
                 case "update": {
                   const updateId = opRest[0];
-                  const updateData = opRest[1] || {};
+                  const updateIntrinsicFields = this.intrinsicFieldNames(registered, opEntityType);
+                  const updateData = updateIntrinsicFields.length > 0 ? omitFrameFields(opRest[1] || {}, updateIntrinsicFields) : opRest[1] || {};
                   await this.persistence.update(opEntityType, updateId, updateData);
                   const updated = await this.persistence.getById(opEntityType, updateId);
                   batchResults.push({ ...updated || updateData, action: "update", entityType: opEntityType, id: updateId });
@@ -1625,6 +1650,10 @@ var OrbitalServerRuntime = class {
           return;
         }
         const type = targetEntityType || entityType;
+        if ((action === "create" || action === "update") && data !== void 0) {
+          const intrinsicFields = this.intrinsicFieldNames(registered, type);
+          if (intrinsicFields.length > 0) data = omitFrameFields(data, intrinsicFields);
+        }
         let resultData;
         const sizeBefore = (await this.persistence.list(type)).length;
         let deniedReason;
@@ -1952,7 +1981,8 @@ var OrbitalServerRuntime = class {
           contextExtensions: this.config.contextExtensions,
           // Same render-time marker boundary as the outer executor
           // (including the [shared]-defers-regardless-of-persistence rule).
-          deferRenderBindings: registered.entity === void 0 || isRuntimeEntity(registered.entity) || registered.entity.shared === true
+          deferRenderBindings: registered.entity === void 0 || isRuntimeEntity(registered.entity) || registered.entity.shared === true,
+          resolveIntrinsicFields: (type) => this.intrinsicFieldNames(registered, type)
         });
         for (const innerEffect of atomicEffects) {
           if (atomicFailed) break;
@@ -2003,12 +2033,6 @@ var OrbitalServerRuntime = class {
       navigateBack: () => {
         pushClientEffect(["navigate-back"]);
       },
-      notify: (message, type) => {
-        if (this.config.debug) {
-          effectLog.info("notify", { type, message });
-        }
-        pushClientEffect(["notify", message, { type }]);
-      },
       log: (message, level) => {
         if (level === "error") {
           dynamicLog.error(message);
@@ -2117,7 +2141,8 @@ var OrbitalServerRuntime = class {
       // client-held by contract (one live frame across bound traits), and
       // the eager clobber pinned the chat composer's controlled input to
       // the server's flush-time "" on every keystroke round-trip.
-      deferRenderBindings: registered.entity === void 0 || isRuntimeEntity(registered.entity) || registered.entity.shared === true
+      deferRenderBindings: registered.entity === void 0 || isRuntimeEntity(registered.entity) || registered.entity.shared === true,
+      resolveIntrinsicFields: (type) => this.intrinsicFieldNames(registered, type)
     });
     await executor.executeAll(effects);
   }

package/dist/ServerBridge.d.ts

@@ -1,4 +1,4 @@
-import { I as IEventBus } from './types-CWaIuEQn.js';
+import { I as IEventBus } from './types-BO4tbEPp.js';
 import { EventPayload } from '@almadar/core';
 
 /**

package/dist/{chunk-QUW37QRQ.js → chunk-CEYC3Z2O.js}

@@ -4,9 +4,9 @@ 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, asEventId, ledgerRename, idPrefix, eventListPropsOf } from '@almadar/core';
+import { omitFrameFields, 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';
+import { sampleRowCount, linkSelfRelationField, sampleRow, identityEntitiesOf, roleVocabularyOf } from '@almadar/core/mock';
 
 var log = createLogger("almadar:runtime:eventbus");
 var EventBus = class {
@@ -922,14 +922,13 @@ var StateMachineManager = class {
 
 // src/types.ts
 var HANDLER_MANIFEST = {
-  client: ["render-ui", "render", "navigate", "navigate-back", "notify", "emit", "set", "log", "ref", "deref", "watch", "send-server", "browser/open-file-picker", "browser/clipboard-read", "browser/clipboard-write", "browser/geolocation-current"],
+  client: ["render-ui", "render", "navigate", "navigate-back", "emit", "set", "log", "ref", "deref", "watch", "send-server", "browser/open-file-picker", "browser/clipboard-read", "browser/clipboard-write", "browser/geolocation-current"],
   server: ["persist", "fetch", "fetch-stream", "call-service", "emit", "set", "spawn", "despawn", "log", "ref", "deref", "swap!", "atomic", "os/watch-files", "os/watch-process", "os/watch-port", "os/watch-http", "os/watch-cron", "os/watch-signal", "os/watch-env", "os/debounce"],
   test: [
     "render-ui",
     "render",
     "navigate",
     "navigate-back",
-    "notify",
     "emit",
     "set",
     "persist",
@@ -989,6 +988,7 @@ var EffectExecutor = class _EffectExecutor {
   contextExtensions;
   evaluator;
   deferRenderBindings;
+  resolveIntrinsicFields;
   constructor(options) {
     this.handlers = options.handlers;
     this.bindings = options.bindings;
@@ -998,6 +998,22 @@ var EffectExecutor = class _EffectExecutor {
     this.contextExtensions = options.contextExtensions;
     this.evaluator = options.evaluator;
     this.deferRenderBindings = options.deferRenderBindings ?? false;
+    this.resolveIntrinsicFields = options.resolveIntrinsicFields;
+  }
+  /**
+   * `@intrinsic` fields are NEVER a persisted column — strips them from
+   * `data` before a `persist create`/`persist update` write, regardless of
+   * what expression produced `data` (bare `@entity`, an explicit literal
+   * that names one, an `object/merge` result, …). Deterministic on the
+   * entity's declared schema, not on how the value was constructed. A
+   * no-op when no schema was supplied (`resolveIntrinsicFields` absent,
+   * e.g. a browser/offline-preview handler set) or the entity declares no
+   * intrinsic fields.
+   */
+  stripFrameFields(entityType, data) {
+    if (data === void 0 || !this.resolveIntrinsicFields) return data;
+    const intrinsicFields = this.resolveIntrinsicFields(entityType);
+    return intrinsicFields.length > 0 ? omitFrameFields(data, intrinsicFields) : data;
   }
   _evaluator;
   getEvaluator() {
@@ -1063,7 +1079,6 @@ var EffectExecutor = class _EffectExecutor {
       "render": this.handlers.renderUI,
       "navigate": this.handlers.navigate,
       "navigate-back": this.handlers.navigateBack,
-      "notify": this.handlers.notify,
       "log": this.handlers.log,
       "ref": this.handlers.ref,
       "deref": this.handlers.deref,
@@ -1413,7 +1428,19 @@ var EffectExecutor = class _EffectExecutor {
         }
         try {
           if (action === "batch") {
-            const operations = args[1];
+            const operations = args[1].map((op) => {
+              if (!Array.isArray(op) || op.length < 2) return op;
+              const [opAction, opEntityType, ...opRest] = op;
+              if (opAction === "create") {
+                const stripped = this.stripFrameFields(opEntityType, opRest[0]);
+                return [opAction, opEntityType, stripped, ...opRest.slice(1)];
+              }
+              if (opAction === "update") {
+                const stripped = this.stripFrameFields(opEntityType, opRest[1]);
+                return [opAction, opEntityType, opRest[0], stripped, ...opRest.slice(2)];
+              }
+              return op;
+            });
             const batchSummary = await this.handlers.persist("batch", "", {
               operations
             });
@@ -1432,7 +1459,7 @@ var EffectExecutor = class _EffectExecutor {
             persistLog.debug("persist:emit-fired", { action, eventName: emitCfg?.success });
           } else {
             const entityType = args[1];
-            const data = args[2];
+            const data = action === "create" || action === "update" ? this.stripFrameFields(entityType, args[2]) : args[2];
             const persisted = await this.handlers.persist(action, entityType, data);
             if (persisted === void 0) {
               const attemptedId = typeof data === "string" ? data : data && typeof data === "object" ? data.id : void 0;
@@ -1697,15 +1724,7 @@ var EffectExecutor = class _EffectExecutor {
         break;
       }
       case "notify": {
-        if (this.handlers.notify) {
-          const message = args[0];
-          const type = args[1] || "info";
-          this.handlers.notify(message, type);
-        } else {
-          const category = typeof args[1] === "string" ? args[1] : "info";
-          const message = typeof args[0] === "string" ? args[0] : JSON.stringify(args[0] ?? null);
-          effectLog.info("notify", { category, message });
-        }
+        this.logUnsupported("notify");
         break;
       }
       // === Compound Effects ===
@@ -2476,14 +2495,18 @@ var MockPersistenceAdapter = class _MockPersistenceAdapter {
    * of nested-tree atoms (e.g. std-thread-comments-linear with ThreadPost.
    * replies → [ThreadPost]) render empty reply cards.
    *
-   * Cross-entity relations pick random IDs from the target store. A
-   * SELF-referential `one`-cardinality relation (a parent column like
-   * `Tag.parentId : Tag`) is linked deterministically instead: row 0 stays a
-   * root (`""`) and row *i* parents to row ⌊(i−1)/2⌋ — a proper forest with
-   * real roots and no cycles, so tree views and `parentId = ""` root fetches
-   * render sensibly. Self-referential `many` relations keep the 2–4 random
-   * sibling IDs (excluding self). The runtime caps recursion at depth=2 in
-   * `populateRelations`, so deep chains render two levels then stop.
+   * Cross-entity relations pick random IDs from the target store. EVERY
+   * self-referential relation, any cardinality, is linked deterministically
+   * instead via `@almadar/core/mock`'s `linkSelfRelationField`: row 0 stays a
+   * root (never referenced), row *i* parents to row ⌊(i−1)/2⌋ — one shared
+   * forest, real roots, no cycles. `one`/`many-to-one` self-relations (a
+   * parent column like `Tag.parentId : Tag`) store the scalar parent id;
+   * `many`/`one-to-many`/`many-to-many` self-relations (a children list like
+   * `ChatMessage.replies : [ChatMessage]`) store the forest's children-id
+   * list — no more random cross-linking, so the root row is never referenced
+   * and stays deletable under `onDelete: restrict`. The runtime caps
+   * recursion at depth=2 in `populateRelations`, so deep chains render two
+   * levels then stop.
    *
    * Entities sharing a collection are linked once per STORE, over the union
    * of their declared relation fields (first declarer of a field name wins).
@@ -2525,13 +2548,12 @@ var MockPersistenceAdapter = class _MockPersistenceAdapter {
         if (!targetStore || targetStore.size === 0) continue;
         const sameStore = targetStore === store;
         const cardinality = field.relation.cardinality ?? "many";
-        if (sameStore && (cardinality === "one" || cardinality === "many-to-one")) {
-          rows.forEach((row, i) => {
-            if (this.config.ownerId !== void 0 && row[field.name] === this.config.ownerId || stampedCellKeys.has(stampedCellKey(storeKey, row["id"], field.name))) {
-              return;
-            }
-            row[field.name] = i === 0 ? "" : rows[Math.floor((i - 1) / 2)]["id"];
-          });
+        if (sameStore) {
+          linkSelfRelationField(
+            rows,
+            { name: field.name, cardinality },
+            (row, i) => this.config.ownerId !== void 0 && row[field.name] === this.config.ownerId || stampedCellKeys.has(stampedCellKey(storeKey, row["id"], field.name))
+          );
           continue;
         }
         for (const row of rows) {
@@ -2539,11 +2561,7 @@ var MockPersistenceAdapter = class _MockPersistenceAdapter {
           if (this.config.ownerId !== void 0 && row[field.name] === this.config.ownerId || stampedCellKeys.has(stampedCellKey(storeKey, selfId, field.name))) {
             continue;
           }
-          let eligible = [];
-          for (const id of targetStore.keys()) {
-            if (sameStore && id === selfId) continue;
-            eligible.push(id);
-          }
+          let eligible = [...targetStore.keys()];
           if (isOwnerColumn && this.ownerCandidateGate) {
             const gate = this.ownerCandidateGate;
             eligible = eligible.filter(

package/dist/createOsHandlers.d.ts

@@ -1,4 +1,4 @@
-import { E as EffectHandlers } from './types-CWaIuEQn.js';
+import { E as EffectHandlers } from './types-BO4tbEPp.js';
 import { EventPayload } from '@almadar/core';
 
 /**

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { h as RuntimePatternValue, B as BindingContext, f as EvaluationContextExtensions, P as PatternProps, E as EffectHandlers, g as EffectContext, i as ExecutionEnvironment, j as EffectResult, T as TraitDefinition } from './types-CWaIuEQn.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-CWaIuEQn.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-BiEntWd-.js';
-export { C as CreateServerEffectHandlersOptions, E as EntitySharingMap, c as EventBus, d as EventNamespaceMap, e as InMemoryPersistence, f as LIFECYCLE_EVENTS, O as OrbitalEventRequest, g as OrbitalEventResponse, h as OrbitalServerRuntimeConfig, i as PreprocessOptions, j as PreprocessResult, k as PreprocessedSchema, l as ProcessEventOptions, R as RegisteredOrbital, m as RuntimeOrbital, n as RuntimeOrbitalSchema, o as RuntimeTrait, p as ServerEffectResult, q as StateMachineManager, r as collectDeclaredConfigDefaults, s as collectDeclaredEntityDefaults, t as createInitialTraitState, u as createServerEffectHandlers, v as findInitialState, w as findTransition, x as getIsolatedCollectionName, y as getNamespacedEvent, z as isBrowser, A as isElectron, B as isNamespacedEvent, D as isNode, F as normalizeEventKey, G as parseNamespacedEvent, H as preprocessSchema, J as processEvent } from './OrbitalServerRuntime-BiEntWd-.js';
+import { h as RuntimePatternValue, B as BindingContext, f as EvaluationContextExtensions, P as PatternProps, E as EffectHandlers, g as EffectContext, i as ExecutionEnvironment, j as EffectResult, T as TraitDefinition } from './types-BO4tbEPp.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-BO4tbEPp.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-Buvz7dd7.js';
+export { C as CreateServerEffectHandlersOptions, E as EntitySharingMap, c as EventBus, d as EventNamespaceMap, e as InMemoryPersistence, f as LIFECYCLE_EVENTS, O as OrbitalEventRequest, g as OrbitalEventResponse, h as OrbitalServerRuntimeConfig, i as PreprocessOptions, j as PreprocessResult, k as PreprocessedSchema, l as ProcessEventOptions, R as RegisteredOrbital, m as RuntimeOrbital, n as RuntimeOrbitalSchema, o as RuntimeTrait, p as ServerEffectResult, q as StateMachineManager, r as collectDeclaredConfigDefaults, s as collectDeclaredEntityDefaults, t as createInitialTraitState, u as createServerEffectHandlers, v as findInitialState, w as findTransition, x as getIsolatedCollectionName, y as getNamespacedEvent, z as isBrowser, A as isElectron, B as isNamespacedEvent, D as isNode, F as normalizeEventKey, G as parseNamespacedEvent, H as preprocessSchema, J as processEvent } from './OrbitalServerRuntime-Buvz7dd7.js';
 import { EvaluationContext, SExpressionEvaluator } from '@almadar/evaluator';
 export { EvaluationContext, createMinimalContext } from '@almadar/evaluator';
 import { RenderBindingMarker, SExpr, RuntimeValue, EventPayload, PatternConfig, EntityId, EntityField, EntityRow, EntityPersistence, PayloadField, OrbitalDefinition, OrbitalSchema } from '@almadar/core';
@@ -353,6 +353,16 @@ interface EffectExecutorOptions {
      * SSE-pushed props stay concrete.
      */
     deferRenderBindings?: boolean;
+    /**
+     * Names of an entity's `@intrinsic` fields — trait-owned view state
+     * (never a persisted column) — keyed by entity type. Supplied only by a
+     * caller holding the registered schema (`OrbitalServerRuntime`); the
+     * `persist` case uses it to strip those keys from a bare `@entity`
+     * binding before the write reaches the store. Absent means "no schema
+     * available" (e.g. a browser/offline-preview handler set), in which case
+     * persist writes verbatim exactly as before.
+     */
+    resolveIntrinsicFields?: (entityType: string) => readonly string[];
 }
 /**
  * EffectExecutor - Routes effects to handlers.
@@ -389,7 +399,19 @@ declare class EffectExecutor {
     private contextExtensions?;
     private evaluator?;
     private deferRenderBindings;
+    private resolveIntrinsicFields?;
     constructor(options: EffectExecutorOptions);
+    /**
+     * `@intrinsic` fields are NEVER a persisted column — strips them from
+     * `data` before a `persist create`/`persist update` write, regardless of
+     * what expression produced `data` (bare `@entity`, an explicit literal
+     * that names one, an `object/merge` result, …). Deterministic on the
+     * entity's declared schema, not on how the value was constructed. A
+     * no-op when no schema was supplied (`resolveIntrinsicFields` absent,
+     * e.g. a browser/offline-preview handler set) or the entity declares no
+     * intrinsic fields.
+     */
+    private stripFrameFields;
     private _evaluator?;
     private getEvaluator;
     /**
@@ -521,8 +543,6 @@ interface CreateClientEffectHandlersOptions {
     }, crumb?: string) => void;
     /** Navigate-back function: pop the orbital-scoped navigation stack. */
     navigateBack?: () => void;
-    /** Notify function for notification effects */
-    notify?: (message: string, type: 'success' | 'error' | 'warning' | 'info') => void;
     /**
      * Send-server handler for `send-server` effects.
      * When omitted, defaults to a lazy WebSocket transport connecting to the
@@ -542,7 +562,7 @@ interface CreateClientEffectHandlersOptions {
 /**
  * Create client-side effect handlers for trait state machine execution.
  *
- * Client handles: emit, renderUI, navigate, notify, sendServer
+ * Client handles: emit, renderUI, navigate, sendServer
  * Server handles: persist, set, callService (logged as warnings on client)
  *
  * @example
@@ -554,7 +574,6 @@ interface CreateClientEffectHandlersOptions {
  *     clearSlot: (slot) => pendingSlots.set(slot, []),
  *   },
  *   navigate: (path) => router.push(path),
- *   notify: (msg, type) => toast[type](msg),
  * });
  * ```
  */
@@ -747,14 +766,18 @@ declare class MockPersistenceAdapter implements PersistenceAdapter {
      * of nested-tree atoms (e.g. std-thread-comments-linear with ThreadPost.
      * replies → [ThreadPost]) render empty reply cards.
      *
-     * Cross-entity relations pick random IDs from the target store. A
-     * SELF-referential `one`-cardinality relation (a parent column like
-     * `Tag.parentId : Tag`) is linked deterministically instead: row 0 stays a
-     * root (`""`) and row *i* parents to row ⌊(i−1)/2⌋ — a proper forest with
-     * real roots and no cycles, so tree views and `parentId = ""` root fetches
-     * render sensibly. Self-referential `many` relations keep the 2–4 random
-     * sibling IDs (excluding self). The runtime caps recursion at depth=2 in
-     * `populateRelations`, so deep chains render two levels then stop.
+     * Cross-entity relations pick random IDs from the target store. EVERY
+     * self-referential relation, any cardinality, is linked deterministically
+     * instead via `@almadar/core/mock`'s `linkSelfRelationField`: row 0 stays a
+     * root (never referenced), row *i* parents to row ⌊(i−1)/2⌋ — one shared
+     * forest, real roots, no cycles. `one`/`many-to-one` self-relations (a
+     * parent column like `Tag.parentId : Tag`) store the scalar parent id;
+     * `many`/`one-to-many`/`many-to-many` self-relations (a children list like
+     * `ChatMessage.replies : [ChatMessage]`) store the forest's children-id
+     * list — no more random cross-linking, so the root row is never referenced
+     * and stays deletable under `onDelete: restrict`. The runtime caps
+     * recursion at depth=2 in `populateRelations`, so deep chains render two
+     * levels then stop.
      *
      * Entities sharing a collection are linked once per STORE, over the union
      * of their declared relation fields (first declarer of a field name wins).

package/dist/index.js

@@ -1,5 +1,5 @@
-import { EffectExecutor } from './chunk-QUW37QRQ.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-QUW37QRQ.js';
+import { EffectExecutor } from './chunk-CEYC3Z2O.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-CEYC3Z2O.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';
@@ -68,7 +68,7 @@ function sendServerEvent(orbital, event, payload) {
   }
 }
 function createClientEffectHandlers(options) {
-  const { eventBus, slotSetter, navigate, navigateBack, notify, sendServer, orbitalName = "" } = options;
+  const { eventBus, slotSetter, navigate, navigateBack, sendServer, orbitalName = "" } = options;
   return {
     emit: (event, payload) => {
       const prefixedEvent = event.startsWith("UI:") ? event : `UI:${event}`;
@@ -101,9 +101,6 @@ function createClientEffectHandlers(options) {
     navigateBack: navigateBack ?? (() => {
       log.warn("navigate-back-no-handler");
     }),
-    notify: notify ?? ((msg, type) => {
-      log.debug("notify", { type: type ?? null, message: msg });
-    }),
     sendServer: sendServer ?? ((event, payload) => {
       sendServerEvent(orbitalName, event, payload);
     }),

package/dist/{types-CWaIuEQn.d.ts → types-BO4tbEPp.d.ts}

@@ -240,8 +240,6 @@ interface EffectHandlers {
     /** Pop the orbital-scoped navigation stack and return to the previous
      * entry (client only). */
     navigateBack?: () => void;
-    /** Show a notification (client: toast, server: log) */
-    notify?: (message: string, type: 'success' | 'error' | 'warning' | 'info') => void;
     /** Log a message */
     log?: (message: string, level?: 'log' | 'warn' | 'error', data?: unknown) => void;
     /** Ref: declarative data subscription (server: same as fetch) */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@almadar/runtime",
-  "version": "6.74.0",
+  "version": "6.75.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.89.0",
+    "@almadar/core": "^10.90.0",
     "@almadar/evaluator": "^2.45.0",
     "@almadar/logger": "^1.12.0",
-    "@almadar/server": "^2.40.0",
-    "@almadar/std": "^16.210.0"
+    "@almadar/server": "^2.41.0",
+    "@almadar/std": "^16.211.0"
   },
   "peerDependencies": {
     "express": "^5.0.0"