@almadar/core 8.5.1 → 8.6.1

package/dist/{schema-Dp98Xt5i.d.ts → schema--EDm7mx5.d.ts}

@@ -1,5 +1,5 @@
 import { d as Expression, S as SExpr } from './expression-BVRFm0sV.js';
-import { bj as TraitConfig, bk as TraitConfigObject, aW as ServiceRef, y as Entity, B as EntityField, H as EntityPersistence, bx as TraitRef, R as EventPayloadField, n as ConfigFieldDeclaration, aS as ServiceDefinition, bg as Trait } from './trait-BV1DyJ2A.js';
+import { bj as TraitConfig, bk as TraitConfigObject, aW as ServiceRef, y as Entity, B as EntityField, H as EntityPersistence, bx as TraitRef, R as EventPayloadField, n as ConfigFieldDeclaration, aS as ServiceDefinition, bg as Trait } from './trait-D1kGh81D.js';
 import { z } from 'zod';
 
 /**

package/dist/{trait-BV1DyJ2A.d.ts → trait-D1kGh81D.d.ts}

@@ -96,42 +96,85 @@ declare const RelationConfigSchema: z.ZodEffects<z.ZodObject<{
 type FieldFormat = 'email' | 'url' | 'phone' | 'date' | 'datetime' | 'uuid';
 declare const FieldFormatSchema: z.ZodEnum<["email", "url", "phone", "date", "datetime", "uuid"]>;
 /**
- * Entity field definition.
+ * Field-type tags that don't carry a type-dependent payload. The base
+ * `EntityField` shape applies as-is.
  */
