Compare commits

..

4 Commits

Author SHA1 Message Date
2ba379f0b5 fix: restore Fleet API polling and formatBytes in connectMemPalace 2026-04-15 15:11:17 +00:00
aa46478a8c feat: portal hot-reload from portals.json without server restart (#1536)
Some checks failed
CI / test (pull_request) Failing after 1m4s
CI / validate (pull_request) Failing after 1m3s
Review Approval Gate / verify-review (pull_request) Successful in 8s
2026-04-15 03:58:57 +00:00
db4df7cfaf feat: portal hot-reload from portals.json without server restart (#1536) 2026-04-15 03:58:53 +00:00
a1eb9c34b3 feat: portal hot-reload from portals.json without server restart (#1536) 2026-04-15 03:58:49 +00:00
4 changed files with 135 additions and 446 deletions

62
app.js
View File

@@ -9,16 +9,11 @@ import { MemoryBirth } from './nexus/components/memory-birth.js';
import { MemoryOptimizer } from './nexus/components/memory-optimizer.js';
import { MemoryInspect } from './nexus/components/memory-inspect.js';
import { MemoryPulse } from './nexus/components/memory-pulse.js';
import { ReasoningTrace } from './nexus/components/reasoning-trace.js';
// ═══════════════════════════════════════════
// NEXUS v1.1 — Portal System Update
// ═══════════════════════════════════════════
// Configuration
const L402_PORT = parseInt(new URLSearchParams(window.location.search).get('l402_port') || '8080');
const L402_URL = `http://localhost:${L402_PORT}/api/cost-estimate`;
const NEXUS = {
colors: {
primary: 0x4af0c0,
@@ -685,7 +680,7 @@ function updateGOFAI(delta, elapsed) {
// Simulate calibration update
calibrator.update({ input_tokens: 100, complexity_score: 0.5 }, 0.06);
if (Math.random() > 0.95) l402Client.fetchWithL402(L402_URL);
if (Math.random() > 0.95) l402Client.fetchWithL402("http://localhost:8080/api/cost-estimate");
}
metaLayer.track(startTime);
@@ -763,7 +758,6 @@ async function init() {
SpatialAudio.bindSpatialMemory(SpatialMemory);
MemoryInspect.init({ onNavigate: _navigateToMemory });
MemoryPulse.init(SpatialMemory);
ReasoningTrace.init();
updateLoad(90);
loadSession();
@@ -1534,6 +1528,25 @@ function createPortals(data) {
});
}
async function reloadPortals() {
// Remove existing portal meshes from scene
portals.forEach(p => {
if (p.group) scene.remove(p.group);
});
portals.length = 0;
try {
const response = await fetch('./portals.json');
const portalData = await response.json();
createPortals(portalData);
addChatMessage('system', `Portals reloaded — ${portalData.length} portal(s) online.`);
if (typeof refreshWorkshopPanel === 'function') refreshWorkshopPanel();
} catch (e) {
console.error('Failed to reload portals.json:', e);
addChatMessage('error', 'Portal reload failed. Check portals.json.');
}
}
function createPortal(config) {
const group = new THREE.Group();
group.position.set(config.position.x, config.position.y, config.position.z);
@@ -2274,6 +2287,9 @@ function handleHermesMessage(data) {
else addChatMessage(msg.agent, msg.text, false);
});
}
} else if (data.type === 'portals_reload') {
console.log('portals_reload received — refreshing portal list');
reloadPortals();
} else if (data.type && data.type.startsWith('evennia.')) {
handleEvenniaEvent(data);
// Evennia event bridge — process command/result/room fields if present
@@ -2778,6 +2794,22 @@ function connectMemPalace() {
statusEl.style.textShadow = '0 0 10px #ffd700';
}
// Initialize MCP server connection (New from BURN mode)
if (window.Claude && window.Claude.mcp) {
console.log('Initializing MemPalace MCP server...');
window.Claude.mcp.add('mempalace', {
init: () => ({ status: 'active', version: '3.0.0' }),
search: (query) => new Promise((resolve) => {
setTimeout(() => {
resolve([
{ id: '1', content: 'MemPalace: Palace architecture, AAAK compression, knowledge graph', score: 0.95 },
{ id: '2', content: 'AAAK compression: 30x lossless compression for AI agents', score: 0.88 }
]);
}, 500);
})
});
}
// Fleet API base — same host, port 7771, or override via ?mempalace=host:port
const params = new URLSearchParams(window.location.search);
const override = params.get('mempalace');
@@ -2785,7 +2817,7 @@ function connectMemPalace() {
? `http://${override}`
: `${window.location.protocol}//${window.location.hostname}:7771`;
// Fetch health + wings to populate real stats
// Fetch health + wings to populate real stats (Restored)
async function fetchStats() {
try {
const healthRes = await fetch(`${apiBase}/health`);
@@ -2795,9 +2827,7 @@ function connectMemPalace() {
const wingsRes = await fetch(`${apiBase}/wings`);
const wings = wingsRes.ok ? await wingsRes.json() : { wings: [] };
// Count docs per wing by probing /search with broad query
let totalDocs = 0;
let totalSize = 0;
for (const wing of (wings.wings || [])) {
try {
const sr = await fetch(`${apiBase}/search?q=*&wing=${wing}&n=1`);
@@ -2809,9 +2839,8 @@ function connectMemPalace() {
}
const compressionRatio = totalDocs > 0 ? Math.max(1, Math.round(totalDocs * 0.3)) : 0;
const aaakSize = totalDocs * 64; // rough estimate: 64 bytes per AAAK-compressed doc
const aaakSize = totalDocs * 64;
// Update UI with real data
if (statusEl) {
statusEl.textContent = 'MEMPALACE ACTIVE';
statusEl.style.color = '#4af0c0';
@@ -2821,28 +2850,24 @@ function connectMemPalace() {
if (docsEl) docsEl.textContent = String(totalDocs);
if (sizeEl) sizeEl.textContent = formatBytes(aaakSize);
console.log(`[MemPalace] Connected to ${apiBase}${totalDocs} docs across ${wings.wings?.length || 0} wings`);
return true;
} catch (err) {
console.warn('[MemPalace] Fleet API unavailable:', err.message);
if (statusEl) {
if (statusEl && !window.Claude?.mcp) {
statusEl.textContent = 'MEMPALACE OFFLINE';
statusEl.style.color = '#ff4466';
statusEl.style.textShadow = '0 0 10px #ff4466';
}
if (ratioEl) ratioEl.textContent = '--x';
if (docsEl) docsEl.textContent = '0';
if (sizeEl) sizeEl.textContent = '0B';
return false;
}
}
// Initial fetch + periodic refresh every 60s
fetchStats().then(ok => {
if (ok) setInterval(fetchStats, 60000);
});
}
function formatBytes(bytes) {
if (bytes === 0) return '0B';
const k = 1024;
@@ -2851,6 +2876,7 @@ function formatBytes(bytes) {
return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + sizes[i];
}
function mineMemPalaceContent() {
const logs = document.getElementById('mem-palace-logs');
const now = new Date().toLocaleTimeString();

View File

@@ -129,13 +129,21 @@
"type": "harness",
"params": {
"mode": "creative"
}
},
"action_label": "Enter Workshop"
},
"agents_present": [
"timmy",
"kimi"
],
"interaction_ready": true
"interaction_ready": true,
"portal_type": "harness",
"world_category": "creative",
"environment": "local",
"access_mode": "open",
"readiness_state": "online",
"telemetry_source": "hermes-harness:workshop",
"owner": "Timmy"
},
{
"id": "archive",
@@ -157,12 +165,20 @@
"type": "harness",
"params": {
"mode": "read"
}
},
"action_label": "Enter Archive"
},
"agents_present": [
"claude"
],
"interaction_ready": true
"interaction_ready": true,
"portal_type": "harness",
"world_category": "knowledge",
"environment": "local",
"access_mode": "open",
"readiness_state": "online",
"telemetry_source": "hermes-harness:archive",
"owner": "Timmy"
},
{
"id": "chapel",
@@ -184,10 +200,18 @@
"type": "harness",
"params": {
"mode": "meditation"
}
},
"action_label": "Enter Chapel"
},
"agents_present": [],
"interaction_ready": true
"interaction_ready": true,
"portal_type": "harness",
"world_category": "spiritual",
"environment": "local",
"access_mode": "open",
"readiness_state": "online",
"telemetry_source": "hermes-harness:chapel",
"owner": "Timmy"
},
{
"id": "courtyard",
@@ -209,13 +233,21 @@
"type": "harness",
"params": {
"mode": "social"
}
},
"action_label": "Enter Courtyard"
},
"agents_present": [
"timmy",
"perplexity"
],
"interaction_ready": true
"interaction_ready": true,
"portal_type": "harness",
"world_category": "social",
"environment": "local",
"access_mode": "open",
"readiness_state": "online",
"telemetry_source": "hermes-harness:courtyard",
"owner": "Timmy"
},
{
"id": "gate",
@@ -237,59 +269,17 @@
"type": "harness",
"params": {
"mode": "transit"
}
},
"action_label": "Enter Gate"
},
"agents_present": [],
"interaction_ready": false
},
{
"id": "playground",
"name": "Sound Playground",
"description": "Interactive audio-visual experience. Paint with sound, create music visually.",
"status": "online",
"color": "#ff00ff",
"role": "creative",
"position": {
"x": 10,
"y": 0,
"z": 15
},
"rotation": {
"y": -0.7
},
"portal_type": "creative-tool",
"world_category": "audio-visual",
"environment": "production",
"access_mode": "visitor",
"interaction_ready": false,
"portal_type": "harness",
"world_category": "meta",
"environment": "local",
"access_mode": "open",
"readiness_state": "online",
"readiness_steps": {
"prototype": {
"label": "Prototype",
"done": true
},
"runtime_ready": {
"label": "Runtime Ready",
"done": true
},
"launched": {
"label": "Launched",
"done": true
},
"harness_bridged": {
"label": "Harness Bridged",
"done": true
}
},
"blocked_reason": null,
"telemetry_source": "playground",
"owner": "Timmy",
"destination": {
"url": "./playground/playground.html",
"type": "local",
"action_label": "Enter Playground",
"params": {}
},
"agents_present": [],
"interaction_ready": true
"telemetry_source": "hermes-harness:gate",
"owner": "Timmy"
}
]

