Compare commits
4 Commits
fix/1430-g
...
fix/1280
| Author | SHA1 | Date | |
|---|---|---|---|
| 94012e8091 | |||
| 86af3d827a | |||
|
|
06f4dbff67 | ||
|
|
0a33fbe645 |
3
app.js
3
app.js
@@ -734,9 +734,6 @@ 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.');
|
||||
|
||||
@@ -32,14 +32,6 @@ from datetime import datetime, timedelta, timezone
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
# ── Safety guard ───────────────────────────────────────────────────────
|
||||
# Prevent accidental execution from git commit messages containing
|
||||
# code examples with backticks (shell substitution). See issue #1430.
|
||||
if os.environ.get("GIT_DIR") or os.environ.get("GIT_INDEX_FILE"):
|
||||
# Running inside a git hook — exit silently to prevent
|
||||
# shell substitution in commit messages from triggering mining.
|
||||
sys.exit(0)
|
||||
|
||||
logging.basicConfig(
|
||||
level=logging.INFO,
|
||||
format="%(asctime)s [%(levelname)s] %(message)s",
|
||||
|
||||
@@ -397,7 +397,6 @@
|
||||
<script src="./boot.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'; }
|
||||
|
||||
@@ -29,7 +29,7 @@ from typing import Any, Callable, Optional
|
||||
|
||||
import websockets
|
||||
|
||||
from nexus.bannerlord_trace import BannerlordTraceLogger
|
||||
from bannerlord_trace import BannerlordTraceLogger
|
||||
|
||||
# ═══════════════════════════════════════════════════════════════════════════
|
||||
# CONFIGURATION
|
||||
|
||||
@@ -304,43 +304,6 @@ 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")
|
||||
|
||||
@@ -1,105 +0,0 @@
|
||||
/**
|
||||
* 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;
|
||||
34
reports/openclaw-purge-2026-04-12.md
Normal file
34
reports/openclaw-purge-2026-04-12.md
Normal file
@@ -0,0 +1,34 @@
|
||||
# OpenClaw Purge Report — 2026-04-12
|
||||
|
||||
Directive: We are Hermes maxis. OpenClaw has been removed from the entire Timmy Foundation stack.
|
||||
|
||||
## What was done
|
||||
|
||||
### the-nexus (this repo)
|
||||
- PR #1278 — Removed OpenClaw sidecar reference from README.md (merged)
|
||||
- PR #1279 — Rewrote Fleet Vocabulary: deprecated Robing pattern, replaced with Hermes-native comms (merged)
|
||||
- Issue #830 — Updated body to remove OpenClaw references from intelligence briefing scope
|
||||
- ACTION NEEDED (rockachopa): Update org description at https://forge.alexanderwhitestone.com/Timmy_Foundation — remove `OpenClaw sidecar` from description.
|
||||
- Current: `Sovereign AI foundation — Hermes harness, canonical Nexus repo, timmy-home training ground, OpenClaw sidecar.`
|
||||
- New: `Sovereign AI foundation — Hermes harness, canonical Nexus repo, timmy-home training ground.`
|
||||
|
||||
### timmy-config (complete)
|
||||
- PR #487 — 7 files changed: code-claw-delegation.md, allegro-wizard-house.md, automation-inventory.md, capacity-inventory.md, topology.md, son-of-timmy.md, health_check.py (merged)
|
||||
|
||||
### timmy-home (complete)
|
||||
- PR #595 — 3 files changed: USER_AUDIT_2026-04-04.md, two greptard reports with deprecation headers (merged)
|
||||
- Issue #141 closed (Robing architecture superseded)
|
||||
- Issue #140 closed (lobster cutover superseded)
|
||||
|
||||
## What was preserved
|
||||
- 27 previously closed OpenClaw issues across repos — left as historical record
|
||||
- Greptard memory architecture reports — preserved with deprecation headers
|
||||
- The Robing/Lobster/Unrobed vocabulary entries — marked deprecated, not deleted
|
||||
|
||||
## Remaining action
|
||||
- Org description — needs org owner (rockachopa) to update. The perplexity account lacks org admin permission.
|
||||
|
||||
## Architecture going forward
|
||||
Hermes handles everything: cognitive core, channels, dispatch, memory, cron, health monitoring. No external gateway layer. Two states: Online or Dead. No split-brain failure modes.
|
||||
|
||||
Reference: openclaw-purge-2026-04-12
|
||||
28
tests/test_openclaw_purge_report.py
Normal file
28
tests/test_openclaw_purge_report.py
Normal file
@@ -0,0 +1,28 @@
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
REPORT = Path("reports/openclaw-purge-2026-04-12.md")
|
||||
|
||||
|
||||
def test_openclaw_purge_report_exists_with_required_sections():
|
||||
assert REPORT.exists(), "expected OpenClaw purge report artifact to exist"
|
||||
content = REPORT.read_text()
|
||||
assert "# OpenClaw Purge Report — 2026-04-12" in content
|
||||
assert "## What was done" in content
|
||||
assert "### the-nexus (this repo)" in content
|
||||
assert "### timmy-config (complete)" in content
|
||||
assert "### timmy-home (complete)" in content
|
||||
assert "## What was preserved" in content
|
||||
assert "## Remaining action" in content
|
||||
assert "## Architecture going forward" in content
|
||||
|
||||
|
||||
def test_openclaw_purge_report_preserves_core_findings():
|
||||
content = REPORT.read_text()
|
||||
assert "PR #1278" in content
|
||||
assert "PR #1279" in content
|
||||
assert "PR #487" in content
|
||||
assert "PR #595" in content
|
||||
assert "27 previously closed OpenClaw issues across repos" in content
|
||||
assert "The perplexity account lacks org admin permission." in content
|
||||
assert "Reference: openclaw-purge-2026-04-12" in content
|
||||
Reference in New Issue
Block a user