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.

fleet/fleet-routing.json

@@ -1,13 +1,9 @@
 {
   "version": 1,
   "generated": "2026-04-06",
-  "refs": [
-    "#836",
-    "#204",
-    "#195",
-    "#196"
-  ],
+  "refs": ["#836", "#204", "#195", "#196"],
   "description": "Canonical fleet routing table. Evaluated agents, routing verdicts, and dispatch rules for the Timmy Foundation task harness.",
+
   "agents": [
     {
       "id": 27,
@@ -50,14 +46,12 @@
       "location": "Bag End, The Shire (VPS)",
       "description": "Ollama on VPS. Speaks when spoken to. Prefers quiet. Not for delegated work.",
       "primary_role": "on-request-queries",
-      "routing_verdict": "ROUTE TO: background monitoring, status checks, low-priority Q&A. Only on-request \u2014 do not delegate autonomously.",
+      "routing_verdict": "ROUTE TO: background monitoring, status checks, low-priority Q&A. Only on-request — do not delegate autonomously.",
       "active": true,
       "do_not_route": false,
       "created": "2026-04-02",
       "repo_count": 1,
-      "repos": [
-        "bilbobagginshire/bilbo-adventures"
-      ]
+      "repos": ["bilbobagginshire/bilbo-adventures"]
     },
     {
       "id": 24,
@@ -66,7 +60,7 @@
       "model": "codex",
       "tier": "prepaid",
       "location": "The Harness",
-      "description": "OpenClaw bridge. Protocol adapter layer \u2014 not a personality. Infrastructure, not a destination.",
+      "description": "OpenClaw bridge. Protocol adapter layer — not a personality. Infrastructure, not a destination.",
       "primary_role": "protocol-bridge",
       "routing_verdict": "DO NOT ROUTE directly. claw-code is the bridge to external Codex agents, not an endpoint. Remove from routing cascade.",
       "active": true,
@@ -85,7 +79,7 @@
       "location": "Below the Surface",
       "description": "Infrastructure, deployments, bedrock services. Needs model assignment before activation.",
       "primary_role": "devops",
-      "routing_verdict": "DO NOT ROUTE \u2014 no model assigned yet. Activate after Epic #196 (Local Model Fleet) assigns a model.",
+      "routing_verdict": "DO NOT ROUTE — no model assigned yet. Activate after Epic #196 (Local Model Fleet) assigns a model.",
       "active": false,
       "do_not_route": true,
       "do_not_route_reason": "No model assigned. Blocked on Epic #196.",
@@ -103,15 +97,13 @@
       "location": "The Archive",
       "description": "Original prototype. Museum piece. Preserved for historical reference only.",
       "primary_role": "inactive",
-      "routing_verdict": "DO NOT ROUTE \u2014 retired from active duty. Preserved only.",
+      "routing_verdict": "DO NOT ROUTE — retired from active duty. Preserved only.",
       "active": false,
       "do_not_route": true,
       "do_not_route_reason": "Retired prototype. Historical preservation only.",
       "created": "2026-03-31",
       "repo_count": 1,
-      "repos": [
-        "allegro-primus/first-steps"
-      ]
+      "repos": ["allegro-primus/first-steps"]
     },
     {
       "id": 5,
@@ -128,10 +120,7 @@
       "gap": "Agent description is empty in Gitea profile. Needs enrichment.",
       "created": "2026-03-14",
       "repo_count": 2,
-      "repos": [
-        "kimi/the-nexus-fork",
-        "kimi/Timmy-time-dashboard"
-      ]
+      "repos": ["kimi/the-nexus-fork", "kimi/Timmy-time-dashboard"]
     },
     {
       "id": 20,
@@ -159,10 +148,10 @@
       "id": 19,
       "name": "ezra",
       "gitea_user": "ezra",
-      "model": "kimi-coding/kimi-k2.5",
+      "model": "claude",
       "tier": "prepaid",
       "location": "Hermes VPS",
-      "description": "Archivist. Research and triage wizard. 9 repos owned \u2014 most in the fleet. Handles complex multi-file and cross-repo work.",
+      "description": "Archivist. Claude-Hermes wizard. 9 repos owned — most in the fleet. Handles complex multi-file and cross-repo work.",
       "primary_role": "documentation",
       "routing_verdict": "ROUTE TO: docs, specs, architecture, complex multi-file work. Escalate here when breadth and precision both matter.",
       "active": true,
@@ -187,7 +176,7 @@
       "gitea_user": "bezalel",
       "model": "groq",
       "tier": "free",
-      "location": "TestBed VPS \u2014 The Forge",
+      "location": "TestBed VPS — The Forge",
       "description": "Builder, debugger, testbed wizard. Groq-powered, free tier. Strong on PR review and CI.",
       "primary_role": "code-review",
       "routing_verdict": "ROUTE TO: PR review, test writing, debugging, CI fixes.",
@@ -195,39 +184,29 @@
       "do_not_route": false,
       "created": "2026-03-29",
       "repo_count": 1,
-      "repos": [
-        "bezalel/forge-log"
-      ]
+      "repos": ["bezalel/forge-log"]
     }
   ],
+
   "routing_cascade": {
-    "description": "Cost-optimized routing cascade \u2014 cheapest capable agent first, escalate on complexity.",
+    "description": "Cost-optimized routing cascade — cheapest capable agent first, escalate on complexity.",
     "tiers": [
       {
         "tier": 1,
         "label": "Free",
-        "agents": [
-          "fenrir",
-          "bezalel",
-          "carnice"
-        ],
+        "agents": ["fenrir", "bezalel", "carnice"],
         "use_for": "Issue triage, code review, local code generation. Default lane for most tasks."
       },
       {
         "tier": 2,
         "label": "Cheap",
-        "agents": [
-          "kimi",
-          "allegro"
-        ],
-        "use_for": "Small scoped edits (kimi \u22643 files), triage decisions and routing (allegro)."
+        "agents": ["kimi", "allegro"],
+        "use_for": "Small scoped edits (kimi ≤3 files), triage decisions and routing (allegro)."
       },
       {
         "tier": 3,
         "label": "Premium / Escalate",
-        "agents": [
-          "ezra"
-        ],
+        "agents": ["ezra"],
         "use_for": "Complex multi-file work, docs, architecture. Escalate only."
       }
     ],
@@ -238,48 +217,22 @@
       "allegro-primus: retired, do not route"
     ]
   },