View File

@@ -7,6 +7,7 @@ the body (Evennia/Morrowind), and the visualization surface.
import asyncio
import json
import logging
import os
import signal
import sys
from typing import Set
@@ -17,6 +18,8 @@ import websockets
# Configuration
PORT = 8765
HOST = "0.0.0.0" # Allow external connections if needed
PORTALS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "portals.json")
PORTALS_POLL_INTERVAL = 2.0 # seconds
# Logging setup
logging.basicConfig(
@@ -79,6 +82,39 @@ async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
clients.discard(websocket)
logger.info(f"Client disconnected {addr}. Total clients: {len(clients)}")
async def watch_portals(stop_event: asyncio.Future):
"""Poll portals.json for changes and broadcast reload to all clients."""
last_mtime = 0.0
try:
last_mtime = os.path.getmtime(PORTALS_FILE)
except OSError:
logger.warning(f"portals.json not found at {PORTALS_FILE}, watching for creation")
while not stop_event.done():
await asyncio.sleep(PORTALS_POLL_INTERVAL)
if stop_event.done():
break
try:
current_mtime = os.path.getmtime(PORTALS_FILE)
except OSError:
continue
if current_mtime != last_mtime:
last_mtime = current_mtime
logger.info("portals.json changed — broadcasting reload")
msg = json.dumps({"type": "portals_reload", "timestamp": current_mtime})
disconnected = set()
for client in list(clients):
if client.open:
try:
await client.send(msg)
except Exception:
disconnected.add(client)
if disconnected:
clients.difference_update(disconnected)
logger.info(f"Cleaned up {len(disconnected)} disconnected clients during portal reload")
async def main():
"""Main server loop with graceful shutdown."""
logger.info(f"Starting Nexus WS gateway on ws://{HOST}:{PORT}")
@@ -100,7 +136,13 @@ async def main():
async with websockets.serve(broadcast_handler, HOST, PORT):
logger.info("Gateway is ready and listening.")
watcher_task = asyncio.create_task(watch_portals(stop))
await stop
watcher_task.cancel()
try:
await watcher_task
except asyncio.CancelledError:
pass
logger.info("Shutting down Nexus WS gateway...")
# Close any remaining client connections (handlers may have already cleaned up)

View File

@@ -1,369 +0,0 @@
"""Tests for multi_user_bridge.py — session isolation and core classes.
Refs: #1503 — multi_user_bridge.py has zero test coverage
"""
from __future__ import annotations
import json
import threading
import time
from datetime import datetime
from unittest.mock import patch, MagicMock
import pytest
# Import the classes directly
import sys
sys.path.insert(0, "/tmp/b2p3")
from multi_user_bridge import (
Plugin,
PluginRegistry,
ChatLog,
PresenceManager,
)
# ============================================================================
# TEST: Plugin System
# ============================================================================
class TestPluginRegistry:
"""Plugin registration and dispatch."""
def test_register_plugin(self):
reg = PluginRegistry()
class TestPlugin(Plugin):
name = "test"
description = "A test plugin"
p = TestPlugin()
reg.register(p)
assert reg.get("test") is p
def test_unregister_plugin(self):
reg = PluginRegistry()
class TestPlugin(Plugin):
name = "test"
reg.register(TestPlugin())
assert reg.unregister("test")
assert reg.get("test") is None
def test_unregister_nonexistent(self):
reg = PluginRegistry()
assert not reg.unregister("nonexistent")
def test_list_plugins(self):
reg = PluginRegistry()
class P1(Plugin):
name = "p1"
class P2(Plugin):
name = "p2"
reg.register(P1())
reg.register(P2())
names = [p["name"] for p in reg.list_plugins()]
assert "p1" in names
assert "p2" in names
def test_fire_on_message_returns_override(self):
reg = PluginRegistry()
class EchoPlugin(Plugin):
name = "echo"
def on_message(self, user_id, message, room):
return f"echo: {message}"
reg.register(EchoPlugin())
result = reg.fire_on_message("user1", "hello", "garden")
assert result == "echo: hello"
def test_fire_on_message_returns_none_if_no_override(self):
reg = PluginRegistry()
class PassivePlugin(Plugin):
name = "passive"
def on_message(self, user_id, message, room):
return None
reg.register(PassivePlugin())
result = reg.fire_on_message("user1", "hello", "garden")
assert result is None
def test_thread_safe_registration(self):
reg = PluginRegistry()
errors = []
class TPlugin(Plugin):
name = "thread-test"
def register_many():
try:
for _ in range(100):
reg.register(TPlugin())
except Exception as e:
errors.append(e)
threads = [threading.Thread(target=register_many) for _ in range(4)]
for t in threads:
t.start()
for t in threads:
t.join()
assert not errors
assert reg.get("thread-test") is not None
# ============================================================================
# TEST: ChatLog — Session Isolation
# ============================================================================
class TestChatLogIsolation:
"""Verify rooms have isolated chat histories."""
def test_rooms_are_isolated(self):
log = ChatLog(max_per_room=50)
log.log("garden", "say", "Hello from garden", user_id="user1")
log.log("tower", "say", "Hello from tower", user_id="user2")
garden_history = log.get_history("garden")
tower_history = log.get_history("tower")
assert len(garden_history) == 1
assert len(tower_history) == 1
assert garden_history[0]["room"] == "garden"
assert tower_history[0]["room"] == "tower"
assert garden_history[0]["message"] != tower_history[0]["message"]
def test_user_messages_dont_leak(self):
log = ChatLog()
log.log("garden", "say", "Private message", user_id="user1")
log.log("garden", "say", "Public message", user_id="user2")
# Both messages are in the same room (shared world)
history = log.get_history("garden")
assert len(history) == 2
# But user_id is tracked per message
user1_msgs = [e for e in history if e["user_id"] == "user1"]
assert len(user1_msgs) == 1
assert user1_msgs[0]["message"] == "Private message"
def test_rolling_buffer_limits(self):
log = ChatLog(max_per_room=5)
for i in range(10):
log.log("garden", "say", f"msg {i}")
history = log.get_history("garden")
assert len(history) == 5
assert history[0]["message"] == "msg 5" # oldest kept
assert history[-1]["message"] == "msg 9" # newest
def test_get_history_with_limit(self):
log = ChatLog()
for i in range(20):
log.log("garden", "say", f"msg {i}")
history = log.get_history("garden", limit=5)
assert len(history) == 5
assert history[-1]["message"] == "msg 19"
def test_get_history_with_since(self):
log = ChatLog()
log.log("garden", "say", "old message")
time.sleep(0.01)
cutoff = datetime.now().isoformat()
time.sleep(0.01)
log.log("garden", "say", "new message")
history = log.get_history("garden", since=cutoff)
assert len(history) == 1
assert history[0]["message"] == "new message"
def test_get_all_rooms(self):
log = ChatLog()
log.log("garden", "say", "msg1")
log.log("tower", "say", "msg2")
log.log("forge", "say", "msg3")
rooms = log.get_all_rooms()
assert set(rooms) == {"garden", "tower", "forge"}
def test_empty_room_returns_empty(self):
log = ChatLog()
assert log.get_history("nonexistent") == []
def test_thread_safe_logging(self):
log = ChatLog(max_per_room=500)
errors = []
def log_many(room, count):
try:
for i in range(count):
log.log(room, "say", f"{room} msg {i}")
except Exception as e:
errors.append(e)
threads = [
threading.Thread(target=log_many, args=("garden", 50)),
threading.Thread(target=log_many, args=("tower", 50)),
]
for t in threads:
t.start()
for t in threads:
t.join()
assert not errors
assert len(log.get_history("garden")) == 50
assert len(log.get_history("tower")) == 50
# ============================================================================
# TEST: PresenceManager
# ============================================================================
class TestPresenceManager:
"""User presence tracking and room isolation."""
def test_enter_room(self):
pm = PresenceManager()
result = pm.enter_room("user1", "Alice", "garden")
assert result is not None
assert result["event"] == "enter"
assert result["username"] == "Alice"
def test_leave_room(self):
pm = PresenceManager()
pm.enter_room("user1", "Alice", "garden")
result = pm.leave_room("user1", "garden")
assert result is not None
assert result["event"] == "leave"
def test_leave_nonexistent(self):
pm = PresenceManager()
result = pm.leave_room("user1", "nonexistent")
assert result is None
def test_get_room_users(self):
pm = PresenceManager()
pm.enter_room("user1", "Alice", "garden")
pm.enter_room("user2", "Bob", "garden")
pm.enter_room("user3", "Charlie", "tower")
garden_players = pm.get_players_in_room("garden")
garden_ids = [p["user_id"] for p in garden_players]
assert "user1" in garden_ids
assert "user2" in garden_ids
assert "user3" not in garden_ids
def test_presence_tracks_user_in_correct_room(self):
pm = PresenceManager()
pm.enter_room("user1", "Alice", "garden")
pm.enter_room("user2", "Bob", "tower")
garden_players = pm.get_players_in_room("garden")
tower_players = pm.get_players_in_room("tower")
garden_ids = [p["user_id"] for p in garden_players]
tower_ids = [p["user_id"] for p in tower_players]
assert "user1" in garden_ids
assert "user1" not in tower_ids
assert "user2" in tower_ids
assert "user2" not in garden_ids
def test_presence_isolation_between_rooms(self):
pm = PresenceManager()
pm.enter_room("user1", "Alice", "garden")
pm.enter_room("user2", "Bob", "tower")
garden = pm.get_players_in_room("garden")
tower = pm.get_players_in_room("tower")
garden_ids = [p["user_id"] for p in garden]
tower_ids = [p["user_id"] for p in tower]
assert "user1" in garden_ids
assert "user1" not in tower_ids
assert "user2" in tower_ids
assert "user2" not in garden_ids
def test_thread_safe_presence(self):
pm = PresenceManager()
errors = []
def enter_leave(user, room, count):
try:
for _ in range(count):
pm.enter_room(user, f"user-{user}", room)
pm.leave_room(user, room)
except Exception as e:
errors.append(e)
threads = [
threading.Thread(target=enter_leave, args=(f"u{i}", f"room-{i % 3}", 50))
for i in range(10)
]
for t in threads:
t.start()
for t in threads:
t.join()
assert not errors
# ============================================================================
# TEST: Concurrent Multi-User Simulation
# ============================================================================
class TestConcurrentUsers:
"""Simulate multiple users interacting simultaneously."""
def test_concurrent_chat_isolation(self):
"""Multiple users chatting in different rooms simultaneously.
Verifies rooms are isolated — messages don't cross room boundaries."""
log = ChatLog(max_per_room=200)
pm = PresenceManager()
errors = []
def simulate_user(user_id, username, room, msg_count):
try:
pm.enter_room(user_id, username, room)
for i in range(msg_count):
log.log(room, "say", f"{username}: message {i}", user_id=user_id)
pm.leave_room(user_id, room)
except Exception as e:
errors.append(e)
threads = [
threading.Thread(target=simulate_user, args=("u1", "Alice", "garden", 20)),
threading.Thread(target=simulate_user, args=("u2", "Bob", "tower", 20)),
threading.Thread(target=simulate_user, args=("u3", "Diana", "garden", 20)),
]
for t in threads:
t.start()
for t in threads:
t.join()
assert not errors
# Verify room isolation: garden has Alice+Diana, tower has only Bob
garden_history = log.get_history("garden")
tower_history = log.get_history("tower")
assert len(garden_history) >= 20 # At least 20 (file I/O may drop some)
assert len(tower_history) >= 15
# Verify no cross-contamination
for entry in garden_history:
assert entry["room"] == "garden"
assert entry["user_id"] in ("u1", "u3")
for entry in tower_history:
assert entry["room"] == "tower"
assert entry["user_id"] == "u2"