Merge branch 'main' into fix/1341

Merge PR #1651: feat: add WebSocket load testing infrastructure (#1505)

reports/perplexity-session-2026-04-12-evening.md

@@ -0,0 +1,107 @@
+# Perplexity Work Report — 2026-04-12 Evening
+
+**Agent:** Perplexity
+**Duration:** ~30 minutes
+**Scope:** All 6 Timmy Foundation repos
+
+---
+
+## Session Summary
+
+This artifact preserves the dated issue-body work report from the 2026-04-12 evening session.
+
+## Merges Executed (26 PRs merged)
+
+### the-nexus (22 merged, 2 closed, 5 need rebase)
+
+| PR | Author | Title | Action |
+|----|--------|-------|--------|
+| #1327 | Rockachopa | Queue throttle (CRITICAL) | ✓ Merged first |
+| #1319 | Rockachopa | .gitea.yml cleanup | ✓ Merged |
+| #1326 | Timmy | Multi-user AI bridge | ✓ Merged |
+| #1330 | Timmy | GOFAI facts into FSM | ✓ Merged |
+| #1285 | Rockachopa | Quality-tier feature gating | ✓ Merged |
+| #1329 | Rockachopa | Fleet health watchdog fix | ✓ Merged |
+| #1331 | Rockachopa | Nexus Health HUD | ✓ Merged |
+| #1328 | Rockachopa | Operation Get A Job CTA | ✓ Merged |
+| #1288 | Rockachopa | Evennia room snapshot panel | ✓ Merged |
+| #1287 | Rockachopa | Portal atlas search + filter | ✓ Merged |
+| #1295 | Rockachopa | GBrain compiled-truth store | ✓ Merged |
+| #1296 | Rockachopa | Mnemosyne memory search | ✓ Merged |
+| #1298 | Rockachopa | Mnemosyne constellation lines | ✓ Merged |
+| #1302 | Rockachopa | Context compaction | ✓ Merged |
+| #1303 | Rockachopa | Morrowind harness ODA loop | ✓ Merged |
+| #1305 | Rockachopa | Evennia WS bridge | ✓ Merged |
+| #1311 | Rockachopa | MemPalace sovereign room | ✓ Merged |
+| #1321 | Rockachopa | AI tools org assessment | ✓ Merged |
+| #1323 | Rockachopa | Connection-state banner | ✓ Merged |
+| #1289 | Rockachopa | Bannerlord runtime infra | ✓ Merged |
+| #1335 | Perplexity | Swarm Governor | ✓ Merged |
+| #1317 | Rockachopa | Malformed .gitea.yml | ✗ Closed |
+| #1318 | Rockachopa | Duplicate of #1317 | ✗ Closed |
+| #1322 | Rockachopa | Duplicate deletion | ✗ Closed (earlier) |
+| #1286, #1291, #1304, #1316, #1324 | — | Need rebase | 📝 Commented |
+| #1306, #1308, #1312, #1325, #1332, #1307 | — | Changes requested | 📝 Commented |
+
+### timmy-config (4 merged)
+
+| PR | Author | Title | Action |
+|----|--------|-------|--------|
+| #488 | Timmy | CI lint enforcement | ✓ Merged |
+| #489 | Timmy | Self-healing restore | ✓ Merged |
+| #497 | Timmy | Fleet dashboard script | ✓ Merged |
+| #500 | Perplexity | Merge Conflict Detector | ✓ Merged |
+
+### timmy-home (1 merged, 1 blocked by CI)
+
+| PR | Author | Title | Action |
+|----|--------|-------|--------|
+| #600 | Perplexity | Hermes Maxi Manifesto | ⚠ CI blocked |
+
+Blocked detail: required status checks still need rockachopa or a successful CI pass.
+
+### fleet-ops (1 merged)
+
+| PR | Author | Title | Action |
+|----|--------|-------|--------|
+| #119 | Perplexity | Agent Scorecard Generator | ✓ Merged |
+
+### hermes-agent (1 merged)
+
+| PR | Author | Title | Action |
+|----|--------|-------|--------|
+| #302 | Perplexity | Provider Allowlist Guard | ✓ Merged |
+
+### the-beacon (1 merged)
+
+| PR | Author | Title | Action |
+|----|--------|-------|--------|
+| #83 | Perplexity | Dead Code Audit | ✓ Merged |
+
+---
+
+### Perplexity Contributions (6 PRs, 5 merged)
+
+| Repo | PR | Title | Lines | Status |
+|------|----|-------|-------|--------|
+| the-nexus | #1335 | Swarm Governor | ~170 | ✓ Merged |
+| timmy-config | #500 | Merge Conflict Detector | ~120 | ✓ Merged |
+| timmy-home | #600 | Hermes Maxi Manifesto | ~110 | ⚠ CI blocked |
+| fleet-ops | #119 | Agent Scorecard Generator | ~160 | ✓ Merged |
+| hermes-agent | #302 | Provider Allowlist Guard | ~200 | ✓ Merged |
+| the-beacon | #83 | Dead Code Audit | ~40 | ✓ Merged |
+
+All contributions are stdlib-only Python (zero external dependencies) or Markdown docs.
+
+---
+
+## Remaining Work
+
+1. **timmy-home #600** — merge after CI passes or rockachopa overrides
+2. **5 nexus PRs need rebase** — #1286, #1291, #1304, #1316, #1324
+3. **6 nexus PRs need changes** — #1306, #1307, #1308, #1312, #1325, #1332
+4. **timmy-config #499** — CAPTCHA tool needs human sign-off
+5. **timmy-config #498** — fragile status signal, needs structured output
+6. **timmy-home #596, #597** — papers need bug fixes before merge
+
+Reference: perplexity-session-2026-04-12-evening

