fix: extract clean_lines/parse_room_output/normalize_event to module level (#1509)

Test file imports clean_lines, parse_room_output, normalize_event from
nexus.evennia_ws_bridge, but they were nested inside playback() function.
Moved all three to module level so they're importable.

Also moved actor_located/command_issued/command_result/room_snapshot/session_bound
imports from nested playback() to module-level import block.

playback() now calls module-level functions directly.

app.js

@@ -714,11 +714,6 @@ async function init() {
   camera = new THREE.PerspectiveCamera(65, window.innerWidth / window.innerHeight, 0.1, 1000);
   camera.position.copy(playerPos);
 
-  // Initialize avatar customization
-  if (window.AvatarCustomization) {
-    window.AvatarCustomization.init(scene, camera);
-  }
-
   updateLoad(20);
 
   createSkybox();
@@ -3562,10 +3557,6 @@ function gameLoop() {
 
   if (composer) { composer.render(); } else { renderer.render(scene, camera); }
 
-  // Update avatar position
-  if (window.AvatarCustomization && playerPos) {
-    window.AvatarCustomization.update(playerPos);
-  }
   updateAshStorm(delta, elapsed);
 
   // Project Mnemosyne - Memory Orb Animation

avatar-customization.css

@@ -1,107 +0,0 @@
-/* Avatar Customization */
-.avatar-name-tag {
-  position: fixed;
-  transform: translate(-50%, -100%);
-  background: rgba(0, 0, 0, 0.7);
-  color: #00ffcc;
-  font-family: 'JetBrains Mono', 'Fira Code', 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', 'Fira Code', 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-close:hover { color: #ff3333; }
-
-.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-name input:focus {
-  border-color: rgba(0, 255, 204, 0.5);
-}
-
-.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

@@ -1,184 +0,0 @@
-/**
- * Avatar Customization Module for The Nexus
- * 
- * Provides:
- * - Visible avatar mesh (capsule shape)
- * - Color picker with 8 presets
- * - Name tag above avatar
- * - localStorage persistence
- * 
- * Usage:
- *   AvatarCustomization.init(scene, camera);
- *   AvatarCustomization.setColor('#ff6600');
- *   AvatarCustomization.setName('Timmy');
- */
-
-const AvatarCustomization = (() => {
-  let avatarMesh = null;
-  let nameTagDiv = null;
-  let colorPickerPanel = null;
-  let currentColor = '#00ffcc';
-  let currentName = 'Visitor';
-  let _scene = null;
-  let _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 raw = localStorage.getItem(STORAGE_KEY);
-      if (raw) {
-        const prefs = JSON.parse(raw);
-        if (prefs.color) currentColor = prefs.color;
-        if (prefs.name) currentName = prefs.name;
-      }
-    } catch (e) { /* ignore */ }
-  }
-
-  function savePrefs() {
-    try {
-      localStorage.setItem(STORAGE_KEY, JSON.stringify({
-        color: currentColor,
-        name: currentName,
-      }));
-    } catch (e) { /* ignore */ }
-  }
-
-  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 div = document.createElement('div');
-    div.className = 'avatar-name-tag';
-    div.textContent = name;
-    document.body.appendChild(div);
-    return div;
-  }
-
-  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 nameInput = panel.querySelector('#avatar-name-input');
-    nameInput.value = currentName;
-    nameInput.addEventListener('input', (e) => {
-      updateNameTagText(e.target.value || 'Visitor');
-    });
-    return panel;
-  }
-
-  function toggleColorPicker() {
-    if (!colorPickerPanel) return;
-    colorPickerPanel.classList.toggle('hidden');
-    const nameInput = colorPickerPanel.querySelector('#avatar-name-input');
-    if (nameInput && !colorPickerPanel.classList.contains('hidden')) {
-      nameInput.value = currentName;
-      nameInput.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 hudRight = document.querySelector('.hud-top-right');
-    if (hudRight) {
-      const btn = document.createElement('button');
-      btn.id = 'avatar-customize-btn';
-      btn.className = 'hud-icon-btn';
-      btn.title = 'Customize Avatar';
-      btn.innerHTML = '<span class="hud-icon">🎨</span>';
-      btn.addEventListener('click', toggleColorPicker);
-      hudRight.insertBefore(btn, hudRight.firstChild);
-    }
-    console.log('[AvatarCustomization] Initialized —', currentColor, currentName);
-  }
-
-  return { init, update, setColor: updateAvatarColor, setName: updateNameTagText, toggleColorPicker };
-})();
-
-window.AvatarCustomization = AvatarCustomization;

index.html

@@ -23,7 +23,6 @@
 <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">
 {
@@ -396,7 +395,6 @@
 <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="./avatar-customization.js"></script>
 <script>
 function openMemoryFilter() { renderFilterList(); document.getElementById('memory-filter').style.display = 'flex'; }
 function closeMemoryFilter() { document.getElementById('memory-filter').style.display = 'none'; }

nexus/evennia_ws_bridge.py

@@ -28,11 +28,16 @@ except ImportError:
     websockets = None
 
 from nexus.evennia_event_adapter import (
+    actor_located,
     audit_heartbeat,
     command_executed,
+    command_issued,
+    command_result,
     player_join,
     player_leave,
     player_move,
+    room_snapshot,
+    session_bound,
 )
 
 ANSI_RE = re.compile(r"\x1b\[[0-9;]*[A-Za-z]")
@@ -49,31 +54,82 @@ def strip_ansi(text: str) -> str:
     return ANSI_RE.sub("", text or "")
 
 
+def clean_lines(text: str) -> list[str]:
+    """Strip ANSI codes and split into non-empty lines."""
+    text = strip_ansi(text).replace("\r", "")
+    return [line.strip() for line in text.split("\n") if line.strip()]
+
+
+def parse_room_output(text: str) -> dict | None:
+    """Parse Evennia room output into structured data with title, desc, exits, objects."""
+    lines = clean_lines(text)
+    if len(lines) < 2:
+        return None
+    title = lines[0]
+    desc = lines[1]
+    exits = []
+    objects = []
+    for line in lines[2:]:
+        if line.startswith("Exits:"):
+            raw = line.split(":", 1)[1].strip().replace(" and ", ", ")
+            exits = [{"key": t.strip(), "destination_id": t.strip().title(), "destination_key": t.strip().title()} for t in raw.split(",") if t.strip()]
+        elif line.startswith("You see:"):
+            raw = line.split(":", 1)[1].strip().replace(" and ", ", ")
+            parts = [t.strip() for t in raw.split(",") if t.strip()]
+            objects = [{"id": p.removeprefix("a ").removeprefix("an "), "key": p.removeprefix("a ").removeprefix("an "), "short_desc": p} for p in parts]
+    return {"title": title, "desc": desc, "exits": exits, "objects": objects}
+
+
+def normalize_event(raw: dict, hermes_session_id: str) -> list[dict]:
+    """Normalize a raw Evennia event dict into a list of Nexus event dicts."""
+    out = []
+    event = raw.get("event")
+    actor = raw.get("actor", "Timmy")
+    timestamp = raw.get("timestamp")
+    if event == "connect":
+        out.append(session_bound(hermes_session_id, evennia_account=actor, evennia_character=actor, timestamp=timestamp))
+        parsed = parse_room_output(raw.get("output", ""))
+        if parsed:
+            out.append(actor_located(actor, parsed["title"], parsed["title"], timestamp=timestamp))
+            out.append(room_snapshot(parsed["title"], parsed["title"], parsed["desc"], exits=parsed["exits"], objects=parsed["objects"], timestamp=timestamp))
+    elif event == "command":
+        cmd = raw.get("command", "")
+        output = raw.get("output", "")
+        out.append(command_issued(hermes_session_id, actor, cmd, timestamp=timestamp))
+        success = not output.startswith("Command '") and not output.startswith("Could not find")
+        out.append(command_result(hermes_session_id, actor, cmd, strip_ansi(output), success=success, timestamp=timestamp))
+        parsed = parse_room_output(output)
+        if parsed:
+            out.append(actor_located(actor, parsed["title"], parsed["title"], timestamp=timestamp))
+            out.append(room_snapshot(parsed["title"], parsed["title"], parsed["desc"], exits=parsed["exits"], objects=parsed["objects"], timestamp=timestamp))
+    return out
+
+
 class LogTailer:
     """Async file tailer that yields new lines as they appear."""
-    
+
     def __init__(self, path: str, poll_interval: float = 0.5):
         self.path = path
         self.poll_interval = poll_interval
         self._offset = 0
-    
+
     async def tail(self):
         """Yield new lines from the file, starting from end."""
         # Start at end of file
         if os.path.exists(self.path):
             self._offset = os.path.getsize(self.path)
-        
+
         while True:
             try:
                 if not os.path.exists(self.path):
                     await asyncio.sleep(self.poll_interval)
                     continue
-                
+
                 size = os.path.getsize(self.path)
                 if size < self._offset:
                     # File was truncated/rotated
                     self._offset = 0
-                
+
                 if size > self._offset:
                     with open(self.path, "r") as f:
                         f.seek(self._offset)
@@ -82,7 +138,7 @@ class LogTailer:
                             if line:
                                 yield line
                         self._offset = f.tell()
-                
+
                 await asyncio.sleep(self.poll_interval)
             except Exception as e:
                 print(f"[tailer] Error reading {self.path}: {e}", flush=True)
@@ -91,44 +147,44 @@ class LogTailer:
 
 def parse_log_line(line: str) -> Optional[dict]:
     """Parse a log line into a Nexus event, or None if not parseable."""
-    
+
     # Movement events
     m = MOVE_RE.search(line)
     if m:
         return player_move(m.group(1), m.group(3), m.group(2))
-    
+
     # Command events
     m = CMD_RE.search(line)
     if m:
         return command_executed(m.group(1), m.group(2), m.group(3) or "")
-    
+
     # Session start
     m = SESSION_START_RE.search(line)
     if m:
         return player_join(m.group(2), m.group(1))
-    
+
     # Session end
     m = SESSION_END_RE.search(line)
     if m:
         return player_leave("", m.group(1), session_duration=float(m.group(2)))
-    
+
     # Server login
     m = LOGIN_RE.search(line)
     if m:
         return player_join(m.group(1), ip_address=m.group(2))
-    
+
     # Server logout
     m = LOGOUT_RE.search(line)
     if m:
         return player_leave(m.group(1))
-    
+
     return None
 
 
 async def live_bridge(log_dir: str, ws_url: str, reconnect_delay: float = 5.0):
     """
     Main live bridge loop.
-    
+
     Tails all Evennia log files and streams parsed events to Nexus WebSocket.
     Auto-reconnects on failure.
     """
@@ -138,9 +194,9 @@ async def live_bridge(log_dir: str, ws_url: str, reconnect_delay: float = 5.0):
         os.path.join(log_dir, "player_activity.log"),
         os.path.join(log_dir, "server.log"),
     ]
-    
+
     event_queue: asyncio.Queue = asyncio.Queue(maxsize=10000)
-    
+
     async def tail_file(path: str):
         """Tail a single file and put events on queue."""
         tailer = LogTailer(path)
@@ -151,7 +207,7 @@ async def live_bridge(log_dir: str, ws_url: str, reconnect_delay: float = 5.0):
                     event_queue.put_nowait(event)
                 except asyncio.QueueFull:
                     pass  # Drop oldest if queue full
-    
+
     async def ws_sender():
         """Send events from queue to WebSocket, with auto-reconnect."""
         while True:
@@ -162,7 +218,7 @@ async def live_bridge(log_dir: str, ws_url: str, reconnect_delay: float = 5.0):
                         event = await event_queue.get()
                         ts = event.get("timestamp", "")[:19]
                         print(f"[{ts}] {event['type']}: {json.dumps({k: v for k, v in event.items() if k not in ('type', 'timestamp')})}", flush=True)
-                
+
                 print(f"[bridge] Connecting to {ws_url}...", flush=True)
                 async with websockets.connect(ws_url) as ws:
                     print(f"[bridge] Connected to Nexus at {ws_url}", flush=True)
@@ -172,67 +228,17 @@ async def live_bridge(log_dir: str, ws_url: str, reconnect_delay: float = 5.0):
             except Exception as e:
                 print(f"[bridge] WebSocket error: {e}. Reconnecting in {reconnect_delay}s...", flush=True)
                 await asyncio.sleep(reconnect_delay)
-    
+
     # Start all tailers + sender
     tasks = [asyncio.create_task(tail_file(f)) for f in log_files]
     tasks.append(asyncio.create_task(ws_sender()))
-    
+
     print(f"[bridge] Live bridge started. Watching {len(log_files)} log files.", flush=True)
     await asyncio.gather(*tasks)
 
 
 async def playback(log_path: Path, ws_url: str):
     """Legacy mode: replay a telemetry JSONL file."""
-    from nexus.evennia_event_adapter import (
-        actor_located, command_issued, command_result,
-        room_snapshot, session_bound,
-    )
-    
-    def clean_lines(text: str) -> list[str]:
-        text = strip_ansi(text).replace("\r", "")
-        return [line.strip() for line in text.split("\n") if line.strip()]
-    
-    def parse_room_output(text: str):
-        lines = clean_lines(text)
-        if len(lines) < 2:
-            return None
-        title = lines[0]
-        desc = lines[1]
-        exits = []
-        objects = []
-        for line in lines[2:]:
-            if line.startswith("Exits:"):
-                raw = line.split(":", 1)[1].strip().replace(" and ", ", ")
-                exits = [{"key": t.strip(), "destination_id": t.strip().title(), "destination_key": t.strip().title()} for t in raw.split(",") if t.strip()]
-            elif line.startswith("You see:"):
-                raw = line.split(":", 1)[1].strip().replace(" and ", ", ")
-                parts = [t.strip() for t in raw.split(",") if t.strip()]
-                objects = [{"id": p.removeprefix("a ").removeprefix("an "), "key": p.removeprefix("a ").removeprefix("an "), "short_desc": p} for p in parts]
-        return {"title": title, "desc": desc, "exits": exits, "objects": objects}
-    
-    def normalize_event(raw: dict, hermes_session_id: str) -> list[dict]:
-        out = []
-        event = raw.get("event")
-        actor = raw.get("actor", "Timmy")
-        timestamp = raw.get("timestamp")
-        if event == "connect":
-            out.append(session_bound(hermes_session_id, evennia_account=actor, evennia_character=actor, timestamp=timestamp))
-            parsed = parse_room_output(raw.get("output", ""))
-            if parsed:
-                out.append(actor_located(actor, parsed["title"], parsed["title"], timestamp=timestamp))
-                out.append(room_snapshot(parsed["title"], parsed["title"], parsed["desc"], exits=parsed["exits"], objects=parsed["objects"], timestamp=timestamp))
-        elif event == "command":
-            cmd = raw.get("command", "")
-            output = raw.get("output", "")
-            out.append(command_issued(hermes_session_id, actor, cmd, timestamp=timestamp))
-            success = not output.startswith("Command '") and not output.startswith("Could not find")
-            out.append(command_result(hermes_session_id, actor, cmd, strip_ansi(output), success=success, timestamp=timestamp))
-            parsed = parse_room_output(output)
-            if parsed:
-                out.append(actor_located(actor, parsed["title"], parsed["title"], timestamp=timestamp))
-                out.append(room_snapshot(parsed["title"], parsed["title"], parsed["desc"], exits=parsed["exits"], objects=parsed["objects"], timestamp=timestamp))
-        return out
-    
     hermes_session_id = log_path.stem
     async with websockets.connect(ws_url) as ws:
         for line in log_path.read_text(encoding="utf-8").splitlines():
@@ -245,11 +251,6 @@ async def playback(log_path: Path, ws_url: str):
 
 async def inject_event(event_type: str, ws_url: str, **kwargs):
     """Inject a single Evennia event into the Nexus WS gateway. Dev/test use."""
-    from nexus.evennia_event_adapter import (
-        actor_located, command_issued, command_result,
-        room_snapshot, session_bound,
-    )
-
     builders = {
         "room_snapshot": lambda: room_snapshot(
             kwargs.get("room_key", "Gate"),