+
   "task_type_map": {
-    "issue-triage": [
-      "fenrir",
-      "allegro"
-    ],
-    "code-generation": [
-      "carnice",
-      "ezra"
-    ],
-    "code-review": [
-      "bezalel"
-    ],
-    "small-edit": [
-      "kimi"
-    ],
-    "debugging": [
-      "bezalel",
-      "carnice"
-    ],
-    "documentation": [
-      "ezra"
-    ],
-    "architecture": [
-      "ezra"
-    ],
-    "ci-fixes": [
-      "bezalel"
-    ],
-    "pr-review": [
-      "bezalel",
-      "fenrir"
-    ],
-    "triage-routing": [
-      "allegro"
-    ],
-    "devops": [
-      "substratum"
-    ],
-    "background-monitoring": [
-      "bilbobagginshire"
-    ]
+    "issue-triage": ["fenrir", "allegro"],
+    "code-generation": ["carnice", "ezra"],
+    "code-review": ["bezalel"],
+    "small-edit": ["kimi"],
+    "debugging": ["bezalel", "carnice"],
+    "documentation": ["ezra"],
+    "architecture": ["ezra"],
+    "ci-fixes": ["bezalel"],
+    "pr-review": ["bezalel", "fenrir"],
+    "triage-routing": ["allegro"],
+    "devops": ["substratum"],
+    "background-monitoring": ["bilbobagginshire"]
   },
+
   "gaps": [
     {
       "agent": "substratum",
@@ -302,11 +255,12 @@
       "action": "Run wolf evaluation on active agents (#195) to replace vibes-based routing with data."
     }
   ],
+
   "next_actions": [
-    "Assign model to substratum \u2014 Epic #196",
-    "Run wolf evaluation on active agents \u2014 Issue #195",
-    "Remove claw-code from routing cascade \u2014 it is infrastructure, not a destination",
+    "Assign model to substratum — Epic #196",
+    "Run wolf evaluation on active agents — Issue #195",
+    "Remove claw-code from routing cascade — it is infrastructure, not a destination",
     "Enrich kimi's Gitea profile description",
-    "Wire fleet-routing.json into workforce-manager.py \u2014 Epic #204"
+    "Wire fleet-routing.json into workforce-manager.py — Epic #204"
   ]
-}
+}

fleet/hermes-trismegistus/lane.md

@@ -7,13 +7,13 @@
 
 ## Role
 
-Dedicated research and triage wizard. Kimi-native.
+Dedicated reasoning and architecture wizard. Claude-native.
 
 ## Routing
 
 Route to Hermes Trismegistus when:
 - Task requires deep architectural reasoning
-- Novel problem-solving that benefits from strong reasoning depth
+- Novel problem-solving that benefits from Claude's reasoning depth
 - Planning and design decisions for the fleet
 - Complex multi-step analysis that goes beyond code generation
 

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"),

portals.json

@@ -160,7 +160,7 @@
       }
     },
     "agents_present": [
-      "ezra"
+      "claude"
     ],
     "interaction_ready": true
   },