-interface EntityField {
+type ScalarFieldType = 'string' | 'number' | 'boolean' | 'date' | 'timestamp' | 'datetime' | 'object' | 'trait' | 'slot' | 'pattern';
+/** Fields shared across every variant. */
+interface EntityFieldBase {
     /**
      * Field name (camelCase). Optional for nested item/property descriptors
      * where the name is implied by the parent (`items`, `properties[k]`).
      * Mirrors Rust's `FieldDefinition.name: Option<String>`.
      */
     name?: string;
-    /** Data type */
-    type: FieldType;
     /** Whether the field is required */
     required?: boolean;
     /** Default value */
     default?: unknown;
-    /** Allowed values for enum types */
-    values?: string[];
-    /** @deprecated Use 'values' instead */
-    enum?: string[];
     /** Validation format */
     format?: FieldFormat;
     /** Minimum value (for number) or length (for string) */
     min?: number;
     /** Maximum value or length */
     max?: number;
-    /** Array item schema (for array type) */
-    items?: EntityField;
     /** Object property schemas keyed by property name (for object type).
      *  Mirrors Rust's `FieldDefinition.properties: Option<HashMap<String,
      *  FieldDefinition>>`. Populated by the lolo lowerer when a field /
      *  config slot's type expression resolves to a struct shape
      *  (`TypeExpr::Object`), including named-type aliases like `[MetricSpec]`. */
     properties?: Record<string, EntityField>;
-    /** Relation configuration (required when type is 'relation') */
-    relation?: RelationConfig;
 }
+/**
+ * Scalar / structural fields — no type-dependent payload required.
+ * `values?` is permitted as an OPTIONAL UI/validation hint (e.g. lolo's
+ * `'a' | 'b' | 'c'` string-union sugar lowers to `type: 'string', values:
+ * [...]`). Only `EnumEntityField` MANDATES values.
+ */
+interface ScalarEntityField extends EntityFieldBase {
+    type: ScalarFieldType;
+    /** Optional vocabulary hint for scalar fields (e.g. string unions
+     *  authored as `'a'|'b'|'c'` in lolo). Not required at this variant. */
+    values?: string[];
+}
+/** `type: 'enum'` REQUIRES the closed vocabulary in `values`. */
+interface EnumEntityField extends EntityFieldBase {
+    type: 'enum';
+    /** Closed string vocabulary the field accepts. */
+    values: string[];
+}
+/** `type: 'relation'` REQUIRES the relation target binding. */
+interface RelationEntityField extends EntityFieldBase {
+    type: 'relation';
+    /** Relation target binding (entity + cardinality). */
+    relation: RelationConfig;
+}
+/** `type: 'array'` REQUIRES the element schema in `items`. */
+interface ArrayEntityField extends EntityFieldBase {
+    type: 'array';
+    /** Element schema for the array. */
+    items: EntityField;
+}
+/**
+ * Entity field definition — discriminated union by `type`. Each variant
+ * statically enforces its dependent payload (`values` for enum,
+ * `relation` for relation, `items` for array) so TS / Zod / JSON Schema
+ * consumers all agree on the dependency, not just the Rust validator.
+ *
+ * @example
+ * { name: 'status', type: 'enum', values: ['draft', 'published'] }
+ * { name: 'authorId', type: 'relation', relation: { entity: 'User', cardinality: 'one' } }
+ * { name: 'tags', type: 'array', items: { type: 'string' } }
+ */
+type EntityField = ScalarEntityField | EnumEntityField | RelationEntityField | ArrayEntityField;
+/**
+ * Zod schema for `EntityField`. Preprocess normalizes:
+ *   - legacy `type` aliases (text → string, int → number, etc.)
+ *   - legacy `enum: string[]` alias → `values: string[]`
+ *
+ * Branches on `type` so TS narrows the parsed output to the matching
+ * discriminated-union variant.
+ */
 declare const EntityFieldSchema: z.ZodType<EntityField, z.ZodTypeDef, unknown>;
 type EntityFieldInput = z.input<typeof EntityFieldSchema>;
 /** Alias for EntityField - preferred name */

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
-import { a3 as OrbitalSchema, T as Orbital, aa as Page, u as DomainContext } from '../schema-Dp98Xt5i.js';
-export { A as AGENT_DOMAIN_CATEGORIES, a as ALLOWED_CUSTOM_COMPONENTS, b as AgentDomainCategory, c as AgentDomainCategorySchema, d as AllowedCustomComponent, C as ComputedEventContract, e as ComputedEventContractSchema, f as ComputedEventListener, g as ComputedEventListenerSchema, h as CustomPatternDefinition, i as CustomPatternDefinitionInput, j as CustomPatternDefinitionSchema, k as CustomPatternMap, l as CustomPatternMapInput, m as CustomPatternMapSchema, D as DesignPreferences, n as DesignPreferencesInput, o as DesignPreferencesSchema, p as DesignTokens, q as DesignTokensInput, r as DesignTokensSchema, s as DomainCategory, t as DomainCategorySchema, v as DomainContextInput, w as DomainContextSchema, x as DomainVocabulary, y as DomainVocabularySchema, E as EntityCall, z as EntityCallSchema, B as EntityRef, F as EntityRefSchema, G as EntityRefStringSchema, H as EntitySemanticRole, I as EntitySemanticRoleSchema, J as EventListener, K as EventListenerSchema, L as EventSemanticRole, M as EventSemanticRoleSchema, N as EventSource, O as EventSourceSchema, P as GameSubCategory, Q as GameSubCategorySchema, R as NodeClassification, S as NodeClassificationSchema, U as OrbitalConfig, V as OrbitalConfigInput, W as OrbitalConfigSchema, X as OrbitalDefinition, Y as OrbitalDefinitionSchema, Z as OrbitalInput, _ as OrbitalPage, $ as OrbitalPageInput, a0 as OrbitalPageSchema, a1 as OrbitalPageStrictInput, a2 as OrbitalPageStrictSchema, a5 as OrbitalSchemaInput, a6 as OrbitalSchemaSchema, a7 as OrbitalSchemaWithTraits, a8 as OrbitalUnit, a9 as OrbitalUnitSchema, a4 as OrbitalZodSchema, ab as PageRef, ac as PageRefObject, ad as PageRefObjectSchema, ae as PageRefSchema, af as PageRefStringSchema, ag as PageSchema, ah as PageTraitRef, ai as PageTraitRefSchema, aj as RelatedLink, ak as RelatedLinkSchema, al as StateSemanticRole, am as StateSemanticRoleSchema, an as SuggestedGuard, ao as SuggestedGuardSchema, ap as ThemeDefinition, aq as ThemeDefinitionSchema, ar as ThemeRef, as as ThemeRefSchema, at as ThemeRefStringSchema, au as ThemeTokens, av as ThemeTokensSchema, aw as ThemeVariant, ax as ThemeVariantSchema, ay as UXHints, az as UXHintsSchema, aA as UseDeclaration, aB as UseDeclarationSchema, aC as UserPersona, aD as UserPersonaInput, aE as UserPersonaSchema, aF as ViewType, aG as ViewTypeSchema, aH as isEntityCall, aI as isEntityReference, aJ as isEntityReferenceAny, aK as isImportedTraitRef, aL as isOrbitalDefinition, aM as isPageReference, aN as isPageReferenceObject, aO as isPageReferenceString, aP as isThemeReference, aQ as parseEntityRef, aR as parseImportedTraitRef, aS as parseOrbitalSchema, aT as parsePageRef, aU as safeParseOrbitalSchema } from '../schema-Dp98Xt5i.js';
-import { aU as ServiceParams, bg as Trait, y as Entity, L as EntityRow, a3 as FieldValue, D as DeclaredTraitConfig, bj as TraitConfig } from '../trait-BV1DyJ2A.js';
-export { A as AgentEffect, a as AnimationDef, b as AnimationDefInput, c as AnimationDefSchema, d as AssetMap, e as AssetMapInput, f as AssetMapSchema, g as AssetMapping, h as AssetMappingInput, i as AssetMappingSchema, j as AtomicEffect, C as CallServiceConfig, k as CallServiceEffect, l as CheckpointLoadEffect, m as CheckpointSaveEffect, n as ConfigFieldDeclaration, o as ConfigFieldDeclarationSchema, p as DeclaredTraitConfigSchema, q as DerefEffect, r as DespawnEffect, s as DoEffect, E as ENTITY_ROLES, t as Effect, u as EffectInput, v as EffectSchema, w as EmitConfig, x as EmitEffect, z as EntityData, B as EntityField, F as EntityFieldInput, G as EntityFieldSchema, H as EntityPersistence, I as EntityPersistenceSchema, J as EntityRole, K as EntityRoleSchema, M as EntitySchema, N as EvaluateConfig, O as EvaluateEffect, P as Event, Q as EventInput, R as EventPayloadField, S as EventPayloadFieldSchema, T as EventSchema, U as EventScope, V as EventScopeSchema, W as FetchEffect, X as FetchOptions, Y as FetchResult, Z as Field, _ as FieldFormat, $ as FieldFormatSchema, a0 as FieldSchema, a1 as FieldType, a2 as FieldTypeSchema, a4 as ForwardConfig, a5 as ForwardEffect, a6 as GAME_TYPES, a7 as GameType, a8 as GameTypeSchema, a9 as Guard, aa as GuardInput, ab as GuardSchema, ac as ListenSource, ad as ListenSourceSchema, ae as LogEffect, af as McpServiceDef, ag as McpServiceDefSchema, ah as NavigateEffect, ai as NnConfig, aj as NnLayer, ak as NotifyEffect, al as OrbitalEntity, am as OrbitalEntityInput, an as OrbitalEntitySchema, ao as OrbitalTraitRef, ap as OrbitalTraitRefSchema, aq as OsEffect, ar as PayloadField, as as PayloadFieldSchema, at as PersistData, au as PersistEffect, av as PersistEmitConfig, aw as PresentationType, ax as RefEffect, ay as RelationConfig, az as RelationConfigSchema, aA as RenderItemLambda, aB as RenderUIConfig, aC as RenderUIEffect, aD as RenderUINode, aE as RequiredField, aF as RequiredFieldSchema, aG as ResolvedAsset, aH as ResolvedAssetInput, aI as ResolvedAssetSchema, aJ as ResolvedPatternProps, aK as RestAuthConfig, aL as RestAuthConfigSchema, aM as RestServiceDef, aN as RestServiceDefSchema, aO as SERVICE_TYPES, aP as SemanticAssetRef, aQ as SemanticAssetRefInput, aR as SemanticAssetRefSchema, aS as ServiceDefinition, aT as ServiceDefinitionSchema, aV as ServiceParamsValue, aW as ServiceRef, aX as ServiceRefObject, aY as ServiceRefObjectSchema, aZ as ServiceRefSchema, a_ as ServiceRefStringSchema, a$ as ServiceType, b0 as ServiceTypeSchema, b1 as SetEffect, b2 as SocketEvents, b3 as SocketEventsSchema, b4 as SocketServiceDef, b5 as SocketServiceDefSchema, b6 as SpawnEffect, b7 as State, b8 as StateInput, b9 as StateMachine, ba as StateMachineInput, bb as StateMachineSchema, bc as StateSchema, bd as SwapEffect, be as TrainConfig, bf as TrainEffect, bh as TraitCategory, bi as TraitCategorySchema, bk as TraitConfigObject, bl as TraitConfigSchema, bm as TraitConfigValue, bn as TraitConfigValueSchema, bo as TraitDataEntity, bp as TraitDataEntitySchema, bq as TraitEntityField, br as TraitEntityFieldSchema, bs as TraitEventContract, bt as TraitEventContractSchema, bu as TraitEventListener, bv as TraitEventListenerSchema, bw as TraitInput, bx as TraitRef, by as TraitRefSchema, bz as TraitReference, bA as TraitReferenceInput, bB as TraitReferenceSchema, bC as TraitSchema, bD as TraitTick, bE as TraitTickSchema, bF as TraitUIBinding, bG as Transition, bH as TransitionInput, bI as TransitionSchema, bJ as TypedEffect, bK as UISlot, bL as UISlotSchema, bM as UI_SLOTS, bN as VISUAL_STYLES, bO as VisualStyle, bP as VisualStyleSchema, bQ as WatchEffect, bR as WatchOptions, bS as atomic, bT as callService, bU as createAssetKey, bV as deref, bW as deriveCollection, bX as despawn, bY as doEffects, bZ as emit, b_ as findService, b$ as getDefaultAnimationsForRole, c0 as getServiceNames, c1 as getTraitConfig, c2 as getTraitName, c3 as hasService, c4 as isCircuitEvent, c5 as isEffect, c6 as isInlineTrait, c7 as isMcpService, c8 as isRestService, c9 as isRuntimeEntity, ca as isSExprEffect, cb as isServiceReference, cc as isServiceReferenceObject, cd as isSingletonEntity, ce as isSocketService, cf as navigate, cg as normalizeTraitRef, ch as notify, ci as parseAssetKey, cj as parseServiceRef, ck as persist, cl as ref, cm as renderUI, cn as set, co as spawn, cp as swap, cq as validateAssetAnimations, cr as watch } from '../trait-BV1DyJ2A.js';
+import { a3 as OrbitalSchema, T as Orbital, aa as Page, u as DomainContext } from '../schema--EDm7mx5.js';
+export { A as AGENT_DOMAIN_CATEGORIES, a as ALLOWED_CUSTOM_COMPONENTS, b as AgentDomainCategory, c as AgentDomainCategorySchema, d as AllowedCustomComponent, C as ComputedEventContract, e as ComputedEventContractSchema, f as ComputedEventListener, g as ComputedEventListenerSchema, h as CustomPatternDefinition, i as CustomPatternDefinitionInput, j as CustomPatternDefinitionSchema, k as CustomPatternMap, l as CustomPatternMapInput, m as CustomPatternMapSchema, D as DesignPreferences, n as DesignPreferencesInput, o as DesignPreferencesSchema, p as DesignTokens, q as DesignTokensInput, r as DesignTokensSchema, s as DomainCategory, t as DomainCategorySchema, v as DomainContextInput, w as DomainContextSchema, x as DomainVocabulary, y as DomainVocabularySchema, E as EntityCall, z as EntityCallSchema, B as EntityRef, F as EntityRefSchema, G as EntityRefStringSchema, H as EntitySemanticRole, I as EntitySemanticRoleSchema, J as EventListener, K as EventListenerSchema, L as EventSemanticRole, M as EventSemanticRoleSchema, N as EventSource, O as EventSourceSchema, P as GameSubCategory, Q as GameSubCategorySchema, R as NodeClassification, S as NodeClassificationSchema, U as OrbitalConfig, V as OrbitalConfigInput, W as OrbitalConfigSchema, X as OrbitalDefinition, Y as OrbitalDefinitionSchema, Z as OrbitalInput, _ as OrbitalPage, $ as OrbitalPageInput, a0 as OrbitalPageSchema, a1 as OrbitalPageStrictInput, a2 as OrbitalPageStrictSchema, a5 as OrbitalSchemaInput, a6 as OrbitalSchemaSchema, a7 as OrbitalSchemaWithTraits, a8 as OrbitalUnit, a9 as OrbitalUnitSchema, a4 as OrbitalZodSchema, ab as PageRef, ac as PageRefObject, ad as PageRefObjectSchema, ae as PageRefSchema, af as PageRefStringSchema, ag as PageSchema, ah as PageTraitRef, ai as PageTraitRefSchema, aj as RelatedLink, ak as RelatedLinkSchema, al as StateSemanticRole, am as StateSemanticRoleSchema, an as SuggestedGuard, ao as SuggestedGuardSchema, ap as ThemeDefinition, aq as ThemeDefinitionSchema, ar as ThemeRef, as as ThemeRefSchema, at as ThemeRefStringSchema, au as ThemeTokens, av as ThemeTokensSchema, aw as ThemeVariant, ax as ThemeVariantSchema, ay as UXHints, az as UXHintsSchema, aA as UseDeclaration, aB as UseDeclarationSchema, aC as UserPersona, aD as UserPersonaInput, aE as UserPersonaSchema, aF as ViewType, aG as ViewTypeSchema, aH as isEntityCall, aI as isEntityReference, aJ as isEntityReferenceAny, aK as isImportedTraitRef, aL as isOrbitalDefinition, aM as isPageReference, aN as isPageReferenceObject, aO as isPageReferenceString, aP as isThemeReference, aQ as parseEntityRef, aR as parseImportedTraitRef, aS as parseOrbitalSchema, aT as parsePageRef, aU as safeParseOrbitalSchema } from '../schema--EDm7mx5.js';
+import { aU as ServiceParams, bg as Trait, y as Entity, L as EntityRow, a3 as FieldValue, D as DeclaredTraitConfig, bj as TraitConfig } from '../trait-D1kGh81D.js';
+export { A as AgentEffect, a as AnimationDef, b as AnimationDefInput, c as AnimationDefSchema, d as AssetMap, e as AssetMapInput, f as AssetMapSchema, g as AssetMapping, h as AssetMappingInput, i as AssetMappingSchema, j as AtomicEffect, C as CallServiceConfig, k as CallServiceEffect, l as CheckpointLoadEffect, m as CheckpointSaveEffect, n as ConfigFieldDeclaration, o as ConfigFieldDeclarationSchema, p as DeclaredTraitConfigSchema, q as DerefEffect, r as DespawnEffect, s as DoEffect, E as ENTITY_ROLES, t as Effect, u as EffectInput, v as EffectSchema, w as EmitConfig, x as EmitEffect, z as EntityData, B as EntityField, F as EntityFieldInput, G as EntityFieldSchema, H as EntityPersistence, I as EntityPersistenceSchema, J as EntityRole, K as EntityRoleSchema, M as EntitySchema, N as EvaluateConfig, O as EvaluateEffect, P as Event, Q as EventInput, R as EventPayloadField, S as EventPayloadFieldSchema, T as EventSchema, U as EventScope, V as EventScopeSchema, W as FetchEffect, X as FetchOptions, Y as FetchResult, Z as Field, _ as FieldFormat, $ as FieldFormatSchema, a0 as FieldSchema, a1 as FieldType, a2 as FieldTypeSchema, a4 as ForwardConfig, a5 as ForwardEffect, a6 as GAME_TYPES, a7 as GameType, a8 as GameTypeSchema, a9 as Guard, aa as GuardInput, ab as GuardSchema, ac as ListenSource, ad as ListenSourceSchema, ae as LogEffect, af as McpServiceDef, ag as McpServiceDefSchema, ah as NavigateEffect, ai as NnConfig, aj as NnLayer, ak as NotifyEffect, al as OrbitalEntity, am as OrbitalEntityInput, an as OrbitalEntitySchema, ao as OrbitalTraitRef, ap as OrbitalTraitRefSchema, aq as OsEffect, ar as PayloadField, as as PayloadFieldSchema, at as PersistData, au as PersistEffect, av as PersistEmitConfig, aw as PresentationType, ax as RefEffect, ay as RelationConfig, az as RelationConfigSchema, aA as RenderItemLambda, aB as RenderUIConfig, aC as RenderUIEffect, aD as RenderUINode, aE as RequiredField, aF as RequiredFieldSchema, aG as ResolvedAsset, aH as ResolvedAssetInput, aI as ResolvedAssetSchema, aJ as ResolvedPatternProps, aK as RestAuthConfig, aL as RestAuthConfigSchema, aM as RestServiceDef, aN as RestServiceDefSchema, aO as SERVICE_TYPES, aP as SemanticAssetRef, aQ as SemanticAssetRefInput, aR as SemanticAssetRefSchema, aS as ServiceDefinition, aT as ServiceDefinitionSchema, aV as ServiceParamsValue, aW as ServiceRef, aX as ServiceRefObject, aY as ServiceRefObjectSchema, aZ as ServiceRefSchema, a_ as ServiceRefStringSchema, a$ as ServiceType, b0 as ServiceTypeSchema, b1 as SetEffect, b2 as SocketEvents, b3 as SocketEventsSchema, b4 as SocketServiceDef, b5 as SocketServiceDefSchema, b6 as SpawnEffect, b7 as State, b8 as StateInput, b9 as StateMachine, ba as StateMachineInput, bb as StateMachineSchema, bc as StateSchema, bd as SwapEffect, be as TrainConfig, bf as TrainEffect, bh as TraitCategory, bi as TraitCategorySchema, bk as TraitConfigObject, bl as TraitConfigSchema, bm as TraitConfigValue, bn as TraitConfigValueSchema, bo as TraitDataEntity, bp as TraitDataEntitySchema, bq as TraitEntityField, br as TraitEntityFieldSchema, bs as TraitEventContract, bt as TraitEventContractSchema, bu as TraitEventListener, bv as TraitEventListenerSchema, bw as TraitInput, bx as TraitRef, by as TraitRefSchema, bz as TraitReference, bA as TraitReferenceInput, bB as TraitReferenceSchema, bC as TraitSchema, bD as TraitTick, bE as TraitTickSchema, bF as TraitUIBinding, bG as Transition, bH as TransitionInput, bI as TransitionSchema, bJ as TypedEffect, bK as UISlot, bL as UISlotSchema, bM as UI_SLOTS, bN as VISUAL_STYLES, bO as VisualStyle, bP as VisualStyleSchema, bQ as WatchEffect, bR as WatchOptions, bS as atomic, bT as callService, bU as createAssetKey, bV as deref, bW as deriveCollection, bX as despawn, bY as doEffects, bZ as emit, b_ as findService, b$ as getDefaultAnimationsForRole, c0 as getServiceNames, c1 as getTraitConfig, c2 as getTraitName, c3 as hasService, c4 as isCircuitEvent, c5 as isEffect, c6 as isInlineTrait, c7 as isMcpService, c8 as isRestService, c9 as isRuntimeEntity, ca as isSExprEffect, cb as isServiceReference, cc as isServiceReferenceObject, cd as isSingletonEntity, ce as isSocketService, cf as navigate, cg as normalizeTraitRef, ch as notify, ci as parseAssetKey, cj as parseServiceRef, ck as persist, cl as ref, cm as renderUI, cn as set, co as spawn, cp as swap, cq as validateAssetAnimations, cr as watch } from '../trait-D1kGh81D.js';
 import { c as EventPayloadValue, b as EventPayload, L as LogMeta, S as SExpr } from '../expression-BVRFm0sV.js';
 export { C as CORE_BINDINGS, a as CoreBinding, E as EvalContext, d as Expression, e as ExpressionInput, f as ExpressionSchema, P as ParsedBinding, g as SExprAtom, h as SExprAtomSchema, i as SExprInput, j as SExprSchema, k as collectBindings, l as getArgs, m as getOperator, n as isBinding, o as isSExpr, p as isSExprAtom, q as isSExprCall, r as isValidBinding, s as parseBinding, t as sexpr, w as walkSExpr } from '../expression-BVRFm0sV.js';
 import { z } from 'zod';

package/dist/types/index.js

@@ -57,58 +57,70 @@ var FIELD_TYPE_ALIASES = {
   float: "number",
   ts: "timestamp"
 };
-var EntityFieldSchema = z.lazy(
-  () => z.preprocess(
+var EntityFieldSchema = z.lazy(() => {
+  const baseFieldShape = {
+    name: z.string().min(1, "Field name is required").optional(),
+    required: z.boolean().optional(),
+    default: z.unknown().optional(),
+    format: FieldFormatSchema.optional(),
+    min: z.number().optional(),
+    max: z.number().optional(),
+    properties: z.record(EntityFieldSchema).optional()
+  };
+  function scalarVariant(t) {
+    return z.object({
+      ...baseFieldShape,
+      type: z.literal(t),
+      values: z.array(z.string()).optional()
+    });
+  }
+  return z.preprocess(
     (input) => {
-      if (input !== null && typeof input === "object" && "type" in input && typeof input.type === "string") {
-        const raw = input.type;
-        const canonical = FIELD_TYPE_ALIASES[raw];
-        if (canonical !== void 0) {
-          return { ...input, type: canonical };
-        }
+      if (input === null || typeof input !== "object" || !("type" in input) || typeof input.type !== "string") {
+        return input;
       }
-      return input;
+      const obj = input;
+      const next = { ...obj };
+      const aliased = FIELD_TYPE_ALIASES[obj.type];
+      if (aliased !== void 0) next["type"] = aliased;
+      if (next["enum"] !== void 0 && next["values"] === void 0) {
+        next["values"] = next["enum"];
+      }
+      delete next["enum"];
+      return next;
     },
-    z.object({
-      name: z.string().min(1, "Field name is required").optional(),
-      type: FieldTypeSchema,
-      required: z.boolean().optional(),
-      default: z.unknown().optional(),
-      values: z.array(z.string()).optional(),
-      enum: z.array(z.string()).optional(),
-      format: FieldFormatSchema.optional(),
-      min: z.number().optional(),
-      max: z.number().optional(),
-      items: EntityFieldSchema.optional(),
-      properties: z.record(EntityFieldSchema).optional(),
-      relation: RelationConfigSchema.optional()
-    }).refine(
-      (field) => field.type !== "relation" || field.relation !== void 0,
-      { message: 'Relation config is required when type is "relation"', path: ["relation"] }
-    ).refine(
-      // Enum fields must carry their allowed values. Without this refine,
-      // the type was lying about what's valid — bare `type: 'enum'` without
-      // `values` passed zod but failed `orb validate` downstream with
-      // ORB_E_EMPTY_ENUM_VALUES, stalling the agent pipeline for 20 minutes.
-      // `enum` is the legacy field-name alias; accept either.
-      (field) => {
-        if (field.type !== "enum") return true;
-        const vals = field.values ?? field.enum;
-        return Array.isArray(vals) && vals.length > 0;
-      },
-      { message: "Enum field requires a non-empty `values` array", path: ["values"] }
-    ).refine(
-      // Array fields must describe their element shape. Bare `type: 'array'`
-      // with no `items` forces downstream consumers (builders, UI renderers,
-      // persistence) to guess, so reject it at the schema boundary.
-      (field) => {
-        if (field.type !== "array") return true;
-        return field.items !== void 0;
-      },
-      { message: "Array field requires an `items` schema describing each element", path: ["items"] }
-    )
-  )
-);
+    z.discriminatedUnion("type", [
+      scalarVariant("string"),
+      scalarVariant("number"),
+      scalarVariant("boolean"),
+      scalarVariant("date"),
+      scalarVariant("timestamp"),
+      scalarVariant("datetime"),
+      scalarVariant("object"),
+      scalarVariant("trait"),
+      scalarVariant("slot"),
+      scalarVariant("pattern"),
+      // Enum variant — REQUIRES non-empty values.
+      z.object({
+        ...baseFieldShape,
+        type: z.literal("enum"),
+        values: z.array(z.string()).min(1, "Enum field requires a non-empty `values` array")
+      }),
+      // Relation variant — REQUIRES relation config.
+      z.object({
+        ...baseFieldShape,
+        type: z.literal("relation"),
+        relation: RelationConfigSchema
+      }),
+      // Array variant — REQUIRES items schema.
+      z.object({
+        ...baseFieldShape,
+        type: z.literal("array"),
+        items: EntityFieldSchema
+      })
+    ])
+  );
+});
 var FieldSchema = EntityFieldSchema;
 var ENTITY_ROLES = [
   "player",