server.py

@@ -3,20 +3,34 @@
 The Nexus WebSocket Gateway — Robust broadcast bridge for Timmy's consciousness.
 This server acts as the central hub for the-nexus, connecting the mind (nexus_think.py),
 the body (Evennia/Morrowind), and the visualization surface.
+
+Security features:
+- Binds to 127.0.0.1 by default (localhost only)
+- Optional external binding via NEXUS_WS_HOST environment variable
+- Token-based authentication via NEXUS_WS_TOKEN environment variable
+- Rate limiting on connections
+- Connection logging and monitoring
 """
 import asyncio
 import json
 import logging
+import os
 import signal
 import sys
-from typing import Set
+import time
+from typing import Set, Dict, Optional
+from collections import defaultdict
 
 # Branch protected file - see POLICY.md
 import websockets
 
 # Configuration
-PORT = 8765
-HOST = "0.0.0.0"  # Allow external connections if needed
+PORT = int(os.environ.get("NEXUS_WS_PORT", "8765"))
+HOST = os.environ.get("NEXUS_WS_HOST", "127.0.0.1")  # Default to localhost only
+AUTH_TOKEN = os.environ.get("NEXUS_WS_TOKEN", "")  # Empty = no auth required
+RATE_LIMIT_WINDOW = 60  # seconds
+RATE_LIMIT_MAX_CONNECTIONS = 10  # max connections per IP per window
+RATE_LIMIT_MAX_MESSAGES = 100  # max messages per connection per window
 
 # Logging setup
 logging.basicConfig(
@@ -28,15 +42,97 @@ logger = logging.getLogger("nexus-gateway")
 
 # State
 clients: Set[websockets.WebSocketServerProtocol] = set()
+connection_tracker: Dict[str, list] = defaultdict(list)  # IP -> [timestamps]
+message_tracker: Dict[int, list] = defaultdict(list)  # connection_id -> [timestamps]
+
+def check_rate_limit(ip: str) -> bool:
+    """Check if IP has exceeded connection rate limit."""
+    now = time.time()
+    # Clean old entries
+    connection_tracker[ip] = [t for t in connection_tracker[ip] if now - t < RATE_LIMIT_WINDOW]
+    
+    if len(connection_tracker[ip]) >= RATE_LIMIT_MAX_CONNECTIONS:
+        return False
+    
+    connection_tracker[ip].append(now)
+    return True
+
+def check_message_rate_limit(connection_id: int) -> bool:
+    """Check if connection has exceeded message rate limit."""
+    now = time.time()
+    # Clean old entries
+    message_tracker[connection_id] = [t for t in message_tracker[connection_id] if now - t < RATE_LIMIT_WINDOW]
+    
+    if len(message_tracker[connection_id]) >= RATE_LIMIT_MAX_MESSAGES:
+        return False
+    
+    message_tracker[connection_id].append(now)
+    return True
+
+async def authenticate_connection(websocket: websockets.WebSocketServerProtocol) -> bool:
+    """Authenticate WebSocket connection using token."""
+    if not AUTH_TOKEN:
+        # No authentication required
+        return True
+    
+    try:
+        # Wait for authentication message (first message should be auth)
+        auth_message = await asyncio.wait_for(websocket.recv(), timeout=5.0)
+        auth_data = json.loads(auth_message)
+        
+        if auth_data.get("type") != "auth":
+            logger.warning(f"Invalid auth message type from {websocket.remote_address}")
+            return False
+        
+        token = auth_data.get("token", "")
+        if token != AUTH_TOKEN:
+            logger.warning(f"Invalid auth token from {websocket.remote_address}")
+            return False
+        
+        logger.info(f"Authenticated connection from {websocket.remote_address}")
+        return True
+        
+    except asyncio.TimeoutError:
+        logger.warning(f"Authentication timeout from {websocket.remote_address}")
+        return False
+    except json.JSONDecodeError:
+        logger.warning(f"Invalid auth JSON from {websocket.remote_address}")
+        return False
+    except Exception as e:
+        logger.error(f"Authentication error from {websocket.remote_address}: {e}")
+        return False
 
 async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
     """Handles individual client connections and message broadcasting."""
-    clients.add(websocket)
     addr = websocket.remote_address
+    ip = addr[0] if addr else "unknown"
+    connection_id = id(websocket)
+    
+    # Check connection rate limit
+    if not check_rate_limit(ip):
+        logger.warning(f"Connection rate limit exceeded for {ip}")
+        await websocket.close(1008, "Rate limit exceeded")
+        return
+    
+    # Authenticate if token is required
+    if not await authenticate_connection(websocket):
+        await websocket.close(1008, "Authentication failed")
+        return
+    
+    clients.add(websocket)
     logger.info(f"Client connected from {addr}. Total clients: {len(clients)}")
     
     try:
         async for message in websocket:
+            # Check message rate limit
+            if not check_message_rate_limit(connection_id):
+                logger.warning(f"Message rate limit exceeded for {addr}")
+                await websocket.send(json.dumps({
+                    "type": "error",
+                    "message": "Message rate limit exceeded"
+                }))
+                continue
+            
             # Parse for logging/validation if it's JSON
             try:
                 data = json.loads(message)
@@ -81,6 +177,20 @@ async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
 
 async def main():
     """Main server loop with graceful shutdown."""
+    # Log security configuration
+    if AUTH_TOKEN:
+        logger.info("Authentication: ENABLED (token required)")
+    else:
+        logger.warning("Authentication: DISABLED (no token required)")
+    
+    if HOST == "0.0.0.0":
+        logger.warning("Host binding: 0.0.0.0 (all interfaces) - SECURITY RISK")
+    else:
+        logger.info(f"Host binding: {HOST} (localhost only)")
+    
+    logger.info(f"Rate limiting: {RATE_LIMIT_MAX_CONNECTIONS} connections/IP/{RATE_LIMIT_WINDOW}s, "
+                f"{RATE_LIMIT_MAX_MESSAGES} messages/connection/{RATE_LIMIT_WINDOW}s")
+    
     logger.info(f"Starting Nexus WS gateway on ws://{HOST}:{PORT}")
     
     # Set up signal handlers for graceful shutdown

tests/load/websocket_load_test.py

@@ -0,0 +1,193 @@
+#!/usr/bin/env python3
+"""
+WebSocket Load Test — Benchmark concurrent user sessions on the Nexus gateway.
+
+Tests:
+- Concurrent WebSocket connections
+- Message throughput under load
+- Memory profiling per connection
+- Connection failure/recovery
+
+Usage:
+    python3 tests/load/websocket_load_test.py                    # default (50 users)
+    python3 tests/load/websocket_load_test.py --users 200        # 200 concurrent
+    python3 tests/load/websocket_load_test.py --duration 60      # 60 second test
+    python3 tests/load/websocket_load_test.py --json             # JSON output
+
+Ref: #1505
+"""
+
+import asyncio
+import json
+import os
+import sys
+import time
+import argparse
+from dataclasses import dataclass, field
+from typing import List, Optional
+
+WS_URL = os.environ.get("WS_URL", "ws://localhost:8765")
+
+
+@dataclass
+class ConnectionStats:
+    connected: bool = False
+    connect_time_ms: float = 0
+    messages_sent: int = 0
+    messages_received: int = 0
+    errors: int = 0
+    latencies: List[float] = field(default_factory=list)
+    disconnected: bool = False
+
+
+async def ws_client(user_id: int, duration: int, stats: ConnectionStats, ws_url: str = WS_URL):
+    """Single WebSocket client for load testing."""
+    try:
+        import websockets
+    except ImportError:
+        # Fallback: use raw asyncio
+        stats.errors += 1
+        return
+
+    try:
+        start = time.time()
+        async with websockets.connect(ws_url, open_timeout=5) as ws:
+            stats.connect_time_ms = (time.time() - start) * 1000
+            stats.connected = True
+
+            # Send periodic messages for the duration
+            end_time = time.time() + duration
+            msg_count = 0
+            while time.time() < end_time:
+                try:
+                    msg_start = time.time()
+                    message = json.dumps({
+                        "type": "chat",
+                        "user": f"load-test-{user_id}",
+                        "content": f"Load test message {msg_count} from user {user_id}",
+                    })
+                    await ws.send(message)
+                    stats.messages_sent += 1
+
+                    # Wait for response (with timeout)
+                    try:
+                        response = await asyncio.wait_for(ws.recv(), timeout=5.0)
+                        stats.messages_received += 1
+                        latency = (time.time() - msg_start) * 1000
+                        stats.latencies.append(latency)
+                    except asyncio.TimeoutError:
+                        stats.errors += 1
+
+                    msg_count += 1
+                    await asyncio.sleep(0.5)  # 2 messages/sec per user
+
+                except websockets.exceptions.ConnectionClosed:
+                    stats.disconnected = True
+                    break
+                except Exception:
+                    stats.errors += 1
+
+    except Exception as e:
+        stats.errors += 1
+        if "Connection refused" in str(e) or "connect" in str(e).lower():
+            pass  # Expected if server not running
+
+
+async def run_load_test(users: int, duration: int, ws_url: str = WS_URL) -> dict:
+    """Run the load test with N concurrent users."""
+    stats = [ConnectionStats() for _ in range(users)]
+
+    print(f"  Starting {users} concurrent connections for {duration}s...")
+    start = time.time()
+
+    tasks = [ws_client(i, duration, stats[i], ws_url) for i in range(users)]
+    await asyncio.gather(*tasks, return_exceptions=True)
+
+    total_time = time.time() - start
+
+    # Aggregate results
+    connected = sum(1 for s in stats if s.connected)
+    total_sent = sum(s.messages_sent for s in stats)
+    total_received = sum(s.messages_received for s in stats)
+    total_errors = sum(s.errors for s in stats)
+    disconnected = sum(1 for s in stats if s.disconnected)
+
+    all_latencies = []
+    for s in stats:
+        all_latencies.extend(s.latencies)
+
+    avg_latency = sum(all_latencies) / len(all_latencies) if all_latencies else 0
+    p95_latency = sorted(all_latencies)[int(len(all_latencies) * 0.95)] if all_latencies else 0
+    p99_latency = sorted(all_latencies)[int(len(all_latencies) * 0.99)] if all_latencies else 0
+
+    avg_connect_time = sum(s.connect_time_ms for s in stats if s.connected) / connected if connected else 0
+
+    return {
+        "users": users,
+        "duration_seconds": round(total_time, 1),
+        "connected": connected,
+        "connect_rate": round(connected / users * 100, 1),
+        "messages_sent": total_sent,
+        "messages_received": total_received,
+        "throughput_msg_per_sec": round(total_sent / total_time, 1) if total_time > 0 else 0,
+        "avg_latency_ms": round(avg_latency, 1),
+        "p95_latency_ms": round(p95_latency, 1),
+        "p99_latency_ms": round(p99_latency, 1),
+        "avg_connect_time_ms": round(avg_connect_time, 1),
+        "errors": total_errors,
+        "disconnected": disconnected,
+    }
+
+
+def print_report(result: dict):
+    """Print load test report."""
+    print(f"\n{'='*60}")
+    print(f"  WEBSOCKET LOAD TEST REPORT")
+    print(f"{'='*60}\n")
+
+    print(f"  Connections:    {result['connected']}/{result['users']} ({result['connect_rate']}%)")
+    print(f"  Duration:       {result['duration_seconds']}s")
+    print(f"  Messages sent:  {result['messages_sent']}")
+    print(f"  Messages recv:  {result['messages_received']}")
+    print(f"  Throughput:     {result['throughput_msg_per_sec']} msg/s")
+    print(f"  Avg connect:    {result['avg_connect_time_ms']}ms")
+    print()
+    print(f"  Latency:")
+    print(f"    Avg: {result['avg_latency_ms']}ms")
+    print(f"    P95: {result['p95_latency_ms']}ms")
+    print(f"    P99: {result['p99_latency_ms']}ms")
+    print()
+    print(f"  Errors:         {result['errors']}")
+    print(f"  Disconnected:   {result['disconnected']}")
+
+    # Verdict
+    if result['connect_rate'] >= 95 and result['errors'] == 0:
+        print(f"\n  ✅ PASS")
+    elif result['connect_rate'] >= 80:
+        print(f"\n  ⚠️  DEGRADED")
+    else:
+        print(f"\n  ❌ FAIL")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="WebSocket Load Test")
+    parser.add_argument("--users", type=int, default=50, help="Concurrent users")
+    parser.add_argument("--duration", type=int, default=30, help="Test duration in seconds")
+    parser.add_argument("--json", action="store_true", help="JSON output")
+    parser.add_argument("--url", default=WS_URL, help="WebSocket URL")
+    args = parser.parse_args()
+
+    ws_url = args.url
+
+    print(f"\nWebSocket Load Test — {args.users} users, {args.duration}s\n")
+
+    result = asyncio.run(run_load_test(args.users, args.duration, ws_url))
+
+    if args.json:
+        print(json.dumps(result, indent=2))
+    else:
+        print_report(result)
+
+
+if __name__ == "__main__":
+    main()

tests/test_perplexity_session_report_2026_04_12_evening.py

@@ -0,0 +1,30 @@
+from pathlib import Path
+
+
+REPORT = Path("reports/perplexity-session-2026-04-12-evening.md")
+
+
+def test_session_report_exists_with_required_sections():
+    assert REPORT.exists(), "expected Perplexity session report artifact to exist"
+    content = REPORT.read_text()
+    assert "# Perplexity Work Report — 2026-04-12 Evening" in content
+    assert "**Agent:** Perplexity" in content
+    assert "**Duration:** ~30 minutes" in content
+    assert "**Scope:** All 6 Timmy Foundation repos" in content
+    assert "## Merges Executed (26 PRs merged)" in content
+    assert "### Perplexity Contributions (6 PRs, 5 merged)" in content
+    assert "## Remaining Work" in content
+    assert "Reference: perplexity-session-2026-04-12-evening" in content
+
+
+def test_session_report_preserves_key_findings_and_counts():
+    content = REPORT.read_text()
+    assert "the-nexus (22 merged, 2 closed, 5 need rebase)" in content
+    assert "| #1335 | Perplexity | Swarm Governor | ✓ Merged |" in content
+    assert "| #500 | Perplexity | Merge Conflict Detector | ✓ Merged |" in content
+    assert "| #600 | Perplexity | Hermes Maxi Manifesto | ⚠ CI blocked |" in content
+    assert "| #302 | Perplexity | Provider Allowlist Guard | ✓ Merged |" in content
+    assert "| #83 | Perplexity | Dead Code Audit | ✓ Merged |" in content
+    assert "1. **timmy-home #600** — merge after CI passes or rockachopa overrides" in content
+    assert "2. **5 nexus PRs need rebase** — #1286, #1291, #1304, #1316, #1324" in content
+    assert "3. **6 nexus PRs need changes** — #1306, #1307, #1308, #1312, #1325, #1332" in content