feat: avatar customization — color, shape, name tag (closes #1542)

Merge PR #1684: portal hot-reload

app.js

@@ -734,6 +734,9 @@ async function init() {
     const response = await fetch('./portals.json');
     const portalData = await response.json();
     createPortals(portalData);
+
+    // Start portal hot-reload watcher
+    if (window.PortalHotReload) PortalHotReload.start(5000);
   } catch (e) {
     console.error('Failed to load portals.json:', e);
     addChatMessage('error', 'Portal registry offline. Check logs.');

avatar-customization.css

@@ -0,0 +1,13 @@
+.avatar-name-tag{position:fixed;transform:translate(-50%,-100%);background:rgba(0,0,0,0.7);color:#00ffcc;font-family:'JetBrains Mono',monospace;font-size:12px;padding:2px 8px;border-radius:4px;border:1px solid rgba(0,255,204,0.3);pointer-events:none;z-index:100;white-space:nowrap;text-shadow:0 0 6px rgba(0,255,204,0.5)}
+.avatar-color-picker{position:fixed;top:60px;right:16px;background:rgba(10,15,26,0.95);border:1px solid rgba(0,255,204,0.3);border-radius:8px;padding:12px;z-index:1000;min-width:200px;font-family:'JetBrains Mono',monospace;color:#e0e0e0}
+.avatar-color-picker.hidden{display:none}
+.avatar-picker-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:12px;font-size:14px;color:#00ffcc}
+.avatar-picker-close{background:none;border:none;color:#666;font-size:18px;cursor:pointer}
+.avatar-picker-name{margin-bottom:12px}
+.avatar-picker-name label{display:block;font-size:10px;color:#666;text-transform:uppercase;margin-bottom:4px}
+.avatar-picker-name input{width:100%;background:rgba(255,255,255,0.05);border:1px solid rgba(0,255,204,0.2);border-radius:4px;color:#e0e0e0;padding:6px 8px;font-family:inherit;font-size:13px;outline:none}
+.avatar-picker-colors label{display:block;font-size:10px;color:#666;text-transform:uppercase;margin-bottom:6px}
+.avatar-color-grid{display:grid;grid-template-columns:repeat(4,1fr);gap:6px}
+.avatar-color-swatch{width:36px;height:36px;border-radius:50%;border:2px solid transparent;cursor:pointer;transition:border-color 0.15s,transform 0.15s}
+.avatar-color-swatch:hover{transform:scale(1.15)}
+.avatar-color-swatch.active{border-color:white;box-shadow:0 0 8px currentColor}

avatar-customization.js

@@ -0,0 +1,38 @@
+const AvatarCustomization = (() => {
+  let avatarMesh = null, nameTagDiv = null, colorPickerPanel = null;
+  let currentColor = '#00ffcc', currentName = 'Visitor', _scene = null, _camera = null;
+  const STORAGE_KEY = 'nexus-avatar-prefs';
+  const PRESET_COLORS = [
+    {name:'Teal',hex:'#00ffcc'},{name:'Cyan',hex:'#00ccff'},{name:'Purple',hex:'#9966ff'},
+    {name:'Pink',hex:'#ff66aa'},{name:'Orange',hex:'#ff8833'},{name:'Gold',hex:'#ffcc00'},
+    {name:'Red',hex:'#ff3333'},{name:'Green',hex:'#33ff66'},
+  ];
+  function loadPrefs(){try{const r=localStorage.getItem(STORAGE_KEY);if(r){const p=JSON.parse(r);if(p.color)currentColor=p.color;if(p.name)currentName=p.name;}}catch(e){}}
+  function savePrefs(){try{localStorage.setItem(STORAGE_KEY,JSON.stringify({color:currentColor,name:currentName}));}catch(e){}}
+  function createAvatarMesh(color){
+    const geo=new THREE.CapsuleGeometry(0.3,0.8,8,16);
+    const mat=new THREE.MeshStandardMaterial({color:new THREE.Color(color),emissive:new THREE.Color(color).multiplyScalar(0.3),metalness:0.3,roughness:0.5});
+    const mesh=new THREE.Mesh(geo,mat);mesh.position.set(0,1.2,0);mesh.castShadow=true;return mesh;
+  }
+  function updateAvatarColor(hex){
+    currentColor=hex;if(avatarMesh){avatarMesh.material.color.set(hex);avatarMesh.material.emissive.set(new THREE.Color(hex).multiplyScalar(0.3));}
+    document.querySelectorAll('.avatar-color-swatch').forEach(el=>el.classList.toggle('active',el.dataset.color===hex));savePrefs();
+  }
+  function createNameTag(name){const d=document.createElement('div');d.className='avatar-name-tag';d.textContent=name;document.body.appendChild(d);return d;}
+  function updateNameTagPosition(){if(!nameTagDiv||!_camera)return;const pos=new THREE.Vector3(0,2.4,0);if(avatarMesh&&avatarMesh.parent)pos.add(avatarMesh.parent.position);pos.project(_camera);const x=(pos.x*0.5+0.5)*window.innerWidth;const y=(-pos.y*0.5+0.5)*window.innerHeight;nameTagDiv.style.left=x+'px';nameTagDiv.style.top=y+'px';nameTagDiv.style.display=pos.z<1?'block':'none';}
+  function updateNameTagText(name){currentName=name;if(nameTagDiv)nameTagDiv.textContent=name;savePrefs();}
+  function createColorPicker(){
+    const panel=document.createElement('div');panel.id='avatar-color-picker';panel.className='avatar-color-picker hidden';
+    panel.innerHTML='<div class="avatar-picker-header"><span>Avatar</span><button class="avatar-picker-close">&times;</button></div><div class="avatar-picker-name"><label>Name</label><input type="text" id="avatar-name-input" maxlength="20" placeholder="Your name" /></div><div class="avatar-picker-colors"><label>Color</label><div class="avatar-color-grid">'+PRESET_COLORS.map(c=>'<button class="avatar-color-swatch '+(c.hex===currentColor?'active':'')+'" data-color="'+c.hex+'" style="background:'+c.hex+'" title="'+c.name+'"></button>').join('')+'</div></div>';
+    document.body.appendChild(panel);
+    panel.querySelector('.avatar-picker-close').addEventListener('click',()=>panel.classList.add('hidden'));
+    panel.querySelectorAll('.avatar-color-swatch').forEach(el=>el.addEventListener('click',()=>updateAvatarColor(el.dataset.color)));
+    const ni=panel.querySelector('#avatar-name-input');ni.value=currentName;ni.addEventListener('input',(e)=>updateNameTagText(e.target.value||'Visitor'));
+    return panel;
+  }
+  function toggleColorPicker(){if(!colorPickerPanel)return;colorPickerPanel.classList.toggle('hidden');const ni=colorPickerPanel.querySelector('#avatar-name-input');if(ni&&!colorPickerPanel.classList.contains('hidden')){ni.value=currentName;ni.focus();}}
+  function update(playerPos){if(!avatarMesh)return;avatarMesh.position.set(playerPos.x,playerPos.y-0.8,playerPos.z);updateNameTagPosition();}
+  function init(sceneRef,cameraRef){_scene=sceneRef;_camera=cameraRef;loadPrefs();avatarMesh=createAvatarMesh(currentColor);_scene.add(avatarMesh);nameTagDiv=createNameTag(currentName);colorPickerPanel=createColorPicker();const h=document.querySelector('.hud-top-right');if(h){const b=document.createElement('button');b.id='avatar-customize-btn';b.className='hud-icon-btn';b.title='Customize Avatar';b.innerHTML='<span class="hud-icon">🎨</span>';b.addEventListener('click',toggleColorPicker);h.insertBefore(b,h.firstChild);}console.log('[AvatarCustomization] Initialized —',currentColor,currentName);}
+  return{init,update,setColor:updateAvatarColor,setName:updateNameTagText,toggleColorPicker};
+})();
+window.AvatarCustomization=AvatarCustomization;

index.html

@@ -23,6 +23,7 @@
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@300;400;500;600;700&family=Orbitron:wght@400;500;600;700;800;900&display=swap" rel="stylesheet">
 <link rel="stylesheet" href="./style.css">
+<link rel="stylesheet" href="./avatar-customization.css">
 <link rel="manifest" href="./manifest.json">
 <script type="importmap">
 {
@@ -395,9 +396,9 @@
 <div id="memory-connections-panel" class="memory-connections-panel" style="display:none;" aria-label="Memory Connections Panel"></div>
 
 <script src="./boot.js"></script>
-<script src="./js/heartbeat.js"></script>
 <script src="./avatar-customization.js"></script>
 <script src="./lod-system.js"></script>
+<script src="./portal-hot-reload.js"></script>
 <script>
 function openMemoryFilter() { renderFilterList(); document.getElementById('memory-filter').style.display = 'flex'; }
 function closeMemoryFilter() { document.getElementById('memory-filter').style.display = 'none'; }

js/heartbeat.js

@@ -1,293 +0,0 @@
-/**
- * WebSocket Heartbeat Client for The Nexus
- * Issue #1535: feat: WebSocket heartbeat with auto-reconnect from client
- * 
- * Provides:
- * - Client sends heartbeat ping every 30s
- * - Server responds with pong + user count
- * - Client auto-reconnects on missed 2 heartbeats
- * - Reconnect preserves user position/identity
- */
-
-class NexusHeartbeat {
-    constructor(options = {}) {
-        this.heartbeatInterval = options.heartbeatInterval || 30000; // 30 seconds
-        this.maxMissedHeartbeats = options.maxMissedHeartbeats || 2;
-        this.reconnectDelay = options.reconnectDelay || 1000; // 1 second
-        this.maxReconnectDelay = options.maxReconnectDelay || 30000; // 30 seconds
-        
-        this.ws = null;
-        this.heartbeatTimer = null;
-        this.missedHeartbeats = 0;
-        this.isConnected = false;
-        this.userId = options.userId || this.generateUserId();
-        this.position = options.position || { x: 0, y: 0, z: 0 };
-        this.reconnectAttempts = 0;
-        
-        // Callbacks
-        this.onConnect = options.onConnect || (() => {});
-        this.onDisconnect = options.onDisconnect || (() => {});
-        this.onHeartbeat = options.onHeartbeat || (() => {});
-        this.onUserCount = options.onUserCount || (() => {});
-        this.onError = options.onError || console.error;
-        
-        // Bind methods
-        this.connect = this.connect.bind(this);
-        this.disconnect = this.disconnect.bind(this);
-        this.sendHeartbeat = this.sendHeartbeat.bind(this);
-        this.handleMessage = this.handleMessage.bind(this);
-        this.handleClose = this.handleClose.bind(this);
-        this.handleError = this.handleError.bind(this);
-    }
-    
-    generateUserId() {
-        return 'user_' + Math.random().toString(36).substr(2, 9);
-    }
-    
-    connect(url) {
-        if (this.ws && this.ws.readyState === WebSocket.OPEN) {
-            console.warn('Already connected');
-            return;
-        }
-        
-        this.url = url;
-        console.log(`Connecting to ${url}...`);
-        
-        try {
-            this.ws = new WebSocket(url);
-            this.ws.onopen = this.handleOpen.bind(this);
-            this.ws.onmessage = this.handleMessage;
-            this.ws.onclose = this.handleClose;
-            this.ws.onerror = this.handleError;
-        } catch (error) {
-            this.onError('Failed to create WebSocket:', error);
-            this.scheduleReconnect();
-        }
-    }
-    
-    disconnect() {
-        console.log('Disconnecting...');
-        
-        // Stop heartbeat
-        this.stopHeartbeat();
-        
-        // Close WebSocket
-        if (this.ws) {
-            this.ws.onclose = null; // Prevent reconnect on manual disconnect
-            this.ws.close(1000, 'Manual disconnect');
-            this.ws = null;
-        }
-        
-        this.isConnected = false;
-        this.missedHeartbeats = 0;
-        this.reconnectAttempts = 0;
-    }
-    
-    handleOpen() {
-        console.log('Connected to WebSocket');
-        this.isConnected = true;
-        this.missedHeartbeats = 0;
-        this.reconnectAttempts = 0;
-        
-        // Send reconnect message with user info
-        this.sendReconnect();
-        
-        // Start heartbeat
-        this.startHeartbeat();
-        
-        // Call connect callback
-        this.onConnect();
-    }
-    
-    handleMessage(event) {
-        try {
-            const data = JSON.parse(event.data);
-            
-            if (data.type === 'pong') {
-                // Reset missed heartbeats
-                this.missedHeartbeats = 0;
-                
-                // Update user count
-                if (data.user_count !== undefined) {
-                    this.onUserCount(data.user_count);
-                }
-                
-                // Call heartbeat callback
-                this.onHeartbeat(data);
-                
-                console.debug('Heartbeat pong received');
-            } else if (data.type === 'health') {
-                // Health check response
-                console.debug('Health check:', data);
-            } else {
-                // Regular message
-                console.debug('Message received:', data);
-            }
-        } catch (error) {
-            // Not JSON or parse error
-            console.debug('Non-JSON message received:', event.data);
-        }
-    }
-    
-    handleClose(event) {
-        console.log(`WebSocket closed: ${event.code} ${event.reason}`);
-        this.isConnected = false;
-        this.stopHeartbeat();
-        
-        // Call disconnect callback
-        this.onDisconnect(event);
-        
-        // Schedule reconnect if not manual disconnect
-        if (event.code !== 1000) {
-            this.scheduleReconnect();
-        }
-    }
-    
-    handleError(error) {
-        this.onError('WebSocket error:', error);
-    }
-    
-    startHeartbeat() {
-        if (this.heartbeatTimer) {
-            clearInterval(this.heartbeatTimer);
-        }
-        
-        console.log(`Starting heartbeat every ${this.heartbeatInterval / 1000}s`);
-        
-        this.heartbeatTimer = setInterval(() => {
-            this.sendHeartbeat();
-        }, this.heartbeatInterval);
-        
-        // Send initial heartbeat
-        this.sendHeartbeat();
-    }
-    
-    stopHeartbeat() {
-        if (this.heartbeatTimer) {
-            clearInterval(this.heartbeatTimer);
-            this.heartbeatTimer = null;
-        }
-    }
-    
-    sendHeartbeat() {
-        if (!this.isConnected || !this.ws || this.ws.readyState !== WebSocket.OPEN) {
-            console.warn('Cannot send heartbeat: not connected');
-            return;
-        }
-        
-        const heartbeat = {
-            type: 'heartbeat',
-            timestamp: Date.now(),
-            user_id: this.userId,
-            position: this.position
-        };
-        
-        try {
-            this.ws.send(JSON.stringify(heartbeat));
-            console.debug('Heartbeat sent');
-            
-            // Check for missed heartbeats
-            this.missedHeartbeats++;
-            if (this.missedHeartbeats > this.maxMissedHeartbeats) {
-                console.warn(`Missed ${this.missedHeartbeats} heartbeats, reconnecting...`);
-                this.ws.close(4000, 'Missed heartbeats');
-            }
-        } catch (error) {
-            this.onError('Failed to send heartbeat:', error);
-            this.ws.close(4001, 'Heartbeat send failed');
-        }
-    }
-    
-    sendReconnect() {
-        if (!this.isConnected || !this.ws || this.ws.readyState !== WebSocket.OPEN) {
-            console.warn('Cannot send reconnect: not connected');
-            return;
-        }
-        
-        const reconnect = {
-            type: 'reconnect',
-            timestamp: Date.now(),
-            user_id: this.userId,
-            position: this.position
-        };
-        
-        try {
-            this.ws.send(JSON.stringify(reconnect));
-            console.log('Reconnect message sent');
-        } catch (error) {
-            this.onError('Failed to send reconnect:', error);
-        }
-    }
-    
-    scheduleReconnect() {
-        if (this.reconnectAttempts >= 10) {
-            console.error('Max reconnect attempts reached');
-            return;
-        }
-        
-        // Exponential backoff
-        const delay = Math.min(
-            this.reconnectDelay * Math.pow(2, this.reconnectAttempts),
-            this.maxReconnectDelay
-        );
-        
-        console.log(`Reconnecting in ${delay / 1000}s (attempt ${this.reconnectAttempts + 1})...`);
-        
-        setTimeout(() => {
-            this.reconnectAttempts++;
-            this.connect(this.url);
-        }, delay);
-    }
-    
-    updatePosition(x, y, z) {
-        this.position = { x, y, z };
-        
-        // Send position update if connected
-        if (this.isConnected && this.ws && this.ws.readyState === WebSocket.OPEN) {
-            const update = {
-                type: 'position',
-                timestamp: Date.now(),
-                user_id: this.userId,
-                position: this.position
-            };
-            
-            try {
-                this.ws.send(JSON.stringify(update));
-            } catch (error) {
-                console.warn('Failed to send position update:', error);
-            }
-        }
-    }
-    
-    getUserId() {
-        return this.userId;
-    }
-    
-    getPosition() {
-        return { ...this.position };
-    }
-    
-    isConnectionActive() {
-        return this.isConnected && this.ws && this.ws.readyState === WebSocket.OPEN;
-    }
-    
-    getStats() {
-        return {
-            connected: this.isConnected,
-            userId: this.userId,
-            position: this.position,
-            missedHeartbeats: this.missedHeartbeats,
-            reconnectAttempts: this.reconnectAttempts
-        };
-    }
-}
-
-// Export for use in other modules
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = NexusHeartbeat;
-}
-
-// Global instance for browser use
-if (typeof window !== 'undefined') {
-    window.NexusHeartbeat = NexusHeartbeat;
-}

nexus/bannerlord_harness.py

@@ -29,7 +29,7 @@ from typing import Any, Callable, Optional
 
 import websockets
 
-from bannerlord_trace import BannerlordTraceLogger
+from nexus.bannerlord_trace import BannerlordTraceLogger
 
 # ═══════════════════════════════════════════════════════════════════════════
 # CONFIGURATION

nexus/evennia_ws_bridge.py

@@ -304,6 +304,43 @@ async def inject_event(event_type: str, ws_url: str, **kwargs):
         sys.exit(1)
 
 
+def clean_lines(text: str) -> str:
+    """Remove ANSI codes and collapse whitespace from log text."""
+    import re
+    text = strip_ansi(text)
+    text = re.sub(r'\s+', ' ', text).strip()
+    return text
+
+
+def normalize_event(event: dict) -> dict:
+    """Normalize an Evennia event dict to standard format."""
+    return {
+        "type": event.get("type", "unknown"),
+        "actor": event.get("actor", event.get("name", "")),
+        "room": event.get("room", event.get("location", "")),
+        "message": event.get("message", event.get("text", "")),
+        "timestamp": event.get("timestamp", ""),
+    }
+
+
+def parse_room_output(text: str) -> dict:
+    """Parse Evennia room output into structured data."""
+    import re
+    lines = text.strip().split("\n")
+    result = {"name": "", "description": "", "exits": [], "objects": []}
+    if lines:
+        result["name"] = strip_ansi(lines[0]).strip()
+    if len(lines) > 1:
+        result["description"] = strip_ansi(lines[1]).strip()
+    for line in lines[2:]:
+        line = strip_ansi(line).strip()
+        if line.startswith("Exits:"):
+            result["exits"] = [e.strip() for e in line[6:].split(",") if e.strip()]
+        elif line.startswith("You see:"):
+            result["objects"] = [o.strip() for o in line[8:].split(",") if o.strip()]
+    return result
+
+
 def main():
     parser = argparse.ArgumentParser(description="Evennia -> Nexus WebSocket Bridge")
     sub = parser.add_subparsers(dest="mode")

portal-hot-reload.js

@@ -0,0 +1,105 @@
+/**
+ * Portal Hot-Reload for The Nexus
+ * 
+ * Watches portals.json for changes and hot-reloads portal list
+ * without server restart. Existing connections unaffected.
+ * 
+ * Usage:
+ *   PortalHotReload.start(intervalMs);
+ *   PortalHotReload.stop();
+ *   PortalHotReload.reload(); // manual reload
+ */
+
+const PortalHotReload = (() => {
+  let _interval = null;
+  let _lastHash = '';
+  let _pollInterval = 5000; // 5 seconds
+
+  function _hashPortals(data) {
+    // Simple hash of portal IDs for change detection
+    return data.map(p => p.id || p.name).sort().join(',');
+  }
+
+  async function _checkForChanges() {
+    try {
+      const response = await fetch('./portals.json?t=' + Date.now());
+      if (!response.ok) return;
+      
+      const data = await response.json();
+      const hash = _hashPortals(data);
+      
+      if (hash !== _lastHash) {
+        console.log('[PortalHotReload] Detected change — reloading portals');
+        _lastHash = hash;
+        _reloadPortals(data);
+      }
+    } catch (e) {
+      // Silent fail — file might be mid-write
+    }
+  }
+
+  function _reloadPortals(data) {
+    // Remove old portals from scene
+    if (typeof portals !== 'undefined' && Array.isArray(portals)) {
+      portals.forEach(p => {
+        if (p.group && typeof scene !== 'undefined' && scene) {
+          scene.remove(p.group);
+        }
+      });
+      portals.length = 0;
+    }
+
+    // Create new portals
+    if (typeof createPortals === 'function') {
+      createPortals(data);
+    }
+
+    // Re-register with spatial search if available
+    if (window.SpatialSearch && typeof portals !== 'undefined') {
+      portals.forEach(p => {
+        if (p.config && p.config.name && p.group) {
+          SpatialSearch.register('portal', p, p.config.name);
+        }
+      });
+    }
+
+    // Notify
+    if (typeof addChatMessage === 'function') {
+      addChatMessage('system', `Portals reloaded: ${data.length} portals active`);
+    }
+
+    console.log(`[PortalHotReload] Reloaded ${data.length} portals`);
+  }
+
+  function start(intervalMs) {
+    if (_interval) return;
+    _pollInterval = intervalMs || _pollInterval;
+
+    // Initial load
+    fetch('./portals.json').then(r => r.json()).then(data => {
+      _lastHash = _hashPortals(data);
+    }).catch(() => {});
+
+    _interval = setInterval(_checkForChanges, _pollInterval);
+    console.log(`[PortalHotReload] Watching portals.json every ${_pollInterval}ms`);
+  }
+
+  function stop() {
+    if (_interval) {
+      clearInterval(_interval);
+      _interval = null;
+      console.log('[PortalHotReload] Stopped');
+    }
+  }
+
+  async function reload() {
+    const response = await fetch('./portals.json?t=' + Date.now());
+    const data = await response.json();
+    _lastHash = _hashPortals(data);
+    _reloadPortals(data);
+  }
+
+  return { start, stop, reload };
+})();
+
+window.PortalHotReload = PortalHotReload;