@sharpee/world-model 3.0.0 → 3.3.0

package/world/WorldModel.js

@@ -2,37 +2,36 @@
 // WorldModel.ts - Core world model interface and implementation for Sharpee IF Platform
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorldModel = void 0;
-const if_entity_1 = require("../entities/if-entity");
-const entity_types_1 = require("../entities/entity-types");
-const wall_creation_1 = require("./wall-creation");
-const trait_types_1 = require("../traits/trait-types");
-const room_1 = require("../traits/room");
-const roomBehavior_1 = require("../traits/room/roomBehavior");
-const regionTrait_1 = require("../traits/region/regionTrait");
-const sceneTrait_1 = require("../traits/scene/sceneTrait");
-const door_1 = require("../traits/door");
-const scenery_1 = require("../traits/scenery");
-const default_trait_registry_1 = require("./default-trait-registry");
-const identityTrait_1 = require("../traits/identity/identityTrait");
-const openableTrait_1 = require("../traits/openable/openableTrait");
-const lockableTrait_1 = require("../traits/lockable/lockableTrait");
-const wearableTrait_1 = require("../traits/wearable/wearableTrait");
-const clothingTrait_1 = require("../traits/clothing/clothingTrait");
-const exitTrait_1 = require("../traits/exit/exitTrait");
-const directions_1 = require("../constants/directions");
-const SpatialIndex_1 = require("./SpatialIndex");
-const VisibilityBehavior_1 = require("./VisibilityBehavior");
-const WorldSerializer_1 = require("./WorldSerializer");
-const container_utils_1 = require("../traits/container/container-utils");
-const capability_binding_1 = require("../capabilities/capability-binding");
-const interceptor_binding_1 = require("../capabilities/interceptor-binding");
+const if_entity_js_1 = require("../entities/if-entity.js");
+const entity_types_js_1 = require("../entities/entity-types.js");
+const wall_creation_js_1 = require("./wall-creation.js");
+const trait_types_js_1 = require("../traits/trait-types.js");
+const index_js_1 = require("../traits/room/index.js");
+const roomBehavior_js_1 = require("../traits/room/roomBehavior.js");
+const regionTrait_js_1 = require("../traits/region/regionTrait.js");
+const sceneTrait_js_1 = require("../traits/scene/sceneTrait.js");
+const index_js_2 = require("../traits/door/index.js");
+const index_js_3 = require("../traits/scenery/index.js");
+const default_trait_registry_js_1 = require("./default-trait-registry.js");
+const identityTrait_js_1 = require("../traits/identity/identityTrait.js");
+const openableTrait_js_1 = require("../traits/openable/openableTrait.js");
+const lockableTrait_js_1 = require("../traits/lockable/lockableTrait.js");
+const wearableBehavior_js_1 = require("../traits/wearable/wearableBehavior.js");
+const exitTrait_js_1 = require("../traits/exit/exitTrait.js");
+const directions_js_1 = require("../constants/directions.js");
+const SpatialIndex_js_1 = require("./SpatialIndex.js");
+const VisibilityBehavior_js_1 = require("./VisibilityBehavior.js");
+const WorldSerializer_js_1 = require("./WorldSerializer.js");
+const container_utils_js_1 = require("../traits/container/container-utils.js");
+const capability_binding_js_1 = require("../capabilities/capability-binding.js");
+const interceptor_binding_js_1 = require("../capabilities/interceptor-binding.js");
 const if_domain_1 = require("@sharpee/if-domain");
-const scope_registry_1 = require("../scope/scope-registry");
-const scope_evaluator_1 = require("../scope/scope-evaluator");
+const scope_registry_js_1 = require("../scope/scope-registry.js");
+const scope_evaluator_js_1 = require("../scope/scope-evaluator.js");
 // Event system — extracted to WorldEventSystem.ts, re-exported for backward compat
-const WorldEventSystem_1 = require("./WorldEventSystem");
+const WorldEventSystem_js_1 = require("./WorldEventSystem.js");
 // Score Ledger (ADR-129)
-const ScoreLedger_1 = require("./ScoreLedger");
+const ScoreLedger_js_1 = require("./ScoreLedger.js");
 // Type prefixes for entity ID generation
 const TYPE_PREFIXES = {
     'room': 'r',
@@ -66,16 +65,22 @@ class WorldModel {
     // wiring re-established by story init, not save-game state). Distinct
     // from both maps above despite the shared "wiring" flavor.
     interceptorBindings = new Map();
+    /**
+     * ADR-240: the per-world evaluator registry — named world-evaluators
+     * consulted at point of use (live derived state; no cached derivations).
+     * Lives and dies with this WorldModel instance, like the binding maps.
+     */
+    evaluators = new Map();
     // Score Ledger (ADR-129)
-    scoreLedger = new ScoreLedger_1.ScoreLedger();
+    scoreLedger = new ScoreLedger_js_1.ScoreLedger();
     // Scene condition closures (ADR-149) — not serialized
     sceneConditions = new Map();
     // ID generation
     idCounters = new Map();
     // Event system (ADR-086, ADR-094) — delegates to WorldEventSystem
-    eventSystem = new WorldEventSystem_1.WorldEventSystem();
+    eventSystem = new WorldEventSystem_js_1.WorldEventSystem();
     // Persistence — delegates to WorldSerializer
-    serializer = new WorldSerializer_1.WorldSerializer();
+    serializer = new WorldSerializer_js_1.WorldSerializer();
     platformEvents;
     // Scope system
     scopeRegistry;
@@ -89,12 +94,12 @@ class WorldModel {
             strictMode: false,
             ...config
         };
-        this.spatialIndex = new SpatialIndex_1.SpatialIndex();
+        this.spatialIndex = new SpatialIndex_js_1.SpatialIndex();
         this.platformEvents = platformEvents;
         this.eventSystem.setWorldRef(this);
         // Initialize scope system
-        this.scopeRegistry = new scope_registry_1.ScopeRegistry();
-        this.scopeEvaluator = new scope_evaluator_1.RuleScopeEvaluator(this.scopeRegistry);
+        this.scopeRegistry = new scope_registry_js_1.ScopeRegistry();
+        this.scopeEvaluator = new scope_evaluator_js_1.RuleScopeEvaluator(this.scopeRegistry);
         // Initialize vocabulary system (ADR-082)
         this.grammarVocabularyProvider = new if_domain_1.GrammarVocabularyProvider();
         // Register default scope rules
@@ -195,7 +200,7 @@ class WorldModel {
     // Registration is idempotent: re-registering a (traitType, capability) key
     // overwrites the previous binding rather than throwing (AC-4).
     registerCapabilityBehavior(traitType, capability, behavior, options) {
-        const key = (0, capability_binding_1.capabilityBindingKey)(traitType, capability);
+        const key = (0, capability_binding_js_1.capabilityBindingKey)(traitType, capability);
         this.capabilityBindings.set(key, {
             traitType,
             capability,
@@ -206,8 +211,18 @@ class WorldModel {
             validateBinding: options?.validateBinding
         });
     }
+    // Evaluator Registry (ADR-240 — live derived state). Same ownership model
+    // as the binding maps above: per-world, idempotent last-wins, never
+    // serialized (registrars re-register on every load).
+    registerEvaluator(key, fn) {
+        this.evaluators.set(key, fn);
+    }
+    evaluate(key) {
+        const fn = this.evaluators.get(key);
+        return fn ? fn(this) : undefined;
+    }
     getBehaviorBinding(traitType, capability) {
-        return this.capabilityBindings.get((0, capability_binding_1.capabilityBindingKey)(traitType, capability));
+        return this.capabilityBindings.get((0, capability_binding_js_1.capabilityBindingKey)(traitType, capability));
     }
     getAllCapabilityBindings() {
         return this.capabilityBindings;
@@ -234,7 +249,7 @@ class WorldModel {
     // Registration is idempotent: re-registering a (traitType, actionId) key
     // overwrites the previous binding rather than throwing (AC-4).
     registerActionInterceptor(traitType, actionId, interceptor, options) {
-        const key = (0, interceptor_binding_1.interceptorBindingKey)(traitType, actionId);
+        const key = (0, interceptor_binding_js_1.interceptorBindingKey)(traitType, actionId);
         this.interceptorBindings.set(key, {
             traitType,
             actionId,
@@ -248,7 +263,7 @@ class WorldModel {
         // a static constructor property across module copies).
         const candidates = [];
         for (const trait of entity.traits.values()) {
-            const binding = this.interceptorBindings.get((0, interceptor_binding_1.interceptorBindingKey)(trait.type, actionId));
+            const binding = this.interceptorBindings.get((0, interceptor_binding_js_1.interceptorBindingKey)(trait.type, actionId));
             if (binding) {
                 candidates.push({ trait, binding });
             }
@@ -268,7 +283,7 @@ class WorldModel {
         };
     }
     getInterceptorBinding(traitType, actionId) {
-        return this.interceptorBindings.get((0, interceptor_binding_1.interceptorBindingKey)(traitType, actionId));
+        return this.interceptorBindings.get((0, interceptor_binding_js_1.interceptorBindingKey)(traitType, actionId));
     }
     getAllActionInterceptors() {
         return this.interceptorBindings;
@@ -291,12 +306,12 @@ class WorldModel {
     // Entity Management
     createEntity(displayName, type = 'object', opts) {
         // Validate entity type
-        if (!(0, entity_types_1.isEntityType)(type)) {
-            throw new Error(`Unknown entity type: '${type}'. Valid types are: ${Object.values(entity_types_1.EntityType).join(', ')}`);
+        if (!(0, entity_types_js_1.isEntityType)(type)) {
+            throw new Error(`Unknown entity type: '${type}'. Valid types are: ${Object.values(entity_types_js_1.EntityType).join(', ')}`);
         }
         // Generate ID based on type
         const id = this.generateId(type);
-        const entity = new if_entity_1.IFEntity(id, type, {
+        const entity = new if_entity_js_1.IFEntity(id, type, {
             attributes: {
                 displayName: displayName,
                 name: displayName, // For compatibility
@@ -309,7 +324,7 @@ class WorldModel {
         // unless the caller opts out. Each factory yields a fresh instance; an author can
         // override later via add() (replace-on-same-type).
         if (opts?.defaultTraits !== false) {
-            const factories = default_trait_registry_1.DEFAULT_TRAITS.get(type);
+            const factories = default_trait_registry_js_1.DEFAULT_TRAITS.get(type);
             if (factories) {
                 for (const factory of factories) {
                     entity.add(factory());
@@ -397,22 +412,25 @@ class WorldModel {
         if (options.visibleOnly) {
             // Filter to only visible entities
             entities = entities.filter(e => {
-                const scenery = e.getTrait(scenery_1.SceneryTrait);
+                const scenery = e.getTrait(index_js_3.SceneryTrait);
                 return !scenery || scenery.visible !== false;
             });
         }
-        if (!options.includeWorn) {
-            // Filter out worn items (check both WEARABLE and CLOTHING traits)
-            entities = entities.filter(e => {
-                const wearable = e.getTrait(wearableTrait_1.WearableTrait);
-                const clothing = e.getTrait(clothingTrait_1.ClothingTrait);
-                const wornFromWearable = wearable && wearable.isWorn;
-                const wornFromClothing = clothing && clothing.isWorn;
-                return !(wornFromWearable || wornFromClothing);
-            });
-        }
+        // ADR-247: worn items are contents — returned unconditionally. Callers
+        // needing the carried/worn split use getCarriedAndWorn(), not a filter.
         return entities;
     }
+    getCarriedAndWorn(holderId) {
+        // ADR-247: the one partition method. `carried` is held-not-worn (the
+        // old filtered-default semantics); `worn` is the worn subset. For a
+        // holder with no wearables, `worn` is empty.
+        const carried = [];
+        const worn = [];
+        for (const e of this.getContents(holderId)) {
+            (wearableBehavior_js_1.WearableBehavior.isWorn(e) ? worn : carried).push(e);
+        }
+        return { carried, worn };
+    }
     moveEntity(entityId, targetId) {
         if (!this.canMoveEntity(entityId, targetId)) {
             this.emitPlatformEvent('move_entity_failed', {
@@ -454,12 +472,12 @@ class WorldModel {
             return false;
         }
         // Check if target can contain - using our new utility
-        if (!(0, container_utils_1.canContain)(target)) {
+        if (!(0, container_utils_js_1.canContain)(target)) {
             return false;
         }
         // Check container constraints
-        if (target.hasTrait(trait_types_1.TraitType.CONTAINER) && target.hasTrait(trait_types_1.TraitType.OPENABLE)) {
-            const openable = target.getTrait(openableTrait_1.OpenableTrait);
+        if (target.hasTrait(trait_types_js_1.TraitType.CONTAINER) && target.hasTrait(trait_types_js_1.TraitType.OPENABLE)) {
+            const openable = target.getTrait(openableTrait_js_1.OpenableTrait);
             if (openable && !openable.isOpen) {
                 return false;
             }
@@ -474,7 +492,7 @@ class WorldModel {
             if (!parent)
                 return undefined;
             const parentEntity = this.getEntity(parent);
-            if (parentEntity?.hasTrait(trait_types_1.TraitType.ROOM)) {
+            if (parentEntity?.hasTrait(trait_types_js_1.TraitType.ROOM)) {
                 return parentEntity;
             }
             current = parent;
@@ -489,16 +507,9 @@ class WorldModel {
             if (visited.has(id) || depth > this.config.maxDepth)
                 return;
             visited.add(id);
-            // For the root entity, use the provided options
-            // For recursive calls, always include worn items to get complete contents
-            const contentsOptions = isRoot ? {
-                visibleOnly: options.visibleOnly,
-                includeWorn: options.includeWorn
-            } : {
-                visibleOnly: options.visibleOnly,
-                includeWorn: true // Always include worn items when recursing
-            };
-            const contents = this.getContents(id, contentsOptions);
+            // ADR-247: worn items are always included now, so root and recursive
+            // calls share one options shape (visibleOnly still varies by caller).
+            const contents = this.getContents(id, { visibleOnly: options.visibleOnly });
             result.push(...contents);
             if (options.recursive) {
                 contents.forEach(item => traverse(item.id, depth + 1, false));
@@ -617,7 +628,7 @@ class WorldModel {
             return [];
         const fromRoom = this.getEntity(fromRoomId);
         const toRoom = this.getEntity(toRoomId);
-        if (!fromRoom?.hasTrait(trait_types_1.TraitType.ROOM) || !toRoom?.hasTrait(trait_types_1.TraitType.ROOM)) {
+        if (!fromRoom?.hasTrait(trait_types_js_1.TraitType.ROOM) || !toRoom?.hasTrait(trait_types_js_1.TraitType.ROOM)) {
             return null;
         }
         // Simple BFS pathfinding
@@ -632,7 +643,7 @@ class WorldModel {
             const room = this.getEntity(roomId);
             if (!room)
                 continue;
-            const roomTrait = room.getTrait(room_1.RoomTrait);
+            const roomTrait = room.getTrait(index_js_1.RoomTrait);
             const exits = roomTrait?.exits || {};
             for (const [direction, exitInfo] of Object.entries(exits)) {
                 let targetRoom;
@@ -651,12 +662,12 @@ class WorldModel {
                             continue;
                         pathElement = exitInfo.via;
                         // Get destination based on entity type
-                        if (exitEntity.hasTrait(trait_types_1.TraitType.DOOR)) {
-                            const door = exitEntity.getTrait(door_1.DoorTrait);
+                        if (exitEntity.hasTrait(trait_types_js_1.TraitType.DOOR)) {
+                            const door = exitEntity.getTrait(index_js_2.DoorTrait);
                             targetRoom = door?.room1 === roomId ? door?.room2 : door?.room1;
                         }
-                        else if (exitEntity.hasTrait(trait_types_1.TraitType.EXIT)) {
-                            targetRoom = exitEntity.getTrait(exitTrait_1.ExitTrait)?.to;
+                        else if (exitEntity.hasTrait(trait_types_js_1.TraitType.EXIT)) {
+                            targetRoom = exitEntity.getTrait(exitTrait_js_1.ExitTrait)?.to;
                         }
                         else {
                             // Not a valid door/exit entity
@@ -901,6 +912,22 @@ class WorldModel {
             priority: 100,
             source: 'core'
         });
+        // A door is present at BOTH of its rooms (ADR-234 AC-3; David's ruling
+        // 2026-07-18): referenceable from either side. Only the door enters
+        // scope this way — the far room and its contents never do.
+        this.addScopeRule({
+            id: 'default_door_visibility',
+            fromLocations: '*',
+            includeEntities: (context) => this.findByTrait(trait_types_js_1.TraitType.DOOR)
+                .filter((door) => {
+                const doorTrait = door.get(trait_types_js_1.TraitType.DOOR);
+                return doorTrait !== undefined
+                    && (doorTrait.room1 === context.currentLocation || doorTrait.room2 === context.currentLocation);
+            })
+                .map((door) => door.id),
+            priority: 50,
+            source: 'core'
+        });
     }
     /**
      * Get physically visible entities using VisibilityBehavior (line-of-sight)
@@ -922,7 +949,7 @@ class WorldModel {
         const observer = this.getEntity(observerId);
         if (!observer)
             return [];
-        return VisibilityBehavior_1.VisibilityBehavior.getVisible(observer, this);
+        return VisibilityBehavior_js_1.VisibilityBehavior.getVisible(observer, this);
     }
     /**
      * Get entities in scope for command resolution using the scope system
@@ -965,22 +992,49 @@ class WorldModel {
         const target = this.getEntity(targetId);
         if (!observer || !target)
             return false;
-        return VisibilityBehavior_1.VisibilityBehavior.canSee(observer, target, this);
+        return VisibilityBehavior_js_1.VisibilityBehavior.canSee(observer, target, this);
     }
     // ========== Convenience Creators ==========
     /**
      * Create a bidirectional connection between two rooms.
      * Sets exits in both directions (e.g. NORTH on room1, SOUTH on room2).
+     *
+     * With `doorId` (ADR-237 D4) this is the platform's one door-wiring
+     * implementation: the door id is stamped on both exits (`via`) and the
+     * door entity is placed in room1 for scope resolution. Throws if the id
+     * resolves to no entity or to an entity without DoorTrait, or if the
+     * trait's room pair disagrees with the rooms passed — the primitive owns
+     * the invariant that DoorTrait and the exits never disagree.
      */
-    connectRooms(room1Id, room2Id, direction) {
+    connectRooms(room1Id, room2Id, direction, doorId) {
         const room1 = this.getEntity(room1Id);
         const room2 = this.getEntity(room2Id);
         if (!room1 || !room2) {
             throw new Error(`connectRooms: both rooms must exist (${room1Id}, ${room2Id})`);
         }
-        const opposite = (0, directions_1.getOppositeDirection)(direction);
-        roomBehavior_1.RoomBehavior.setExit(room1, direction, room2Id);
-        roomBehavior_1.RoomBehavior.setExit(room2, opposite, room1Id);
+        const opposite = (0, directions_js_1.getOppositeDirection)(direction);
+        if (doorId === undefined) {
+            roomBehavior_js_1.RoomBehavior.setExit(room1, direction, room2Id);
+            roomBehavior_js_1.RoomBehavior.setExit(room2, opposite, room1Id);
+            return;
+        }
+        const door = this.getEntity(doorId);
+        if (!door) {
+            throw new Error(`connectRooms: door must exist (${doorId})`);
+        }
+        const doorTrait = door.get(trait_types_js_1.TraitType.DOOR);
+        if (!doorTrait) {
+            throw new Error(`connectRooms: \`${doorId}\` has no DoorTrait — compose the trait before wiring`);
+        }
+        // DoorTrait's constructor requires both rooms, so the pair is always
+        // pre-set: verify it names the rooms being wired (room1 = placement).
+        if (doorTrait.room1 !== room1Id || doorTrait.room2 !== room2Id) {
+            throw new Error(`connectRooms: DoorTrait on \`${doorId}\` connects (${doorTrait.room1}, ${doorTrait.room2}), not (${room1Id}, ${room2Id})`);
+        }
+        roomBehavior_js_1.RoomBehavior.setExit(room1, direction, room2Id, doorId);
+        roomBehavior_js_1.RoomBehavior.setExit(room2, opposite, room1Id, doorId);
+        // Place door in room1 for scope resolution
+        this.moveEntity(doorId, room1Id);
     }
     /**
      * Create a door entity and wire it into both rooms' exit data.
@@ -992,30 +1046,26 @@ class WorldModel {
         if (!room1 || !room2) {
             throw new Error(`createDoor: both rooms must exist (${opts.room1Id}, ${opts.room2Id})`);
         }
-        const door = this.createEntity(displayName, entity_types_1.EntityType.DOOR);
-        door.add(new identityTrait_1.IdentityTrait({
+        const door = this.createEntity(displayName, entity_types_js_1.EntityType.DOOR);
+        door.add(new identityTrait_js_1.IdentityTrait({
             name: displayName,
             aliases: opts.aliases,
             description: opts.description,
         }));
-        door.add(new door_1.DoorTrait({
+        door.add(new index_js_2.DoorTrait({
             room1: opts.room1Id,
             room2: opts.room2Id,
         }));
-        door.add(new scenery_1.SceneryTrait());
-        door.add(new openableTrait_1.OpenableTrait({ isOpen: opts.isOpen ?? false }));
+        door.add(new index_js_3.SceneryTrait());
+        door.add(new openableTrait_js_1.OpenableTrait({ isOpen: opts.isOpen ?? false }));
         if (opts.isLocked !== undefined || opts.keyId) {
-            door.add(new lockableTrait_1.LockableTrait({
+            door.add(new lockableTrait_js_1.LockableTrait({
                 isLocked: opts.isLocked ?? true,
-                ...(opts.keyId ? { requiredKey: opts.keyId } : {}),
+                ...(opts.keyId ? { keyId: opts.keyId } : {}),
             }));
         }
-        // Wire exits through the door
-        const opposite = (0, directions_1.getOppositeDirection)(opts.direction);
-        roomBehavior_1.RoomBehavior.setExit(room1, opts.direction, opts.room2Id, door.id);
-        roomBehavior_1.RoomBehavior.setExit(room2, opposite, opts.room1Id, door.id);
-        // Place door in room1 for scope resolution
-        this.moveEntity(door.id, opts.room1Id);
+        // One wiring path (ADR-237 D4)
+        this.connectRooms(opts.room1Id, opts.room2Id, opts.direction, door.id);
         return door;
     }
     // ── Wall Adjacency (ADR-173) ─────────────────────────────────────
@@ -1028,7 +1078,7 @@ class WorldModel {
      * @throws Error on any validation failure (per ADR-173 §"Rejection rules").
      */
     createWall(spec) {
-        return (0, wall_creation_1.createWall)(this.wallCreationSurface(), spec);
+        return (0, wall_creation_js_1.createWall)(this.wallCreationSurface(), spec);
     }
     /**
      * Creates N walls between `from` and each room in `to` (ADR-173
@@ -1036,7 +1086,7 @@ class WorldModel {
      * on the K-th pair leaves walls 0..K-1 in the world.
      */
     createWalls(spec) {
-        return (0, wall_creation_1.createWalls)(this.wallCreationSurface(), spec);
+        return (0, wall_creation_js_1.createWalls)(this.wallCreationSurface(), spec);
     }
     /**
      * Adapter exposing the narrow surface `wall-creation` requires
@@ -1046,7 +1096,7 @@ class WorldModel {
         return {
             getEntity: (id) => this.getEntity(id),
             getLocation: (entityId) => this.getLocation(entityId),
-            generateWallId: () => this.generateId(entity_types_1.EntityType.WALL),
+            generateWallId: () => this.generateId(entity_types_js_1.EntityType.WALL),
             registerWall: (wall) => {
                 this.entities.set(wall.id, wall);
             },
@@ -1068,14 +1118,14 @@ class WorldModel {
         if (options.parentRegionId && !this.hasEntity(options.parentRegionId)) {
             throw new Error(`createRegion: parent region '${options.parentRegionId}' not found`);
         }
-        const entity = new if_entity_1.IFEntity(id, entity_types_1.EntityType.REGION, {
+        const entity = new if_entity_js_1.IFEntity(id, entity_types_js_1.EntityType.REGION, {
             attributes: {
                 displayName: options.name,
                 name: options.name,
-                entityType: entity_types_1.EntityType.REGION,
+                entityType: entity_types_js_1.EntityType.REGION,
             },
         });
-        entity.add(new regionTrait_1.RegionTrait(options));
+        entity.add(new regionTrait_js_1.RegionTrait(options));
         this.entities.set(id, entity);
         return entity;
     }
@@ -1091,7 +1141,7 @@ class WorldModel {
         if (!room) {
             throw new Error(`assignRoom: room '${roomId}' not found`);
         }
-        const roomTrait = room.get(trait_types_1.TraitType.ROOM);
+        const roomTrait = room.get(trait_types_js_1.TraitType.ROOM);
         if (!roomTrait) {
             throw new Error(`assignRoom: entity '${roomId}' does not have RoomTrait`);
         }
@@ -1099,7 +1149,7 @@ class WorldModel {
         if (!region) {
             throw new Error(`assignRoom: region '${regionId}' not found`);
         }
-        if (!region.hasTrait(trait_types_1.TraitType.REGION)) {
+        if (!region.hasTrait(trait_types_js_1.TraitType.REGION)) {
             throw new Error(`assignRoom: entity '${regionId}' is not a region`);
         }
         roomTrait.regionId = regionId;
@@ -1120,14 +1170,14 @@ class WorldModel {
         // If the entity is a room, use its regionId directly.
         // Otherwise, resolve the containing room.
         let roomRegionId;
-        if (entity.type === entity_types_1.EntityType.ROOM) {
-            roomRegionId = entity.get(trait_types_1.TraitType.ROOM)?.regionId;
+        if (entity.type === entity_types_js_1.EntityType.ROOM) {
+            roomRegionId = entity.get(trait_types_js_1.TraitType.ROOM)?.regionId;
         }
         else {
             const room = this.getContainingRoom(entityId);
             if (!room)
                 return false;
-            roomRegionId = room.get(trait_types_1.TraitType.ROOM)?.regionId;
+            roomRegionId = room.get(trait_types_js_1.TraitType.ROOM)?.regionId;
         }
         if (!roomRegionId)
             return false;
@@ -1146,10 +1196,10 @@ class WorldModel {
         const fromRoom = this.getEntity(fromRoomId);
         const toRoom = this.getEntity(toRoomId);
         const fromChain = fromRoom
-            ? this.getRegionAncestry(fromRoom.get(trait_types_1.TraitType.ROOM)?.regionId)
+            ? this.getRegionAncestry(fromRoom.get(trait_types_js_1.TraitType.ROOM)?.regionId)
             : [];
         const toChain = toRoom
-            ? this.getRegionAncestry(toRoom.get(trait_types_1.TraitType.ROOM)?.regionId)
+            ? this.getRegionAncestry(toRoom.get(trait_types_js_1.TraitType.ROOM)?.regionId)
             : [];
         // Convert to sets for fast lookup
         const fromSet = new Set(fromChain);
@@ -1176,7 +1226,7 @@ class WorldModel {
             const region = this.getEntity(currentId);
             if (!region)
                 break;
-            const trait = region.get(trait_types_1.TraitType.REGION);
+            const trait = region.get(trait_types_js_1.TraitType.REGION);
             if (!trait)
                 break;
             chain.push(currentId);
@@ -1199,7 +1249,7 @@ class WorldModel {
             const region = this.getEntity(currentId);
             if (!region)
                 return false;
-            const trait = region.get(trait_types_1.TraitType.REGION);
+            const trait = region.get(trait_types_js_1.TraitType.REGION);
             if (!trait)
                 return false;
             currentId = trait.parentRegionId;
@@ -1218,14 +1268,14 @@ class WorldModel {
         if (this.hasEntity(id)) {
             throw new Error(`createScene: entity '${id}' already exists`);
         }
-        const entity = new if_entity_1.IFEntity(id, entity_types_1.EntityType.SCENE, {
+        const entity = new if_entity_js_1.IFEntity(id, entity_types_js_1.EntityType.SCENE, {
             attributes: {
                 displayName: options.name,
                 name: options.name,
-                entityType: entity_types_1.EntityType.SCENE,
+                entityType: entity_types_js_1.EntityType.SCENE,
             },
         });
-        entity.add(new sceneTrait_1.SceneTrait({
+        entity.add(new sceneTrait_js_1.SceneTrait({
             name: options.name,
             recurring: options.recurring,
         }));
@@ -1267,7 +1317,7 @@ class WorldModel {
         const entity = this.getEntity(sceneId);
         if (!entity)
             return false;
-        return entity.get(trait_types_1.TraitType.SCENE)?.state === 'active';
+        return entity.get(trait_types_js_1.TraitType.SCENE)?.state === 'active';
     }
     /**
      * Returns true if the scene has reached the 'ended' state.
@@ -1280,7 +1330,7 @@ class WorldModel {
         const entity = this.getEntity(sceneId);
         if (!entity)
             return false;
-        return entity.get(trait_types_1.TraitType.SCENE)?.state === 'ended';
+        return entity.get(trait_types_js_1.TraitType.SCENE)?.state === 'ended';
     }
     /**
      * Returns true if the scene has ever been active (beganAtTurn is set).
@@ -1291,7 +1341,7 @@ class WorldModel {
         const entity = this.getEntity(sceneId);
         if (!entity)
             return false;
-        return entity.get(trait_types_1.TraitType.SCENE)?.beganAtTurn !== undefined;
+        return entity.get(trait_types_js_1.TraitType.SCENE)?.beganAtTurn !== undefined;
     }
 }
 exports.WorldModel = WorldModel;