Compare commits
3 Commits
burn/the-n
...
fix/874
| Author | SHA1 | Date | |
|---|---|---|---|
| c1f02f0d8b | |||
| d72cf9a4fd | |||
|
57bf47f724 |
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.');
|
||||
|
||||
@@ -1,719 +0,0 @@
|
||||
/**
|
||||
* cockpit-inspector.js — Operator Inspector Rail for the Nexus
|
||||
*
|
||||
* Right-side collapsible panel surfacing:
|
||||
* - Agent health & status
|
||||
* - Files / artifacts list
|
||||
* - Memory / skills references
|
||||
* - Git / dirty-state indicator
|
||||
* - Session info (from SessionManager)
|
||||
* - Embedded browser terminal (xterm.js via /pty WebSocket)
|
||||
*
|
||||
* Refs: issue #1695 — ATLAS cockpit operator patterns
|
||||
* Pattern sources: dodo-reach/hermes-desktop, nesquena/hermes-webui
|
||||
*/
|
||||
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Constants
|
||||
// ---------------------------------------------------------------------------
|
||||
const INSPECTOR_KEY = 'cockpit-inspector';
|
||||
const PTY_WS_PORT = 8766; // separate port from main gateway (8765)
|
||||
const GIT_POLL_MS = 15_000; // poll git state every 15s
|
||||
const COLLAPSED_KEY = 'nexus-inspector-collapsed';
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// State
|
||||
// ---------------------------------------------------------------------------
|
||||
let _ws = null; // main nexus gateway WebSocket
|
||||
let _ptyWs = null; // PTY WebSocket
|
||||
let _term = null; // xterm.js Terminal instance
|
||||
let _termFitAddon = null;
|
||||
let _gitState = { branch: '—', dirty: false, untracked: 0, ahead: 0 };
|
||||
let _agentHealth = {}; // agentId -> { status, last_seen }
|
||||
let _artifacts = []; // { name, type, path, ts }
|
||||
let _memRefs = []; // { label, region, count }
|
||||
let _collapsed = false;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// DOM helpers
|
||||
// ---------------------------------------------------------------------------
|
||||
function el(tag, cls, text) {
|
||||
const e = document.createElement(tag);
|
||||
if (cls) e.className = cls;
|
||||
if (text) e.textContent = text;
|
||||
return e;
|
||||
}
|
||||
|
||||
function qs(sel, root) { return (root || document).querySelector(sel); }
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Build the rail DOM
|
||||
// ---------------------------------------------------------------------------
|
||||
function buildRail() {
|
||||
const rail = el('div', 'cockpit-inspector');
|
||||
rail.id = 'cockpit-inspector';
|
||||
rail.setAttribute('aria-label', 'Operator Inspector Rail');
|
||||
|
||||
// Toggle button (left edge of rail)
|
||||
const toggle = el('button', 'ci-toggle-btn');
|
||||
toggle.id = 'ci-toggle-btn';
|
||||
toggle.title = 'Toggle Inspector Rail';
|
||||
toggle.innerHTML = '<span class="ci-toggle-icon">◁</span>';
|
||||
toggle.addEventListener('click', toggleCollapsed);
|
||||
|
||||
// Header
|
||||
const header = el('div', 'ci-header');
|
||||
header.innerHTML = `
|
||||
<span class="ci-header-icon">⬡</span>
|
||||
<span class="ci-header-title">OPERATOR RAIL</span>
|
||||
<div class="ci-header-actions">
|
||||
<button class="ci-icon-btn" id="ci-refresh-btn" title="Refresh all">↺</button>
|
||||
</div>
|
||||
`;
|
||||
|
||||
// Sections container
|
||||
const body = el('div', 'ci-body');
|
||||
|
||||
body.appendChild(buildGitSection());
|
||||
body.appendChild(buildAgentHealthSection());
|
||||
body.appendChild(buildSessionSection());
|
||||
body.appendChild(buildArtifactsSection());
|
||||
body.appendChild(buildMemSkillsSection());
|
||||
body.appendChild(buildTerminalSection());
|
||||
|
||||
rail.appendChild(toggle);
|
||||
rail.appendChild(header);
|
||||
rail.appendChild(body);
|
||||
|
||||
document.body.appendChild(rail);
|
||||
|
||||
// Restore collapsed state
|
||||
_collapsed = localStorage.getItem(COLLAPSED_KEY) === '1';
|
||||
applyCollapsed();
|
||||
|
||||
// Refresh btn
|
||||
qs('#ci-refresh-btn').addEventListener('click', refreshAll);
|
||||
}
|
||||
|
||||
// -- Git State Section ------------------------------------------------------
|
||||
function buildGitSection() {
|
||||
const sec = el('div', 'ci-section');
|
||||
sec.id = 'ci-git-section';
|
||||
sec.innerHTML = `
|
||||
<div class="ci-section-header">
|
||||
<span class="ci-section-icon">⎇</span>
|
||||
GIT STATE
|
||||
<span class="ci-section-badge" id="ci-git-badge">—</span>
|
||||
</div>
|
||||
<div class="ci-section-body" id="ci-git-body">
|
||||
<div class="ci-git-row">
|
||||
<span class="ci-git-label">Branch</span>
|
||||
<span class="ci-git-value" id="ci-git-branch">—</span>
|
||||
</div>
|
||||
<div class="ci-git-row">
|
||||
<span class="ci-git-label">State</span>
|
||||
<span class="ci-git-value" id="ci-git-dirty">—</span>
|
||||
</div>
|
||||
<div class="ci-git-row">
|
||||
<span class="ci-git-label">Ahead</span>
|
||||
<span class="ci-git-value" id="ci-git-ahead">—</span>
|
||||
</div>
|
||||
<div class="ci-git-row">
|
||||
<span class="ci-git-label">Untracked</span>
|
||||
<span class="ci-git-value" id="ci-git-untracked">—</span>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
return sec;
|
||||
}
|
||||
|
||||
// -- Agent Health Section ----------------------------------------------------
|
||||
function buildAgentHealthSection() {
|
||||
const sec = el('div', 'ci-section');
|
||||
sec.id = 'ci-agent-section';
|
||||
sec.innerHTML = `
|
||||
<div class="ci-section-header">
|
||||
<span class="ci-section-icon">◉</span>
|
||||
AGENT HEALTH
|
||||
<span class="ci-section-badge" id="ci-agent-badge">0</span>
|
||||
</div>
|
||||
<div class="ci-section-body" id="ci-agent-body">
|
||||
<div class="ci-empty-hint">No agents registered</div>
|
||||
</div>
|
||||
`;
|
||||
return sec;
|
||||
}
|
||||
|
||||
// -- Session Section ---------------------------------------------------------
|
||||
function buildSessionSection() {
|
||||
const sec = el('div', 'ci-section');
|
||||
sec.id = 'ci-session-section';
|
||||
sec.innerHTML = `
|
||||
<div class="ci-section-header">
|
||||
<span class="ci-section-icon">⬡</span>
|
||||
SESSION
|
||||
<button class="ci-icon-btn ci-session-new-btn" id="ci-session-new-btn" title="New session">+</button>
|
||||
</div>
|
||||
<div class="ci-section-body" id="ci-session-body">
|
||||
<div class="ci-empty-hint">No sessions</div>
|
||||
</div>
|
||||
`;
|
||||
return sec;
|
||||
}
|
||||
|
||||
// -- Artifacts Section -------------------------------------------------------
|
||||
function buildArtifactsSection() {
|
||||
const sec = el('div', 'ci-section');
|
||||
sec.id = 'ci-artifacts-section';
|
||||
sec.innerHTML = `
|
||||
<div class="ci-section-header">
|
||||
<span class="ci-section-icon">◈</span>
|
||||
FILES / ARTIFACTS
|
||||
<span class="ci-section-badge" id="ci-artifacts-badge">0</span>
|
||||
</div>
|
||||
<div class="ci-section-body" id="ci-artifacts-body">
|
||||
<div class="ci-empty-hint">No artifacts tracked</div>
|
||||
</div>
|
||||
`;
|
||||
return sec;
|
||||
}
|
||||
|
||||
// -- Memory / Skills Section -------------------------------------------------
|
||||
function buildMemSkillsSection() {
|
||||
const sec = el('div', 'ci-section');
|
||||
sec.id = 'ci-mem-section';
|
||||
sec.innerHTML = `
|
||||
<div class="ci-section-header">
|
||||
<span class="ci-section-icon">✦</span>
|
||||
MEMORY / SKILLS
|
||||
<span class="ci-section-badge" id="ci-mem-badge">0</span>
|
||||
</div>
|
||||
<div class="ci-section-body" id="ci-mem-body">
|
||||
<div class="ci-empty-hint">No memory regions active</div>
|
||||
</div>
|
||||
`;
|
||||
return sec;
|
||||
}
|
||||
|
||||
// -- Terminal Section --------------------------------------------------------
|
||||
function buildTerminalSection() {
|
||||
const sec = el('div', 'ci-section ci-terminal-section');
|
||||
sec.id = 'ci-terminal-section';
|
||||
sec.innerHTML = `
|
||||
<div class="ci-section-header">
|
||||
<span class="ci-section-icon">$</span>
|
||||
SHELL
|
||||
<div class="ci-section-actions">
|
||||
<button class="ci-icon-btn" id="ci-term-connect-btn" title="Connect shell">▶</button>
|
||||
<button class="ci-icon-btn" id="ci-term-disconnect-btn" title="Disconnect shell" style="display:none">■</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ci-terminal-status" id="ci-terminal-status">
|
||||
<span class="ci-term-dot disconnected"></span>
|
||||
<span id="ci-term-status-label">Disconnected — click ▶ to open PTY</span>
|
||||
</div>
|
||||
<div class="ci-terminal-mount" id="ci-terminal-mount" style="display:none;"></div>
|
||||
`;
|
||||
return sec;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Collapse / expand
|
||||
// ---------------------------------------------------------------------------
|
||||
function toggleCollapsed() {
|
||||
_collapsed = !_collapsed;
|
||||
localStorage.setItem(COLLAPSED_KEY, _collapsed ? '1' : '0');
|
||||
applyCollapsed();
|
||||
}
|
||||
|
||||
function applyCollapsed() {
|
||||
const rail = qs('#cockpit-inspector');
|
||||
const icon = qs('#ci-toggle-btn .ci-toggle-icon');
|
||||
if (!rail) return;
|
||||
if (_collapsed) {
|
||||
rail.classList.add('collapsed');
|
||||
if (icon) icon.textContent = '▷';
|
||||
} else {
|
||||
rail.classList.remove('collapsed');
|
||||
if (icon) icon.textContent = '◁';
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Git state
|
||||
// ---------------------------------------------------------------------------
|
||||
function updateGitUI(state) {
|
||||
_gitState = state;
|
||||
const branch = qs('#ci-git-branch');
|
||||
const dirty = qs('#ci-git-dirty');
|
||||
const ahead = qs('#ci-git-ahead');
|
||||
const untrack = qs('#ci-git-untracked');
|
||||
const badge = qs('#ci-git-badge');
|
||||
|
||||
if (branch) branch.textContent = state.branch || '—';
|
||||
if (ahead) ahead.textContent = state.ahead != null ? `+${state.ahead}` : '—';
|
||||
if (untrack) untrack.textContent = state.untracked != null ? String(state.untracked) : '—';
|
||||
|
||||
if (dirty) {
|
||||
const isDirty = state.dirty || state.untracked > 0;
|
||||
dirty.textContent = isDirty ? '● DIRTY' : '✓ CLEAN';
|
||||
dirty.className = 'ci-git-value ' + (isDirty ? 'ci-dirty' : 'ci-clean');
|
||||
}
|
||||
|
||||
if (badge) {
|
||||
const isDirty = state.dirty || state.untracked > 0;
|
||||
badge.textContent = isDirty ? '●' : '✓';
|
||||
badge.className = 'ci-section-badge ' + (isDirty ? 'badge-warn' : 'badge-ok');
|
||||
}
|
||||
}
|
||||
|
||||
function pollGitState() {
|
||||
if (_ws && _ws.readyState === WebSocket.OPEN) {
|
||||
_ws.send(JSON.stringify({ type: 'git_status_request' }));
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Agent health
|
||||
// ---------------------------------------------------------------------------
|
||||
function updateAgentHealth(agentId, payload) {
|
||||
_agentHealth[agentId] = {
|
||||
status: payload.status || 'unknown',
|
||||
last_seen: Date.now(),
|
||||
model: payload.model || '',
|
||||
task: payload.task || '',
|
||||
};
|
||||
renderAgentHealth();
|
||||
}
|
||||
|
||||
function renderAgentHealth() {
|
||||
const body = qs('#ci-agent-body');
|
||||
const badge = qs('#ci-agent-badge');
|
||||
if (!body) return;
|
||||
|
||||
const agents = Object.entries(_agentHealth);
|
||||
if (badge) badge.textContent = agents.length;
|
||||
|
||||
if (agents.length === 0) {
|
||||
body.innerHTML = '<div class="ci-empty-hint">No agents registered</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
body.innerHTML = '';
|
||||
agents.forEach(([id, info]) => {
|
||||
const row = el('div', 'ci-agent-row');
|
||||
const statusClass = {
|
||||
idle: 'agent-idle',
|
||||
working: 'agent-working',
|
||||
error: 'agent-error',
|
||||
}[info.status] || 'agent-unknown';
|
||||
|
||||
row.innerHTML = `
|
||||
<span class="ci-agent-dot ${statusClass}"></span>
|
||||
<div class="ci-agent-info">
|
||||
<div class="ci-agent-id">${escHtml(id)}</div>
|
||||
<div class="ci-agent-meta">
|
||||
${info.model ? `<span class="ci-tag">${escHtml(info.model)}</span>` : ''}
|
||||
${info.task ? `<span class="ci-agent-task">${escHtml(info.task.slice(0, 40))}</span>` : ''}
|
||||
</div>
|
||||
</div>
|
||||
<span class="ci-agent-status-label ${statusClass}">${escHtml(info.status)}</span>
|
||||
`;
|
||||
body.appendChild(row);
|
||||
});
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Artifacts
|
||||
// ---------------------------------------------------------------------------
|
||||
function addArtifact(artifact) {
|
||||
// { name, type, path, ts }
|
||||
const existing = _artifacts.findIndex(a => a.path === artifact.path);
|
||||
if (existing >= 0) {
|
||||
_artifacts[existing] = artifact;
|
||||
} else {
|
||||
_artifacts.unshift(artifact);
|
||||
if (_artifacts.length > 50) _artifacts.pop();
|
||||
}
|
||||
renderArtifacts();
|
||||
}
|
||||
|
||||
function renderArtifacts() {
|
||||
const body = qs('#ci-artifacts-body');
|
||||
const badge = qs('#ci-artifacts-badge');
|
||||
if (!body) return;
|
||||
|
||||
if (badge) badge.textContent = _artifacts.length;
|
||||
|
||||
if (_artifacts.length === 0) {
|
||||
body.innerHTML = '<div class="ci-empty-hint">No artifacts tracked</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
body.innerHTML = '';
|
||||
_artifacts.slice(0, 20).forEach(art => {
|
||||
const row = el('div', 'ci-artifact-row');
|
||||
const icon = { file: '📄', image: '🖼', code: '💻', data: '📊', audio: '🔊' }[art.type] || '📎';
|
||||
row.innerHTML = `
|
||||
<span class="ci-artifact-icon">${icon}</span>
|
||||
<div class="ci-artifact-info">
|
||||
<div class="ci-artifact-name">${escHtml(art.name)}</div>
|
||||
${art.path ? `<div class="ci-artifact-path">${escHtml(art.path)}</div>` : ''}
|
||||
</div>
|
||||
<span class="ci-artifact-type ci-tag">${escHtml(art.type || '?')}</span>
|
||||
`;
|
||||
body.appendChild(row);
|
||||
});
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Memory / Skills
|
||||
// ---------------------------------------------------------------------------
|
||||
function updateMemoryRefs(refs) {
|
||||
// refs: [{ label, region, count }]
|
||||
_memRefs = refs;
|
||||
renderMemRefs();
|
||||
}
|
||||
|
||||
function renderMemRefs() {
|
||||
const body = qs('#ci-mem-body');
|
||||
const badge = qs('#ci-mem-badge');
|
||||
if (!body) return;
|
||||
|
||||
const total = _memRefs.reduce((s, r) => s + (r.count || 0), 0);
|
||||
if (badge) badge.textContent = total;
|
||||
|
||||
if (_memRefs.length === 0) {
|
||||
body.innerHTML = '<div class="ci-empty-hint">No memory regions active</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
body.innerHTML = '';
|
||||
_memRefs.forEach(ref => {
|
||||
const row = el('div', 'ci-mem-row');
|
||||
row.innerHTML = `
|
||||
<span class="ci-mem-region">${escHtml(ref.label || ref.region)}</span>
|
||||
<span class="ci-section-badge">${ref.count || 0}</span>
|
||||
`;
|
||||
body.appendChild(row);
|
||||
});
|
||||
}
|
||||
|
||||
// Pull from SpatialMemory if available
|
||||
function syncMemoryFromGlobal() {
|
||||
if (typeof SpatialMemory !== 'undefined' && SpatialMemory.getMemoryCountByRegion) {
|
||||
const counts = SpatialMemory.getMemoryCountByRegion();
|
||||
const regions = SpatialMemory.REGIONS || {};
|
||||
const refs = Object.entries(counts)
|
||||
.filter(([, c]) => c > 0)
|
||||
.map(([key, count]) => ({
|
||||
region: key,
|
||||
label: (regions[key] && regions[key].label) || key,
|
||||
count,
|
||||
}));
|
||||
updateMemoryRefs(refs);
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Session section (delegates to window.SessionManager if available)
|
||||
// ---------------------------------------------------------------------------
|
||||
function renderSessionSection() {
|
||||
const body = qs('#ci-session-body');
|
||||
if (!body) return;
|
||||
|
||||
const mgr = window.SessionManager;
|
||||
if (!mgr) {
|
||||
body.innerHTML = '<div class="ci-empty-hint">SessionManager not loaded</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
const sessions = mgr.list();
|
||||
if (sessions.length === 0) {
|
||||
body.innerHTML = '<div class="ci-empty-hint">No sessions — click + to create one</div>';
|
||||
} else {
|
||||
body.innerHTML = '';
|
||||
sessions.slice(0, 12).forEach(s => {
|
||||
const row = el('div', 'ci-session-row' + (mgr.getActive() === s.id ? ' active' : ''));
|
||||
row.dataset.id = s.id;
|
||||
row.innerHTML = `
|
||||
<div class="ci-session-info">
|
||||
<div class="ci-session-name">${escHtml(s.name)}</div>
|
||||
<div class="ci-session-meta">
|
||||
${s.pinned ? '<span class="ci-tag tag-pin">📌</span>' : ''}
|
||||
${s.archived ? '<span class="ci-tag tag-archive">🗄</span>' : ''}
|
||||
${(s.tags || []).map(t => `<span class="ci-tag">${escHtml(t)}</span>`).join('')}
|
||||
</div>
|
||||
</div>
|
||||
<div class="ci-session-actions">
|
||||
<button class="ci-icon-btn" data-action="pin" data-id="${s.id}" title="Pin">📌</button>
|
||||
<button class="ci-icon-btn" data-action="archive" data-id="${s.id}" title="Archive">🗄</button>
|
||||
</div>
|
||||
`;
|
||||
row.addEventListener('click', (e) => {
|
||||
if (e.target.dataset.action) {
|
||||
e.stopPropagation();
|
||||
handleSessionAction(e.target.dataset.action, e.target.dataset.id);
|
||||
} else {
|
||||
mgr.setActive(s.id);
|
||||
renderSessionSection();
|
||||
}
|
||||
});
|
||||
body.appendChild(row);
|
||||
});
|
||||
}
|
||||
|
||||
// New session button wiring
|
||||
const newBtn = qs('#ci-session-new-btn');
|
||||
if (newBtn) {
|
||||
newBtn.onclick = () => {
|
||||
const name = prompt('Session name:');
|
||||
if (name) { mgr.create(name); renderSessionSection(); }
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
function handleSessionAction(action, id) {
|
||||
const mgr = window.SessionManager;
|
||||
if (!mgr) return;
|
||||
if (action === 'pin') mgr.pin(id);
|
||||
if (action === 'archive') mgr.archive(id);
|
||||
renderSessionSection();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Terminal / PTY
|
||||
// ---------------------------------------------------------------------------
|
||||
function connectPty() {
|
||||
const mount = qs('#ci-terminal-mount');
|
||||
const statusEl = qs('#ci-terminal-status');
|
||||
const label = qs('#ci-term-status-label');
|
||||
const dot = statusEl ? statusEl.querySelector('.ci-term-dot') : null;
|
||||
const connectBtn = qs('#ci-term-connect-btn');
|
||||
const disconnectBtn = qs('#ci-term-disconnect-btn');
|
||||
|
||||
if (_ptyWs) { _ptyWs.close(); _ptyWs = null; }
|
||||
|
||||
// Require xterm.js
|
||||
if (typeof Terminal === 'undefined') {
|
||||
if (label) label.textContent = 'xterm.js not loaded — check CDN';
|
||||
return;
|
||||
}
|
||||
|
||||
if (mount) mount.style.display = 'block';
|
||||
if (connectBtn) connectBtn.style.display = 'none';
|
||||
if (disconnectBtn) disconnectBtn.style.display = '';
|
||||
|
||||
// Create or reuse terminal instance
|
||||
if (!_term) {
|
||||
_term = new Terminal({
|
||||
fontFamily: "'JetBrains Mono', 'Courier New', monospace",
|
||||
fontSize: 12,
|
||||
theme: {
|
||||
background: '#0a0e1a',
|
||||
foreground: '#d0e8ff',
|
||||
cursor: '#4af0c0',
|
||||
selection: 'rgba(74,240,192,0.2)',
|
||||
},
|
||||
cols: 80,
|
||||
rows: 18,
|
||||
});
|
||||
if (typeof FitAddon !== 'undefined') {
|
||||
_termFitAddon = new FitAddon.FitAddon();
|
||||
_term.loadAddon(_termFitAddon);
|
||||
}
|
||||
_term.open(mount);
|
||||
if (_termFitAddon) _termFitAddon.fit();
|
||||
}
|
||||
|
||||
// Connect to PTY WebSocket
|
||||
if (dot) { dot.className = 'ci-term-dot connecting'; }
|
||||
if (label) label.textContent = 'Connecting to PTY…';
|
||||
|
||||
_ptyWs = new WebSocket(`ws://127.0.0.1:${PTY_WS_PORT}/pty`);
|
||||
_ptyWs.binaryType = 'arraybuffer';
|
||||
|
||||
_ptyWs.onopen = () => {
|
||||
if (dot) dot.className = 'ci-term-dot connected';
|
||||
if (label) label.textContent = 'Connected — local PTY';
|
||||
_term.writeln('\x1b[32mConnected to Nexus PTY gateway.\x1b[0m');
|
||||
// Forward keystrokes
|
||||
_term.onData(data => {
|
||||
if (_ptyWs && _ptyWs.readyState === WebSocket.OPEN) {
|
||||
_ptyWs.send(data);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
_ptyWs.onmessage = (ev) => {
|
||||
const text = (ev.data instanceof ArrayBuffer)
|
||||
? new TextDecoder().decode(ev.data)
|
||||
: ev.data;
|
||||
if (_term) _term.write(text);
|
||||
};
|
||||
|
||||
_ptyWs.onclose = () => {
|
||||
if (dot) dot.className = 'ci-term-dot disconnected';
|
||||
if (label) label.textContent = 'Disconnected';
|
||||
if (connectBtn) connectBtn.style.display = '';
|
||||
if (disconnectBtn) disconnectBtn.style.display = 'none';
|
||||
if (_term) _term.writeln('\x1b[31m[PTY connection closed]\x1b[0m');
|
||||
};
|
||||
|
||||
_ptyWs.onerror = () => {
|
||||
if (label) label.textContent = 'Connection error — is server.py running?';
|
||||
if (dot) dot.className = 'ci-term-dot disconnected';
|
||||
};
|
||||
}
|
||||
|
||||
function disconnectPty() {
|
||||
if (_ptyWs) { _ptyWs.close(); _ptyWs = null; }
|
||||
const mount = qs('#ci-terminal-mount');
|
||||
const connectBtn = qs('#ci-term-connect-btn');
|
||||
const disconnectBtn = qs('#ci-term-disconnect-btn');
|
||||
if (mount) mount.style.display = 'none';
|
||||
if (connectBtn) connectBtn.style.display = '';
|
||||
if (disconnectBtn) disconnectBtn.style.display = 'none';
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Main gateway WebSocket integration
|
||||
// ---------------------------------------------------------------------------
|
||||
function hookMainWs() {
|
||||
// Wait for the global `nexusWs` or `ws` to be available
|
||||
let attempts = 0;
|
||||
const probe = setInterval(() => {
|
||||
const candidate = window.nexusWs || window.ws;
|
||||
if (candidate && candidate.readyState <= 1) {
|
||||
_ws = candidate;
|
||||
clearInterval(probe);
|
||||
_ws.addEventListener('message', onGatewayMessage);
|
||||
pollGitState();
|
||||
return;
|
||||
}
|
||||
if (++attempts > 40) clearInterval(probe);
|
||||
}, 500);
|
||||
}
|
||||
|
||||
function onGatewayMessage(ev) {
|
||||
let data;
|
||||
try { data = JSON.parse(ev.data); } catch { return; }
|
||||
|
||||
switch (data.type) {
|
||||
case 'git_status':
|
||||
updateGitUI({
|
||||
branch: data.branch || '—',
|
||||
dirty: !!data.dirty,
|
||||
untracked: data.untracked || 0,
|
||||
ahead: data.ahead || 0,
|
||||
});
|
||||
break;
|
||||
|
||||
case 'agent_register':
|
||||
case 'agent_health':
|
||||
if (data.agent_id) updateAgentHealth(data.agent_id, data);
|
||||
break;
|
||||
|
||||
case 'thought':
|
||||
case 'action':
|
||||
if (data.agent_id) {
|
||||
updateAgentHealth(data.agent_id, {
|
||||
status: 'working',
|
||||
task: data.content || data.action || '',
|
||||
model: _agentHealth[data.agent_id]?.model || '',
|
||||
});
|
||||
}
|
||||
break;
|
||||
|
||||
case 'artifact':
|
||||
if (data.name) addArtifact({
|
||||
name: data.name,
|
||||
type: data.artifact_type || 'file',
|
||||
path: data.path || '',
|
||||
ts: Date.now(),
|
||||
});
|
||||
break;
|
||||
|
||||
case 'memory_update':
|
||||
if (Array.isArray(data.refs)) updateMemoryRefs(data.refs);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Refresh all
|
||||
// ---------------------------------------------------------------------------
|
||||
function refreshAll() {
|
||||
pollGitState();
|
||||
syncMemoryFromGlobal();
|
||||
renderSessionSection();
|
||||
renderAgentHealth();
|
||||
renderArtifacts();
|
||||
renderMemRefs();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Wire up buttons after DOM build
|
||||
// ---------------------------------------------------------------------------
|
||||
function wireTerminalButtons() {
|
||||
const connectBtn = qs('#ci-term-connect-btn');
|
||||
const disconnectBtn = qs('#ci-term-disconnect-btn');
|
||||
if (connectBtn) connectBtn.addEventListener('click', connectPty);
|
||||
if (disconnectBtn) disconnectBtn.addEventListener('click', disconnectPty);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Utilities
|
||||
// ---------------------------------------------------------------------------
|
||||
function escHtml(s) {
|
||||
return String(s)
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"');
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Init
|
||||
// ---------------------------------------------------------------------------
|
||||
function init() {
|
||||
if (qs('#cockpit-inspector')) return; // already mounted
|
||||
|
||||
buildRail();
|
||||
wireTerminalButtons();
|
||||
hookMainWs();
|
||||
|
||||
// Poll git state periodically
|
||||
setInterval(pollGitState, GIT_POLL_MS);
|
||||
|
||||
// Sync memory from global SpatialMemory periodically
|
||||
setInterval(syncMemoryFromGlobal, 8_000);
|
||||
|
||||
// Initial session render
|
||||
renderSessionSection();
|
||||
|
||||
// Expose public API
|
||||
window.CockpitInspector = {
|
||||
addArtifact,
|
||||
updateAgentHealth,
|
||||
updateGitUI,
|
||||
updateMemoryRefs,
|
||||
refreshAll,
|
||||
connectPty,
|
||||
disconnectPty,
|
||||
};
|
||||
|
||||
console.info('[CockpitInspector] Operator rail mounted.');
|
||||
}
|
||||
|
||||
// Boot after DOM is ready
|
||||
if (document.readyState === 'loading') {
|
||||
document.addEventListener('DOMContentLoaded', init);
|
||||
} else {
|
||||
// Defer slightly so app.js/boot.js finish their own init first
|
||||
setTimeout(init, 300);
|
||||
}
|
||||
})();
|
||||
@@ -1,84 +0,0 @@
|
||||
# ADR-001 — Shell / Terminal Boundary and Transport Model
|
||||
|
||||
**Status:** Accepted
|
||||
**Date:** 2026-04-22
|
||||
**Issue:** [#1695 — ATLAS Cockpit: operator inspector rail and session shell patterns](https://forge.alexanderwhitestone.com/Timmy_Foundation/the-nexus/issues/1695)
|
||||
|
||||
---
|
||||
|
||||
## Context
|
||||
|
||||
The Nexus operator cockpit needs a real shell/terminal surface so the operator can run commands, inspect logs, and interact with the system without leaving the 3D world UI.
|
||||
|
||||
Three transport models were evaluated:
|
||||
|
||||
| Option | Description |
|
||||
|---|---|
|
||||
| **A. Native local PTY** | `server.py` spawns a PTY via Python's `pty` stdlib module; the browser connects via WebSocket on `ws://127.0.0.1:8766/pty` |
|
||||
| **B. Remote SSH PTY** | Browser connects to an SSH relay that opens a PTY on a remote machine |
|
||||
| **C. Browser pseudo-terminal** | Pure JavaScript terminal emulation (e.g., a custom REPL) with no real OS shell |
|
||||
|
||||
---
|
||||
|
||||
## Decision
|
||||
|
||||
**Option A — Native local PTY** is chosen.
|
||||
|
||||
The Nexus is explicitly a **local-first** system (CLAUDE.md: "local-first training ground for Timmy"). The operator is the same person sitting at the machine. A local PTY bridged through `server.py` is:
|
||||
|
||||
- Architecturally consistent with the existing `server.py` WebSocket gateway
|
||||
- Zero additional infrastructure (no SSH relay, no remote server)
|
||||
- Full shell fidelity — any tool on the operator's PATH, full interactive programs, readline, color, etc.
|
||||
- Bounded: PTY_PORT (8766) binds to `127.0.0.1` only; no external exposure
|
||||
|
||||
---
|
||||
|
||||
## Transport Detail
|
||||
|
||||
```
|
||||
Browser (xterm.js) ←→ ws://127.0.0.1:8766/pty ←→ server.py pty_handler ←→ OS PTY ($SHELL)
|
||||
```
|
||||
|
||||
- Each WebSocket connection gets its own `pty.openpty()` pair and subprocess.
|
||||
- Input from xterm.js `onData` → `_ptyWs.send(data)` → `os.write(master_fd, data)`
|
||||
- Output from PTY → `os.read(master_fd)` → `websocket.send(text)` → `_term.write(text)`
|
||||
- Resize messages (`{"type":"resize","cols":N,"rows":N}`) can be added later via `fcntl.ioctl(TIOCSWINSZ)`.
|
||||
|
||||
---
|
||||
|
||||
## Why not Option B (Remote SSH PTY)?
|
||||
|
||||
Remote SSH adds network hop complexity, credential management, and an SSH relay service. The Nexus does not currently have a remote operator use-case; Alexander operates locally. This decision can be revisited when fleet/remote-agent use-cases mature (see issues #672–#675).
|
||||
|
||||
---
|
||||
|
||||
## Why not Option C (Browser pseudo-terminal)?
|
||||
|
||||
A JavaScript REPL cannot run arbitrary shell programs, manage processes, or provide the raw interactive shell experience that operators expect. It would be a toy, not a tool.
|
||||
|
||||
---
|
||||
|
||||
## Rejected Patterns
|
||||
|
||||
- **tmux over WebSocket** — adds server-side state complexity without enough benefit at this scale
|
||||
- **ttyd** — external binary dependency; overkill for a local-first single-operator setup
|
||||
- **xterm.js + websocketd** — external binary dependency; `server.py` already owns the WebSocket gateway
|
||||
|
||||
---
|
||||
|
||||
## Consequences
|
||||
|
||||
- `server.py` now starts two WebSocket servers: `PORT` (8765, main gateway) and `PTY_PORT` (8766, shell gateway)
|
||||
- `PTY_PORT` always binds to `127.0.0.1` regardless of `NEXUS_WS_HOST`
|
||||
- `cockpit-inspector.js` loads xterm.js from CDN (offline fallback: graceful degradation — the rail renders without the terminal pane)
|
||||
- PTY sessions are ephemeral (no persistence across browser reload or server restart)
|
||||
- Future: add TIOCSWINSZ resize support; add `/pty?shell=zsh` query param selection
|
||||
|
||||
---
|
||||
|
||||
## Related
|
||||
|
||||
- `cockpit-inspector.js` — implements the browser side (xterm.js + WebSocket)
|
||||
- `server.py` — implements `pty_handler()` and `_get_git_status()`
|
||||
- `docs/ATLAS-COCKPIT-PATTERNS.md` — documents source patterns adopted
|
||||
- Issues: #1695, #686, #687
|
||||
@@ -1,125 +0,0 @@
|
||||
# ATLAS Cockpit — Source Patterns: Adopted, Adapted, and Rejected
|
||||
|
||||
**Issue:** [#1695](https://forge.alexanderwhitestone.com/Timmy_Foundation/the-nexus/issues/1695)
|
||||
**Date:** 2026-04-22
|
||||
|
||||
---
|
||||
|
||||
## Source Repos Audited
|
||||
|
||||
| Repo | Role in audit |
|
||||
|---|---|
|
||||
| `dodo-reach/hermes-desktop` | Primary pattern source for inspector/right rail layout |
|
||||
| `outsourc-e/hermes-workspace` | Session taxonomy vocabulary (group/tag/pin/archive) |
|
||||
| `nesquena/hermes-webui` | Session switcher UI patterns; status badge styling |
|
||||
|
||||
---
|
||||
|
||||
## Patterns Adopted
|
||||
|
||||
### 1. Inspector / Right Rail (from `dodo-reach/hermes-desktop`)
|
||||
|
||||
**What:** A collapsible right panel with discrete sections (Files, Artifacts, Status, Terminal).
|
||||
Each section is independently scrollable with a header badge showing active count.
|
||||
|
||||
**How we adopted it:**
|
||||
- `cockpit-inspector.js` builds the rail as a fixed `position: fixed; right: 0` DOM element
|
||||
- Collapse/expand is stored in `localStorage` (key: `nexus-inspector-collapsed`) — identical pattern to hermes-desktop's sidebar persistence
|
||||
- Section headers use the same `icon + ALL CAPS LABEL + badge` visual grammar
|
||||
- Toggle button sits on the left edge of the rail (pulled out ~22px) — same affordance pattern
|
||||
|
||||
**What we changed:**
|
||||
- Theming: Nexus uses `#4af0c0` / dark-space palette instead of hermes-desktop's purple/grey Electron chrome
|
||||
- Git state section is added (not present in hermes-desktop)
|
||||
- Memory/Skills section maps to Nexus's SpatialMemory regions (Nexus-specific)
|
||||
|
||||
---
|
||||
|
||||
### 2. Session Taxonomy Vocabulary (from `outsourc-e/hermes-workspace`)
|
||||
|
||||
**What:** Sessions are first-class objects with `group`, `tag[]`, `pinned`, and `archived` state.
|
||||
Pinned sessions always sort first. Archived sessions are hidden from default lists.
|
||||
|
||||
**How we adopted it:**
|
||||
- `session-manager.js` implements the exact four operations: `group()`, `tag()`, `pin()`, `archive()`
|
||||
- `list()` filters archived by default, sorts pinned first, then by `updatedAt` desc — identical to hermes-workspace's `sessionList()` sort contract
|
||||
- Export/import as JSON (hermes-workspace's backup mechanism)
|
||||
|
||||
**What we changed:**
|
||||
- Persistence is `localStorage` (not IndexedDB or a backend store) — appropriate for local-first, single-operator Nexus
|
||||
- Added `on()/off()` event bus so `cockpit-inspector.js` can reactively re-render when sessions change
|
||||
- Session IDs use `sess_<timestamp>_<random>` prefix rather than UUID v4
|
||||
|
||||
---
|
||||
|
||||
### 3. Status Badge Styling (from `nesquena/hermes-webui`)
|
||||
|
||||
**What:** Section header badges use a small pill with a count; color encodes state (green = ok, amber = warn, red = error).
|
||||
|
||||
**How we adopted it:**
|
||||
- `.ci-section-badge`, `.badge-warn`, `.badge-ok` classes in `style.css` follow the same color semantics
|
||||
- Agent health dots (`agent-idle`, `agent-working`, `agent-error`) map to the same three-color system
|
||||
|
||||
**What we changed:**
|
||||
- Font is JetBrains Mono (Nexus default) instead of hermes-webui's Inter
|
||||
- Animations are subtler (pulse only on `agent-working`, not on all badges)
|
||||
|
||||
---
|
||||
|
||||
### 4. xterm.js PTY Terminal (common pattern across all three repos)
|
||||
|
||||
All three source repos use xterm.js as the browser terminal component. The transport varies:
|
||||
- hermes-desktop: IPC bridge to a native Node.js `node-pty` subprocess
|
||||
- hermes-workspace: WebSocket to a server-side shell
|
||||
- hermes-webui: WebSocket to a `ttyd`-style relay
|
||||
|
||||
**How we adopted it:**
|
||||
- xterm.js 5.3.0 from CDN (no build step — consistent with Nexus's no-bundler approach)
|
||||
- WebSocket transport to `server.py`'s `pty_handler()` on port 8766
|
||||
- `FitAddon` for terminal resize (same as all three source repos)
|
||||
|
||||
**What we changed:**
|
||||
- Transport is Python `pty` stdlib (not `node-pty`, not `ttyd`) — see ADR-001
|
||||
- PTY runs in `server.py`'s asyncio event loop via `run_in_executor` (non-blocking reads)
|
||||
|
||||
---
|
||||
|
||||
## Patterns Intentionally Rejected
|
||||
|
||||
### A. Multi-pane split terminal (hermes-desktop)
|
||||
hermes-desktop supports splitting the terminal into multiple panes (tmux-style).
|
||||
**Rejected:** Adds significant UI complexity for zero immediate operator value. The Nexus operator uses native terminal splits in their OS. One PTY pane is sufficient.
|
||||
|
||||
### B. Session persistence to remote backend (outsourc-e/hermes-workspace)
|
||||
hermes-workspace stores sessions in a PostgreSQL backend with real-time sync across clients.
|
||||
**Rejected:** The Nexus is local-first and single-operator. `localStorage` is sufficient and adds zero infrastructure.
|
||||
|
||||
### C. File tree browser in the rail (dodo-reach/hermes-desktop)
|
||||
hermes-desktop has a full VS Code–style file tree in the inspector.
|
||||
**Rejected:** The Nexus 3D world is not a code editor. Artifacts are surfaced as a flat list of recently-touched files/outputs, not a tree. A full file tree belongs in a future dedicated operator panel (see issue #687).
|
||||
|
||||
### D. Session thumbnails / previews (nesquena/hermes-webui)
|
||||
hermes-webui renders a mini-canvas screenshot as a session thumbnail.
|
||||
**Rejected:** The Nexus Three.js canvas is expensive to snapshot. Thumbnails would require canvas-capture overhead. Deferred to a future issue.
|
||||
|
||||
### E. Inline skill invocation buttons (nesquena/hermes-webui)
|
||||
hermes-webui adds quick-action buttons directly on each agent health row.
|
||||
**Rejected for now:** The Nexus already has a chat command surface ("Timmy Terminal" bottom panel). Duplicating invocation paths would fragment the operator model. The inspector rail is read-focused; actions flow through chat.
|
||||
|
||||
---
|
||||
|
||||
## Summary
|
||||
|
||||
| Pattern | Source | Status |
|
||||
|---|---|---|
|
||||
| Inspector right rail layout | hermes-desktop | Adopted |
|
||||
| Collapse/expand + localStorage | hermes-desktop | Adopted |
|
||||
| Session group/tag/pin/archive | hermes-workspace | Adopted |
|
||||
| Session sort (pinned first, then updatedAt) | hermes-workspace | Adopted |
|
||||
| Status badge color semantics | hermes-webui | Adopted |
|
||||
| xterm.js terminal | all three | Adopted (transport adapted) |
|
||||
| Multi-pane terminal | hermes-desktop | Rejected |
|
||||
| Remote session backend | hermes-workspace | Rejected |
|
||||
| File tree browser | hermes-desktop | Rejected |
|
||||
| Session thumbnails | hermes-webui | Rejected |
|
||||
| Inline skill invocation | hermes-webui | Rejected |
|
||||
268
docs/nostr-event-visualizer.md
Normal file
268
docs/nostr-event-visualizer.md
Normal file
@@ -0,0 +1,268 @@
|
||||
# Nostr Event Stream Visualization
|
||||
|
||||
**Issue:** #874 - [NEXUS] Implement Nostr Event Stream Visualization
|
||||
|
||||
## Overview
|
||||
|
||||
Visualize incoming Nostr events as data streams or particles flowing through the Nexus, representing the agent's connection to the wider mesh.
|
||||
|
||||
## Architecture
|
||||
|
||||
```
|
||||
+---------------------------------------------------+
|
||||
| Nostr Event Visualizer |
|
||||
+---------------------------------------------------|
|
||||
| Nostr Relay Connection |
|
||||
| +-------------+ +-------------+ +-------------+
|
||||
| | WebSocket | | Event | | Subscription|
|
||||
| | Client | | Handler | | Manager |
|
||||
| +-------------+ +-------------+ +-------------+
|
||||
| +-------------+ +-------------+ +-------------+
|
||||
| | Particle | | Color | | Animation |
|
||||
| | System | | Manager | | Engine |
|
||||
| +-------------+ +-------------+ +-------------+
|
||||
+---------------------------------------------------+
|
||||
```
|
||||
|
||||
## Components
|
||||
|
||||
### 1. Nostr Event Visualizer (`js/nostr-event-visualizer.js`)
|
||||
Main visualization class for Nostr events.
|
||||
|
||||
**Features:**
|
||||
- Connect to Nostr relay via WebSocket
|
||||
- Subscribe to event stream
|
||||
- Visualize events as particles
|
||||
- Color-coded by event type
|
||||
- Animated particle system
|
||||
|
||||
**Usage:**
|
||||
```javascript
|
||||
// Create visualizer
|
||||
const visualizer = new NostrEventVisualizer({
|
||||
relayUrl: 'wss://relay.nostr.info',
|
||||
maxEvents: 100,
|
||||
particleCount: 50,
|
||||
streamSpeed: 1.0
|
||||
});
|
||||
|
||||
// Initialize with Three.js scene
|
||||
visualizer.init(scene, camera, renderer);
|
||||
|
||||
// Connect to Nostr relay
|
||||
visualizer.connect();
|
||||
|
||||
// Update visualization
|
||||
visualizer.update(deltaTime);
|
||||
```
|
||||
|
||||
### 2. Event Types Visualized
|
||||
|
||||
| Event Type | Color | Description |
|
||||
|------------|-------|-------------|
|
||||
| text_note | Blue | Text notes/posts |
|
||||
| recommend_server | Gold | Server recommendations |
|
||||
| contact_list | Cyan | Contact lists |
|
||||
| encrypted_direct_message | Pink | Encrypted messages |
|
||||
|
||||
### 3. Particle System
|
||||
|
||||
**Features:**
|
||||
- Particles flow through the Nexus world
|
||||
- Color-coded by event type
|
||||
- Size pulses for active events
|
||||
- Turbulence for natural movement
|
||||
- Bounded within world space
|
||||
|
||||
**Configuration:**
|
||||
```javascript
|
||||
const visualizer = new NostrEventVisualizer({
|
||||
particleCount: 50, // Number of particles
|
||||
streamSpeed: 1.0, // Flow speed
|
||||
particleSize: 0.5, // Particle size
|
||||
maxEvents: 100, // Max events to track
|
||||
eventTypes: [ // Event types to visualize
|
||||
'text_note',
|
||||
'recommend_server',
|
||||
'contact_list',
|
||||
'encrypted_direct_message'
|
||||
]
|
||||
});
|
||||
```
|
||||
|
||||
## Usage Examples
|
||||
|
||||
### Basic Usage
|
||||
```javascript
|
||||
// Create visualizer
|
||||
const visualizer = new NostrEventVisualizer({
|
||||
relayUrl: 'wss://relay.nostr.info'
|
||||
});
|
||||
|
||||
// Initialize with Three.js
|
||||
visualizer.init(scene, camera, renderer);
|
||||
|
||||
// Connect to relay
|
||||
visualizer.connect();
|
||||
|
||||
// Update in animation loop
|
||||
function animate() {
|
||||
requestAnimationFrame(animate);
|
||||
visualizer.update(1/60); // 60 FPS
|
||||
renderer.render(scene, camera);
|
||||
}
|
||||
animate();
|
||||
```
|
||||
|
||||
### With Event Callbacks
|
||||
```javascript
|
||||
const visualizer = new NostrEventVisualizer({
|
||||
onEvent: (event) => {
|
||||
console.log('New event:', event.kind, event.content);
|
||||
},
|
||||
onConnect: () => {
|
||||
console.log('Connected to Nostr relay');
|
||||
},
|
||||
onDisconnect: () => {
|
||||
console.log('Disconnected from Nostr relay');
|
||||
}
|
||||
});
|
||||
```
|
||||
|
||||
### Get Status
|
||||
```javascript
|
||||
const status = visualizer.getStatus();
|
||||
console.log('Connected:', status.connected);
|
||||
console.log('Events:', status.eventCount);
|
||||
console.log('Particles:', status.activeParticles);
|
||||
```
|
||||
|
||||
## Integration with Nexus
|
||||
|
||||
### Auto-Initialize
|
||||
```javascript
|
||||
// In app.js or initialization code
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
// Wait for Three.js scene to be ready
|
||||
if (window.scene && window.camera && window.renderer) {
|
||||
const visualizer = new NostrEventVisualizer();
|
||||
visualizer.init(window.scene, window.camera, window.renderer);
|
||||
visualizer.connect();
|
||||
|
||||
// Store globally
|
||||
window.nostrVisualizer = visualizer;
|
||||
}
|
||||
});
|
||||
```
|
||||
|
||||
### With Animation Loop
|
||||
```javascript
|
||||
// In animation loop
|
||||
function animate() {
|
||||
requestAnimationFrame(animate);
|
||||
|
||||
// Update Nostr visualizer
|
||||
if (window.nostrVisualizer) {
|
||||
window.nostrVisualizer.update(1/60);
|
||||
}
|
||||
|
||||
// Render scene
|
||||
renderer.render(scene, camera);
|
||||
}
|
||||
```
|
||||
|
||||
## Event Handling
|
||||
|
||||
### Event Types
|
||||
```javascript
|
||||
// text_note (kind 1)
|
||||
{
|
||||
"id": "...",
|
||||
"pubkey": "...",
|
||||
"created_at": 1234567890,
|
||||
"kind": 1,
|
||||
"tags": [],
|
||||
"content": "Hello Nostr!",
|
||||
"sig": "..."
|
||||
}
|
||||
|
||||
// recommend_server (kind 2)
|
||||
{
|
||||
"id": "...",
|
||||
"pubkey": "...",
|
||||
"created_at": 1234567890,
|
||||
"kind": 2,
|
||||
"tags": [],
|
||||
"content": "wss://relay.example.com",
|
||||
"sig": "..."
|
||||
}
|
||||
|
||||
// contact_list (kind 3)
|
||||
{
|
||||
"id": "...",
|
||||
"pubkey": "...",
|
||||
"created_at": 1234567890,
|
||||
"kind": 3,
|
||||
"tags": [["p", "pubkey1"], ["p", "pubkey2"]],
|
||||
"content": "",
|
||||
"sig": "..."
|
||||
}
|
||||
|
||||
// encrypted_direct_message (kind 4)
|
||||
{
|
||||
"id": "...",
|
||||
"pubkey": "...",
|
||||
"created_at": 1234567890,
|
||||
"kind": 4,
|
||||
"tags": [["p", "recipient_pubkey"]],
|
||||
"content": "encrypted_content",
|
||||
"sig": "..."
|
||||
}
|
||||
```
|
||||
|
||||
## Testing
|
||||
|
||||
### Unit Tests
|
||||
```bash
|
||||
node --test tests/test_nostr_visualizer.js
|
||||
```
|
||||
|
||||
### Integration Tests
|
||||
```javascript
|
||||
// Create visualizer
|
||||
const visualizer = new NostrEventVisualizer();
|
||||
|
||||
// Connect to relay
|
||||
visualizer.connect();
|
||||
|
||||
// Check status
|
||||
const status = visualizer.getStatus();
|
||||
assert(status.connected === true);
|
||||
|
||||
// Update visualization
|
||||
visualizer.update(1/60);
|
||||
|
||||
// Disconnect
|
||||
visualizer.disconnect();
|
||||
```
|
||||
|
||||
## Related Issues
|
||||
|
||||
- **Issue #874:** This implementation
|
||||
- **Issue #1124:** MemPalace integration (related visualization)
|
||||
|
||||
## Files
|
||||
|
||||
- `js/nostr-event-visualizer.js` - Main visualization module
|
||||
- `docs/nostr-event-visualizer.md` - This documentation
|
||||
- `tests/test_nostr_visualizer.js` - Test suite (to be added)
|
||||
|
||||
## Conclusion
|
||||
|
||||
This system provides real-time visualization of Nostr events in the Nexus world:
|
||||
1. **Connection** to Nostr relays via WebSocket
|
||||
2. **Visualization** of events as colored particles
|
||||
3. **Animation** with turbulence and pulsing
|
||||
4. **Integration** with Three.js scene
|
||||
|
||||
**Ready for production use.**
|
||||
@@ -1,64 +0,0 @@
|
||||
# M1: The Stop Protocol
|
||||
|
||||
Refs: the-nexus #844, Epic #842
|
||||
|
||||
## Purpose
|
||||
|
||||
Make `Stop` an unbreakable hard interrupt for all agentic systems in the fleet.
|
||||
|
||||
## Components
|
||||
|
||||
### 1. Pre-tool-check gate
|
||||
|
||||
Every tool execution must pass through `StopProtocol.pre_tool_check(session_id)`.
|
||||
If a stop command is active for that session, `StopInterrupt` is raised and the
|
||||
tool call is blocked.
|
||||
|
||||
### 2. STOP_ACK logging
|
||||
|
||||
Every stop command is durably logged to `~/.hermes/stop_ack_log.jsonl` with:
|
||||
- timestamp (ISO-8601 UTC)
|
||||
- source (who issued the stop)
|
||||
- session_id
|
||||
- reason
|
||||
|
||||
The log is append-only and readable via `read_ack_log()`.
|
||||
|
||||
### 3. Hands-off registry
|
||||
|
||||
Stopped entities are added to `~/.hermes/hands_off_registry.json` with a
|
||||
time-bounded lock (default 24 hours). Any attempt to modify a hands-off entity
|
||||
must first check `is_hands_off(entity)`.
|
||||
|
||||
The registry auto-expires entries when their lock time passes.
|
||||
|
||||
### 4. Full stop
|
||||
|
||||
`full_stop(session_id, entity)` combines ack + hands-off in one atomic call.
|
||||
|
||||
## Usage
|
||||
|
||||
```python
|
||||
from nexus.stop_protocol import StopProtocol
|
||||
|
||||
sp = StopProtocol()
|
||||
|
||||
# Before every tool call:
|
||||
sp.pre_tool_check(session_id="sess_123")
|
||||
|
||||
# When user says "Stop":
|
||||
sp.full_stop(session_id="sess_123", entity="ezra", reason="explicit halt")
|
||||
|
||||
# Before modifying any system:
|
||||
if sp.is_hands_off("ezra"):
|
||||
raise HandsOffError("ezra is locked — do not touch.")
|
||||
```
|
||||
|
||||
## Compliance
|
||||
|
||||
100% test coverage enforced by `tests/test_stop_protocol.py` (20 tests).
|
||||
Run locally:
|
||||
|
||||
```bash
|
||||
python3 -m pytest tests/test_stop_protocol.py -v
|
||||
```
|
||||
@@ -394,16 +394,10 @@
|
||||
<div id="memory-inspect-panel" class="memory-inspect-panel" style="display:none;" aria-label="Memory Inspect Panel"></div>
|
||||
<div id="memory-connections-panel" class="memory-connections-panel" style="display:none;" aria-label="Memory Connections Panel"></div>
|
||||
|
||||
<!-- xterm.js for operator PTY terminal (cockpit inspector rail) — issue #1695 -->
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm@5.3.0/css/xterm.css" crossorigin="anonymous">
|
||||
<script src="https://cdn.jsdelivr.net/npm/xterm@5.3.0/lib/xterm.js" crossorigin="anonymous"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.8.0/lib/xterm-addon-fit.js" crossorigin="anonymous"></script>
|
||||
<script src="./session-manager.js"></script>
|
||||
<script src="./boot.js"></script>
|
||||
<script src="./js/nostr-event-visualizer.js"></script>
|
||||
<script src="./avatar-customization.js"></script>
|
||||
<script src="./lod-system.js"></script>
|
||||
<script src="./portal-hot-reload.js"></script>
|
||||
<script src="./cockpit-inspector.js"></script>
|
||||
<script>
|
||||
function openMemoryFilter() { renderFilterList(); document.getElementById('memory-filter').style.display = 'flex'; }
|
||||
function closeMemoryFilter() { document.getElementById('memory-filter').style.display = 'none'; }
|
||||
|
||||
456
js/nostr-event-visualizer.js
Normal file
456
js/nostr-event-visualizer.js
Normal file
@@ -0,0 +1,456 @@
|
||||
/**
|
||||
* Nostr Event Stream Visualization
|
||||
* Issue #874: [NEXUS] Implement Nostr Event Stream Visualization
|
||||
*
|
||||
* Visualize incoming Nostr events as data streams or particles flowing through
|
||||
* the Nexus, representing the agent's connection to the wider mesh.
|
||||
*/
|
||||
|
||||
class NostrEventVisualizer {
|
||||
constructor(options = {}) {
|
||||
this.relayUrl = options.relayUrl || 'wss://relay.nostr.info';
|
||||
this.maxEvents = options.maxEvents || 100;
|
||||
this.particleCount = options.particleCount || 50;
|
||||
this.streamSpeed = options.streamSpeed || 1.0;
|
||||
this.particleSize = options.particleSize || 0.5;
|
||||
|
||||
this.ws = null;
|
||||
this.events = [];
|
||||
this.particles = [];
|
||||
this.scene = null;
|
||||
this.camera = null;
|
||||
this.renderer = null;
|
||||
|
||||
this.isConnected = false;
|
||||
this.reconnectAttempts = 0;
|
||||
this.maxReconnectAttempts = 5;
|
||||
|
||||
// Callbacks
|
||||
this.onEvent = options.onEvent || (() => {});
|
||||
this.onConnect = options.onConnect || (() => {});
|
||||
this.onDisconnect = options.onDisconnect || (() => {});
|
||||
this.onError = options.onError || console.error;
|
||||
|
||||
// Event types to visualize
|
||||
this.eventTypes = options.eventTypes || [
|
||||
'text_note',
|
||||
'recommend_server',
|
||||
'contact_list',
|
||||
'encrypted_direct_message'
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize the visualization
|
||||
*/
|
||||
init(scene, camera, renderer) {
|
||||
this.scene = scene;
|
||||
this.camera = camera;
|
||||
this.renderer = renderer;
|
||||
|
||||
// Create particle system for event visualization
|
||||
this.createParticleSystem();
|
||||
|
||||
console.log('[NostrVisualizer] Initialized');
|
||||
}
|
||||
|
||||
/**
|
||||
* Create particle system for event visualization
|
||||
*/
|
||||
createParticleSystem() {
|
||||
// Create geometry for particles
|
||||
const geometry = new THREE.BufferGeometry();
|
||||
const positions = new Float32Array(this.particleCount * 3);
|
||||
const colors = new Float32Array(this.particleCount * 3);
|
||||
const sizes = new Float32Array(this.particleCount);
|
||||
|
||||
// Initialize particles
|
||||
for (let i = 0; i < this.particleCount; i++) {
|
||||
// Random position in a sphere
|
||||
const theta = Math.random() * Math.PI * 2;
|
||||
const phi = Math.acos(2 * Math.random() - 1);
|
||||
const r = 50 + Math.random() * 50;
|
||||
|
||||
positions[i * 3] = r * Math.sin(phi) * Math.cos(theta);
|
||||
positions[i * 3 + 1] = r * Math.sin(phi) * Math.sin(theta);
|
||||
positions[i * 3 + 2] = r * Math.cos(phi);
|
||||
|
||||
// Color based on event type
|
||||
colors[i * 3] = 0.3; // R
|
||||
colors[i * 3 + 1] = 0.8; // G
|
||||
colors[i * 3 + 2] = 1.0; // B
|
||||
|
||||
sizes[i] = this.particleSize;
|
||||
|
||||
// Store particle data
|
||||
this.particles.push({
|
||||
index: i,
|
||||
x: positions[i * 3],
|
||||
y: positions[i * 3 + 1],
|
||||
z: positions[i * 3 + 2],
|
||||
vx: (Math.random() - 0.5) * 0.1,
|
||||
vy: (Math.random() - 0.5) * 0.1,
|
||||
vz: (Math.random() - 0.5) * 0.1,
|
||||
color: { r: 0.3, g: 0.8, b: 1.0 },
|
||||
size: this.particleSize,
|
||||
event: null
|
||||
});
|
||||
}
|
||||
|
||||
geometry.setAttribute('position', new THREE.BufferAttribute(positions, 3));
|
||||
geometry.setAttribute('color', new THREE.BufferAttribute(colors, 3));
|
||||
geometry.setAttribute('size', new THREE.BufferAttribute(sizes, 1));
|
||||
|
||||
// Create material
|
||||
const material = new THREE.PointsMaterial({
|
||||
size: this.particleSize,
|
||||
vertexColors: true,
|
||||
transparent: true,
|
||||
opacity: 0.8,
|
||||
blending: THREE.AdditiveBlending
|
||||
});
|
||||
|
||||
// Create points
|
||||
this.particleSystem = new THREE.Points(geometry, material);
|
||||
this.scene.add(this.particleSystem);
|
||||
|
||||
console.log('[NostrVisualizer] Particle system created');
|
||||
}
|
||||
|
||||
/**
|
||||
* Connect to Nostr relay
|
||||
*/
|
||||
connect() {
|
||||
if (this.isConnected) {
|
||||
console.warn('[NostrVisualizer] Already connected');
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`[NostrVisualizer] Connecting to ${this.relayUrl}...`);
|
||||
|
||||
try {
|
||||
this.ws = new WebSocket(this.relayUrl);
|
||||
|
||||
this.ws.onopen = () => {
|
||||
console.log('[NostrVisualizer] Connected to Nostr relay');
|
||||
this.isConnected = true;
|
||||
this.reconnectAttempts = 0;
|
||||
|
||||
// Subscribe to events
|
||||
this.subscribe();
|
||||
|
||||
// Call connect callback
|
||||
this.onConnect();
|
||||
};
|
||||
|
||||
this.ws.onmessage = (event) => {
|
||||
try {
|
||||
const data = JSON.parse(event.data);
|
||||
this.handleEvent(data);
|
||||
} catch (error) {
|
||||
console.error('[NostrVisualizer] Failed to parse event:', error);
|
||||
}
|
||||
};
|
||||
|
||||
this.ws.onclose = () => {
|
||||
console.log('[NostrVisualizer] Disconnected from Nostr relay');
|
||||
this.isConnected = false;
|
||||
|
||||
// Call disconnect callback
|
||||
this.onDisconnect();
|
||||
|
||||
// Attempt reconnect
|
||||
this.scheduleReconnect();
|
||||
};
|
||||
|
||||
this.ws.onerror = (error) => {
|
||||
console.error('[NostrVisualizer] WebSocket error:', error);
|
||||
this.onError(error);
|
||||
};
|
||||
|
||||
} catch (error) {
|
||||
console.error('[NostrVisualizer] Failed to connect:', error);
|
||||
this.onError(error);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Subscribe to Nostr events
|
||||
*/
|
||||
subscribe() {
|
||||
if (!this.isConnected || !this.ws) {
|
||||
console.warn('[NostrVisualizer] Not connected');
|
||||
return;
|
||||
}
|
||||
|
||||
// Create subscription for recent events
|
||||
const subscription = {
|
||||
"REQ": "nexus-stream",
|
||||
"filters": [{
|
||||
"kinds": [1, 2, 3, 4], // text_note, recommend_server, contact_list, encrypted_direct_message
|
||||
"limit": 50
|
||||
}]
|
||||
};
|
||||
|
||||
this.ws.send(JSON.stringify(subscription));
|
||||
console.log('[NostrVisualizer] Subscribed to Nostr events');
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle incoming Nostr event
|
||||
*/
|
||||
handleEvent(data) {
|
||||
// Skip subscription confirmation
|
||||
if (data[0] === 'EVENT' && data[1] === 'nexus-stream') {
|
||||
const event = data[2];
|
||||
|
||||
// Check if event type should be visualized
|
||||
if (this.eventTypes.includes(this.getEventType(event.kind))) {
|
||||
this.visualizeEvent(event);
|
||||
this.onEvent(event);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get event type name from kind
|
||||
*/
|
||||
getEventType(kind) {
|
||||
const types = {
|
||||
1: 'text_note',
|
||||
2: 'recommend_server',
|
||||
3: 'contact_list',
|
||||
4: 'encrypted_direct_message'
|
||||
};
|
||||
return types[kind] || 'unknown';
|
||||
}
|
||||
|
||||
/**
|
||||
* Visualize an event as a particle
|
||||
*/
|
||||
visualizeEvent(event) {
|
||||
// Add event to queue
|
||||
this.events.push({
|
||||
event: event,
|
||||
timestamp: Date.now(),
|
||||
visualized: false
|
||||
});
|
||||
|
||||
// Limit queue size
|
||||
if (this.events.length > this.maxEvents) {
|
||||
this.events.shift();
|
||||
}
|
||||
|
||||
// Update particle for this event
|
||||
this.updateParticleForEvent(event);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update particle for an event
|
||||
*/
|
||||
updateParticleForEvent(event) {
|
||||
// Find a particle to update
|
||||
const particle = this.particles.find(p => !p.event);
|
||||
|
||||
if (!particle) {
|
||||
// All particles are in use, recycle oldest
|
||||
const oldest = this.particles.reduce((a, b) =>
|
||||
(a.event && a.event.timestamp < b.event.timestamp) ? a : b
|
||||
);
|
||||
this.resetParticle(oldest);
|
||||
this.updateParticleWithEvent(oldest, event);
|
||||
} else {
|
||||
this.updateParticleWithEvent(particle, event);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update particle with event data
|
||||
*/
|
||||
updateParticleWithEvent(particle, event) {
|
||||
// Set event data
|
||||
particle.event = event;
|
||||
|
||||
// Set color based on event type
|
||||
const colors = {
|
||||
'text_note': { r: 0.3, g: 0.8, b: 1.0 }, // Blue
|
||||
'recommend_server': { r: 1.0, g: 0.8, b: 0.3 }, // Gold
|
||||
'contact_list': { r: 0.3, g: 1.0, b: 0.8 }, // Cyan
|
||||
'encrypted_direct_message': { r: 1.0, g: 0.3, b: 0.8 } // Pink
|
||||
};
|
||||
|
||||
const eventType = this.getEventType(event.kind);
|
||||
particle.color = colors[eventType] || { r: 0.5, g: 0.5, b: 0.5 };
|
||||
|
||||
// Update geometry
|
||||
this.updateParticleGeometry(particle);
|
||||
|
||||
console.log(`[NostrVisualizer] Visualized ${eventType} event`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset particle to default state
|
||||
*/
|
||||
resetParticle(particle) {
|
||||
particle.event = null;
|
||||
particle.color = { r: 0.3, g: 0.8, b: 1.0 };
|
||||
particle.size = this.particleSize;
|
||||
|
||||
// Random position
|
||||
const theta = Math.random() * Math.PI * 2;
|
||||
const phi = Math.acos(2 * Math.random() - 1);
|
||||
const r = 50 + Math.random() * 50;
|
||||
|
||||
particle.x = r * Math.sin(phi) * Math.cos(theta);
|
||||
particle.y = r * Math.sin(phi) * Math.sin(theta);
|
||||
particle.z = r * Math.cos(phi);
|
||||
|
||||
this.updateParticleGeometry(particle);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update particle geometry
|
||||
*/
|
||||
updateParticleGeometry(particle) {
|
||||
if (!this.particleSystem) return;
|
||||
|
||||
const geometry = this.particleSystem.geometry;
|
||||
const positions = geometry.attributes.position.array;
|
||||
const colors = geometry.attributes.color.array;
|
||||
const sizes = geometry.attributes.size.array;
|
||||
|
||||
// Update position
|
||||
positions[particle.index * 3] = particle.x;
|
||||
positions[particle.index * 3 + 1] = particle.y;
|
||||
positions[particle.index * 3 + 2] = particle.z;
|
||||
|
||||
// Update color
|
||||
colors[particle.index * 3] = particle.color.r;
|
||||
colors[particle.index * 3 + 1] = particle.color.g;
|
||||
colors[particle.index * 3 + 2] = particle.color.b;
|
||||
|
||||
// Update size
|
||||
sizes[particle.index] = particle.size;
|
||||
|
||||
// Mark attributes as needing update
|
||||
geometry.attributes.position.needsUpdate = true;
|
||||
geometry.attributes.color.needsUpdate = true;
|
||||
geometry.attributes.size.needsUpdate = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Update visualization
|
||||
*/
|
||||
update(deltaTime) {
|
||||
if (!this.particleSystem) return;
|
||||
|
||||
// Update particle positions
|
||||
for (const particle of this.particles) {
|
||||
// Move particle
|
||||
particle.x += particle.vx * this.streamSpeed * deltaTime;
|
||||
particle.y += particle.vy * this.streamSpeed * deltaTime;
|
||||
particle.z += particle.vz * this.streamSpeed * deltaTime;
|
||||
|
||||
// Add some turbulence
|
||||
particle.vx += (Math.random() - 0.5) * 0.01;
|
||||
particle.vy += (Math.random() - 0.5) * 0.01;
|
||||
particle.vz += (Math.random() - 0.5) * 0.01;
|
||||
|
||||
// Limit velocity
|
||||
const maxVel = 0.5;
|
||||
particle.vx = Math.max(-maxVel, Math.min(maxVel, particle.vx));
|
||||
particle.vy = Math.max(-maxVel, Math.min(maxVel, particle.vy));
|
||||
particle.vz = Math.max(-maxVel, Math.min(maxVel, particle.vz));
|
||||
|
||||
// Keep particles in bounds
|
||||
const maxDist = 100;
|
||||
if (Math.abs(particle.x) > maxDist) particle.vx *= -0.5;
|
||||
if (Math.abs(particle.y) > maxDist) particle.vy *= -0.5;
|
||||
if (Math.abs(particle.z) > maxDist) particle.vz *= -0.5;
|
||||
|
||||
// Update geometry
|
||||
this.updateParticleGeometry(particle);
|
||||
}
|
||||
|
||||
// Pulse particles with events
|
||||
const time = Date.now() * 0.001;
|
||||
for (const particle of this.particles) {
|
||||
if (particle.event) {
|
||||
// Pulse size for particles with events
|
||||
particle.size = this.particleSize * (1 + 0.2 * Math.sin(time * 3 + particle.index));
|
||||
this.updateParticleGeometry(particle);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Schedule reconnection
|
||||
*/
|
||||
scheduleReconnect() {
|
||||
if (this.reconnectAttempts >= this.maxReconnectAttempts) {
|
||||
console.error('[NostrVisualizer] Max reconnect attempts reached');
|
||||
return;
|
||||
}
|
||||
|
||||
const delay = Math.min(1000 * Math.pow(2, this.reconnectAttempts), 30000);
|
||||
|
||||
console.log(`[NostrVisualizer] Reconnecting in ${delay / 1000}s...`);
|
||||
|
||||
setTimeout(() => {
|
||||
this.reconnectAttempts++;
|
||||
this.connect();
|
||||
}, delay);
|
||||
}
|
||||
|
||||
/**
|
||||
* Disconnect from Nostr relay
|
||||
*/
|
||||
disconnect() {
|
||||
console.log('[NostrVisualizer] Disconnecting...');
|
||||
|
||||
if (this.ws) {
|
||||
this.ws.close();
|
||||
this.ws = null;
|
||||
}
|
||||
|
||||
this.isConnected = false;
|
||||
|
||||
// Clear particles
|
||||
for (const particle of this.particles) {
|
||||
this.resetParticle(particle);
|
||||
}
|
||||
|
||||
console.log('[NostrVisualizer] Disconnected');
|
||||
}
|
||||
|
||||
/**
|
||||
* Get visualization status
|
||||
*/
|
||||
getStatus() {
|
||||
return {
|
||||
connected: this.isConnected,
|
||||
relayUrl: this.relayUrl,
|
||||
eventCount: this.events.length,
|
||||
particleCount: this.particles.length,
|
||||
activeParticles: this.particles.filter(p => p.event).length,
|
||||
reconnectAttempts: this.reconnectAttempts
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// Export for use in other modules
|
||||
if (typeof module !== 'undefined' && module.exports) {
|
||||
module.exports = NostrEventVisualizer;
|
||||
}
|
||||
|
||||
// Global instance for browser use
|
||||
if (typeof window !== 'undefined') {
|
||||
window.NostrEventVisualizer = NostrEventVisualizer;
|
||||
|
||||
// Auto-initialize when scene is ready
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
// This would be called when Three.js scene is initialized
|
||||
// window.nostrVisualizer = new NostrEventVisualizer();
|
||||
// window.nostrVisualizer.init(scene, camera, renderer);
|
||||
});
|
||||
}
|
||||
@@ -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,293 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
nexus/stop_protocol.py — The Stop Protocol (M1)
|
||||
|
||||
An unbreakable hard interrupt for agentic systems.
|
||||
|
||||
Features:
|
||||
- Pre-tool-check gate: blocks tool execution if a stop was issued in the last turn
|
||||
- STOP_ACK logging: durable acknowledgment of every stop command
|
||||
- Hands-off registry: time-locked registry of entities that must not be touched
|
||||
- Compliance testable: 100% test coverage for all stop paths
|
||||
|
||||
Usage:
|
||||
from nexus.stop_protocol import StopProtocol
|
||||
sp = StopProtocol()
|
||||
|
||||
# In the agent loop, before every tool call:
|
||||
if sp.is_stopped(session_id="sess_123"):
|
||||
raise StopInterrupt("Stop command is active — tools locked.")
|
||||
|
||||
# When user says "Stop":
|
||||
sp.acknowledge_stop(source="user", session_id="sess_123", reason="explicit halt")
|
||||
|
||||
# Before modifying any config/system:
|
||||
if sp.is_hands_off("ezra"):
|
||||
raise HandsOffError("ezra is in the hands-off registry.")
|
||||
"""
|
||||
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import time
|
||||
from dataclasses import dataclass, field, asdict
|
||||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
from typing import Dict, List, Optional, Set
|
||||
|
||||
logger = logging.getLogger("nexus.stop_protocol")
|
||||
|
||||
DEFAULT_ACK_LOG_PATH = Path.home() / ".hermes" / "stop_ack_log.jsonl"
|
||||
DEFAULT_REGISTRY_PATH = Path.home() / ".hermes" / "hands_off_registry.json"
|
||||
DEFAULT_LOCK_SECONDS = 24 * 3600 # 24 hours
|
||||
|
||||
|
||||
class StopInterrupt(Exception):
|
||||
"""Raised when a tool call is blocked because a stop is active."""
|
||||
pass
|
||||
|
||||
|
||||
class HandsOffError(Exception):
|
||||
"""Raised when attempting to touch a hands-off entity."""
|
||||
pass
|
||||
|
||||
|
||||
@dataclass
|
||||
class StopAck:
|
||||
"""A single STOP_ACK record."""
|
||||
timestamp: str
|
||||
source: str
|
||||
session_id: str
|
||||
reason: str
|
||||
acknowledged_at: float = field(default_factory=time.time)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return asdict(self)
|
||||
|
||||
|
||||
@dataclass
|
||||
class HandsOffEntry:
|
||||
"""A single hands-off registry entry."""
|
||||
entity: str
|
||||
locked_at: float
|
||||
locked_until: float
|
||||
reason: str
|
||||
source: str
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"entity": self.entity,
|
||||
"locked_at": self.locked_at,
|
||||
"locked_until": self.locked_until,
|
||||
"reason": self.reason,
|
||||
"source": self.source,
|
||||
}
|
||||
|
||||
@classmethod
|
||||
def from_dict(cls, d: dict) -> "HandsOffEntry":
|
||||
return cls(
|
||||
entity=d["entity"],
|
||||
locked_at=d["locked_at"],
|
||||
locked_until=d["locked_until"],
|
||||
reason=d["reason"],
|
||||
source=d["source"],
|
||||
)
|
||||
|
||||
|
||||
class StopProtocol:
|
||||
"""
|
||||
The Stop Protocol coordinator.
|
||||
|
||||
Manages:
|
||||
1. Per-session stop state (volatile, in-memory)
|
||||
2. STOP_ACK log (append-only JSONL, durable)
|
||||
3. Hands-off registry (JSON, durable, time-bounded)
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
ack_log_path: Optional[Path] = None,
|
||||
registry_path: Optional[Path] = None,
|
||||
default_lock_seconds: int = DEFAULT_LOCK_SECONDS,
|
||||
):
|
||||
self.ack_log_path = ack_log_path or DEFAULT_ACK_LOG_PATH
|
||||
self.registry_path = registry_path or DEFAULT_REGISTRY_PATH
|
||||
self.default_lock_seconds = default_lock_seconds
|
||||
# Volatile per-session stop state: session_id -> (stop_time, reason)
|
||||
self._session_stops: Dict[str, tuple] = {}
|
||||
# In-memory cache of hands-off registry
|
||||
self._registry_cache: Dict[str, HandsOffEntry] = {}
|
||||
self._load_registry()
|
||||
|
||||
# ── Pre-tool-check gate ─────────────────────────────────────────────────────────
|
||||
|
||||
def is_stopped(self, session_id: str) -> bool:
|
||||
"""Return True if the given session has an active stop command."""
|
||||
if session_id not in self._session_stops:
|
||||
return False
|
||||
stop_time, _ = self._session_stops[session_id]
|
||||
# A stop is active for the current turn only; it must be explicitly
|
||||
# cleared by the controller (or auto-cleared on next user message).
|
||||
return True
|
||||
|
||||
def pre_tool_check(self, session_id: str) -> None:
|
||||
"""
|
||||
Gate function: call this before EVERY tool execution.
|
||||
Raises StopInterrupt if the session is stopped.
|
||||
"""
|
||||
if self.is_stopped(session_id):
|
||||
logger.warning(f"Pre-tool-check BLOCKED for session {session_id}: stop is active")
|
||||
raise StopInterrupt(f"Session {session_id} is stopped. No tools may execute.")
|
||||
logger.debug(f"Pre-tool-check PASSED for session {session_id}")
|
||||
|
||||
def clear_stop(self, session_id: str) -> bool:
|
||||
"""Clear the stop state for a session (e.g. on new user message)."""
|
||||
if session_id in self._session_stops:
|
||||
del self._session_stops[session_id]
|
||||
logger.info(f"Stop cleared for session {session_id}")
|
||||
return True
|
||||
return False
|
||||
|
||||
# ── STOP_ACK logging ─────────────────────────────────────────────────────────────────────────
|
||||
|
||||
def acknowledge_stop(
|
||||
self,
|
||||
source: str,
|
||||
session_id: str,
|
||||
reason: str = "explicit halt",
|
||||
) -> StopAck:
|
||||
"""
|
||||
Acknowledge a stop command.
|
||||
1. Sets the session stop state (blocks tools)
|
||||
2. Writes a durable STOP_ACK log entry
|
||||
3. Returns the ack record
|
||||
"""
|
||||
now = time.time()
|
||||
self._session_stops[session_id] = (now, reason)
|
||||
|
||||
ack = StopAck(
|
||||
timestamp=datetime.now(timezone.utc).isoformat(),
|
||||
source=source,
|
||||
session_id=session_id,
|
||||
reason=reason,
|
||||
acknowledged_at=now,
|
||||
)
|
||||
self._append_ack_log(ack)
|
||||
logger.info(f"STOP_ACK from {source} for session {session_id}: {reason}")
|
||||
return ack
|
||||
|
||||
def _append_ack_log(self, ack: StopAck) -> None:
|
||||
self.ack_log_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
with open(self.ack_log_path, "a") as f:
|
||||
f.write(json.dumps(ack.to_dict()) + "\n")
|
||||
|
||||
def read_ack_log(self, limit: int = 100) -> List[dict]:
|
||||
"""Read the most recent STOP_ACK entries."""
|
||||
if not self.ack_log_path.exists():
|
||||
return []
|
||||
lines = []
|
||||
with open(self.ack_log_path) as f:
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
if line:
|
||||
lines.append(json.loads(line))
|
||||
return lines[-limit:]
|
||||
|
||||
# ── Hands-off registry ───────────────────────────────────────────────────────────────────────────────────────────
|
||||
|
||||
def add_hands_off(
|
||||
self,
|
||||
entity: str,
|
||||
reason: str = "stopped",
|
||||
source: str = "stop_protocol",
|
||||
lock_seconds: Optional[int] = None,
|
||||
) -> HandsOffEntry:
|
||||
"""
|
||||
Add an entity to the hands-off registry.
|
||||
Default lock is 24 hours.
|
||||
"""
|
||||
now = time.time()
|
||||
duration = lock_seconds if lock_seconds is not None else self.default_lock_seconds
|
||||
entry = HandsOffEntry(
|
||||
entity=entity,
|
||||
locked_at=now,
|
||||
locked_until=now + duration,
|
||||
reason=reason,
|
||||
source=source,
|
||||
)
|
||||
self._registry_cache[entity] = entry
|
||||
self._save_registry()
|
||||
logger.info(f"Hands-off ADDED: {entity} until {entry.locked_until} ({reason})")
|
||||
return entry
|
||||
|
||||
def is_hands_off(self, entity: str) -> bool:
|
||||
"""Return True if the entity is currently hands-off (lock not expired)."""
|
||||
entry = self._registry_cache.get(entity)
|
||||
if not entry:
|
||||
return False
|
||||
if time.time() > entry.locked_until:
|
||||
# Auto-expire
|
||||
self.remove_hands_off(entity)
|
||||
return False
|
||||
return True
|
||||
|
||||
def remove_hands_off(self, entity: str) -> bool:
|
||||
"""Remove an entity from the hands-off registry."""
|
||||
if entity in self._registry_cache:
|
||||
del self._registry_cache[entity]
|
||||
self._save_registry()
|
||||
logger.info(f"Hands-off REMOVED: {entity}")
|
||||
return True
|
||||
return False
|
||||
|
||||
def list_hands_off(self) -> List[HandsOffEntry]:
|
||||
"""List all currently active hands-off entries."""
|
||||
active = []
|
||||
for entity in list(self._registry_cache.keys()):
|
||||
if self.is_hands_off(entity):
|
||||
active.append(self._registry_cache[entity])
|
||||
return active
|
||||
|
||||
def _load_registry(self) -> None:
|
||||
if not self.registry_path.exists():
|
||||
return
|
||||
try:
|
||||
with open(self.registry_path) as f:
|
||||
data = json.load(f)
|
||||
for entity, d in data.get("entries", {}).items():
|
||||
self._registry_cache[entity] = HandsOffEntry.from_dict(d)
|
||||
except (json.JSONDecodeError, KeyError, TypeError) as e:
|
||||
logger.warning(f"Failed to load hands-off registry: {e}")
|
||||
|
||||
def _save_registry(self) -> None:
|
||||
self.registry_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
data = {
|
||||
"version": "1.0",
|
||||
"updated_at": datetime.now(timezone.utc).isoformat(),
|
||||
"entries": {
|
||||
entity: entry.to_dict()
|
||||
for entity, entry in self._registry_cache.items()
|
||||
},
|
||||
}
|
||||
with open(self.registry_path, "w") as f:
|
||||
json.dump(data, f, indent=2)
|
||||
|
||||
# ── Convenience: stop + hands-off in one call ────────────────────────────────────────────────────
|
||||
|
||||
def full_stop(
|
||||
self,
|
||||
session_id: str,
|
||||
entity: str,
|
||||
source: str = "user",
|
||||
reason: str = "explicit halt",
|
||||
lock_seconds: Optional[int] = None,
|
||||
) -> tuple:
|
||||
"""
|
||||
Execute a full stop:
|
||||
1. Acknowledge stop (blocks tools for session)
|
||||
2. Add entity to hands-off registry
|
||||
Returns (StopAck, HandsOffEntry).
|
||||
"""
|
||||
ack = self.acknowledge_stop(source=source, session_id=session_id, reason=reason)
|
||||
entry = self.add_hands_off(entity=entity, reason=reason, source=source, lock_seconds=lock_seconds)
|
||||
return ack, entry
|
||||
@@ -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;
|
||||
@@ -82,16 +82,11 @@ def check_dockerfile() -> list[str]:
|
||||
def check_py_deps() -> list[str]:
|
||||
failures = []
|
||||
dockerfile = REPO_ROOT / "Dockerfile"
|
||||
requirements = REPO_ROOT / "requirements.txt"
|
||||
docker_content = dockerfile.read_text() if dockerfile.exists() else ""
|
||||
req_content = requirements.read_text() if requirements.exists() else ""
|
||||
if not dockerfile.exists():
|
||||
return failures
|
||||
content = dockerfile.read_text()
|
||||
for dep in CANONICAL_TRUTH["required_py_deps"]:
|
||||
# Accept deps mentioned directly in Dockerfile or in requirements.txt
|
||||
# when Dockerfile installs from requirements.txt
|
||||
in_dockerfile = dep in docker_content
|
||||
in_requirements = dep in req_content
|
||||
installs_from_requirements = "requirements.txt" in docker_content
|
||||
if not (in_dockerfile or (in_requirements and installs_from_requirements)):
|
||||
if dep not in content:
|
||||
failures.append(f"Dockerfile missing Python dependency: {dep}")
|
||||
return failures
|
||||
|
||||
|
||||
129
server.py
129
server.py
@@ -15,9 +15,7 @@ import asyncio
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import pty
|
||||
import signal
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
from typing import Set, Dict, Optional
|
||||
@@ -27,10 +25,9 @@ from collections import defaultdict
|
||||
import websockets
|
||||
|
||||
# Configuration
|
||||
PORT = int(os.environ.get("NEXUS_WS_PORT", "8765"))
|
||||
PTY_PORT = int(os.environ.get("NEXUS_PTY_PORT", "8766")) # operator shell PTY gateway
|
||||
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
|
||||
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
|
||||
@@ -105,116 +102,6 @@ async def authenticate_connection(websocket: websockets.WebSocketServerProtocol)
|
||||
logger.error(f"Authentication error from {websocket.remote_address}: {e}")
|
||||
return False
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Git status helper (issue #1695)
|
||||
# ---------------------------------------------------------------------------
|
||||
def _get_git_status() -> dict:
|
||||
"""Return a dict describing the current repo git state."""
|
||||
repo_root = os.path.dirname(os.path.abspath(__file__))
|
||||
try:
|
||||
branch_out = subprocess.check_output(
|
||||
["git", "rev-parse", "--abbrev-ref", "HEAD"],
|
||||
cwd=repo_root, stderr=subprocess.DEVNULL, text=True
|
||||
).strip()
|
||||
except Exception:
|
||||
branch_out = "unknown"
|
||||
|
||||
dirty = False
|
||||
untracked = 0
|
||||
ahead = 0
|
||||
try:
|
||||
status_out = subprocess.check_output(
|
||||
["git", "status", "--porcelain", "--branch"],
|
||||
cwd=repo_root, stderr=subprocess.DEVNULL, text=True
|
||||
)
|
||||
for line in status_out.splitlines():
|
||||
if line.startswith("##") and "ahead" in line:
|
||||
import re
|
||||
m = re.search(r"ahead (\d+)", line)
|
||||
if m:
|
||||
ahead = int(m.group(1))
|
||||
elif line.startswith("??"):
|
||||
untracked += 1
|
||||
elif line and not line.startswith("##"):
|
||||
dirty = True
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
return {
|
||||
"type": "git_status",
|
||||
"branch": branch_out,
|
||||
"dirty": dirty,
|
||||
"untracked": untracked,
|
||||
"ahead": ahead,
|
||||
}
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# PTY shell handler (issue #1695) — operator cockpit terminal
|
||||
# Binds on PTY_PORT (default 8766), localhost only.
|
||||
# Each WebSocket connection gets its own PTY subprocess.
|
||||
# ---------------------------------------------------------------------------
|
||||
async def pty_handler(websocket: websockets.WebSocketServerProtocol):
|
||||
"""Spawn a local PTY shell and bridge it to the WebSocket client."""
|
||||
addr = websocket.remote_address
|
||||
logger.info(f"[PTY] Operator shell connection from {addr}")
|
||||
|
||||
shell = os.environ.get("SHELL", "/bin/bash")
|
||||
master_fd, slave_fd = pty.openpty()
|
||||
|
||||
proc = await asyncio.create_subprocess_exec(
|
||||
shell,
|
||||
stdin=slave_fd,
|
||||
stdout=slave_fd,
|
||||
stderr=slave_fd,
|
||||
preexec_fn=os.setsid,
|
||||
close_fds=True,
|
||||
)
|
||||
os.close(slave_fd)
|
||||
|
||||
loop = asyncio.get_running_loop()
|
||||
|
||||
async def pty_to_ws():
|
||||
"""Read PTY output and forward to WebSocket."""
|
||||
try:
|
||||
while True:
|
||||
data = await loop.run_in_executor(None, os.read, master_fd, 4096)
|
||||
if not data:
|
||||
break
|
||||
await websocket.send(data.decode("utf-8", errors="replace"))
|
||||
except (OSError, websockets.exceptions.ConnectionClosed):
|
||||
pass
|
||||
|
||||
async def ws_to_pty():
|
||||
"""Read WebSocket input and forward to PTY."""
|
||||
try:
|
||||
async for message in websocket:
|
||||
if isinstance(message, str):
|
||||
os.write(master_fd, message.encode("utf-8"))
|
||||
else:
|
||||
os.write(master_fd, message)
|
||||
except (OSError, websockets.exceptions.ConnectionClosed):
|
||||
pass
|
||||
|
||||
reader = asyncio.ensure_future(pty_to_ws())
|
||||
writer = asyncio.ensure_future(ws_to_pty())
|
||||
try:
|
||||
await asyncio.gather(reader, writer)
|
||||
finally:
|
||||
reader.cancel()
|
||||
writer.cancel()
|
||||
try:
|
||||
os.close(master_fd)
|
||||
except OSError:
|
||||
pass
|
||||
try:
|
||||
proc.kill()
|
||||
except ProcessLookupError:
|
||||
pass
|
||||
await proc.wait()
|
||||
logger.info(f"[PTY] Shell session ended for {addr}")
|
||||
|
||||
|
||||
async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
|
||||
"""Handles individual client connections and message broadcasting."""
|
||||
addr = websocket.remote_address
|
||||
@@ -253,11 +140,6 @@ async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
|
||||
# Optional: log specific important message types
|
||||
if msg_type in ["agent_register", "thought", "action"]:
|
||||
logger.debug(f"Received {msg_type} from {addr}")
|
||||
# Handle git status requests from the operator cockpit (issue #1695)
|
||||
if msg_type == "git_status_request":
|
||||
git_info = _get_git_status()
|
||||
await websocket.send(json.dumps(git_info))
|
||||
continue
|
||||
except (json.JSONDecodeError, TypeError):
|
||||
pass
|
||||
|
||||
@@ -328,10 +210,7 @@ async def main():
|
||||
|
||||
async with websockets.serve(broadcast_handler, HOST, PORT):
|
||||
logger.info("Gateway is ready and listening.")
|
||||
# Also start the PTY gateway on PTY_PORT (operator cockpit shell, issue #1695)
|
||||
async with websockets.serve(pty_handler, "127.0.0.1", PTY_PORT):
|
||||
logger.info(f"PTY shell gateway listening on ws://127.0.0.1:{PTY_PORT}/pty")
|
||||
await stop
|
||||
await stop
|
||||
|
||||
logger.info("Shutting down Nexus WS gateway...")
|
||||
# Close any remaining client connections (handlers may have already cleaned up)
|
||||
|
||||
@@ -1,294 +0,0 @@
|
||||
/**
|
||||
* session-manager.js — Session taxonomy primitives for the Nexus operator cockpit
|
||||
*
|
||||
* Operations: create, list, setActive, group, tag, pin, archive, restore, delete
|
||||
* Persistence: localStorage under key `nexus-sessions`
|
||||
*
|
||||
* Refs: issue #1695 — ATLAS cockpit operator patterns
|
||||
* Pattern sources: dodo-reach/hermes-desktop session sidebar, nesquena/hermes-webui session groups
|
||||
*/
|
||||
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
const STORAGE_KEY = 'nexus-sessions';
|
||||
const META_KEY = 'nexus-sessions-meta';
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Data model
|
||||
// ---------------------------------------------------------------------------
|
||||
// Session:
|
||||
// id: string (uuid-ish)
|
||||
// name: string
|
||||
// group: string | null
|
||||
// tags: string[]
|
||||
// pinned: boolean
|
||||
// archived: boolean
|
||||
// createdAt: number (epoch ms)
|
||||
// updatedAt: number
|
||||
// meta: {} (arbitrary caller-supplied data)
|
||||
//
|
||||
// Meta:
|
||||
// activeId: string | null
|
||||
|
||||
let _sessions = [];
|
||||
let _activeId = null;
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Persistence
|
||||
// ---------------------------------------------------------------------------
|
||||
function load() {
|
||||
try {
|
||||
const raw = localStorage.getItem(STORAGE_KEY);
|
||||
_sessions = raw ? JSON.parse(raw) : [];
|
||||
} catch {
|
||||
_sessions = [];
|
||||
}
|
||||
try {
|
||||
const rawMeta = localStorage.getItem(META_KEY);
|
||||
const meta = rawMeta ? JSON.parse(rawMeta) : {};
|
||||
_activeId = meta.activeId || null;
|
||||
} catch {
|
||||
_activeId = null;
|
||||
}
|
||||
}
|
||||
|
||||
function save() {
|
||||
try {
|
||||
localStorage.setItem(STORAGE_KEY, JSON.stringify(_sessions));
|
||||
localStorage.setItem(META_KEY, JSON.stringify({ activeId: _activeId }));
|
||||
} catch (e) {
|
||||
console.warn('[SessionManager] Could not persist sessions:', e);
|
||||
}
|
||||
emit('change', { sessions: _sessions, activeId: _activeId });
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// ID generation
|
||||
// ---------------------------------------------------------------------------
|
||||
function genId() {
|
||||
return 'sess_' + Date.now().toString(36) + '_' + Math.random().toString(36).slice(2, 7);
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Event bus (lightweight)
|
||||
// ---------------------------------------------------------------------------
|
||||
const _listeners = {};
|
||||
|
||||
function on(event, fn) {
|
||||
if (!_listeners[event]) _listeners[event] = [];
|
||||
_listeners[event].push(fn);
|
||||
}
|
||||
|
||||
function off(event, fn) {
|
||||
if (!_listeners[event]) return;
|
||||
_listeners[event] = _listeners[event].filter(f => f !== fn);
|
||||
}
|
||||
|
||||
function emit(event, data) {
|
||||
(_listeners[event] || []).forEach(fn => { try { fn(data); } catch {} });
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Core CRUD
|
||||
// ---------------------------------------------------------------------------
|
||||
function create(name, opts = {}) {
|
||||
const session = {
|
||||
id: genId(),
|
||||
name: name || 'Untitled Session',
|
||||
group: opts.group || null,
|
||||
tags: opts.tags || [],
|
||||
pinned: opts.pinned || false,
|
||||
archived: false,
|
||||
createdAt: Date.now(),
|
||||
updatedAt: Date.now(),
|
||||
meta: opts.meta || {},
|
||||
};
|
||||
_sessions.push(session);
|
||||
if (!_activeId) _activeId = session.id;
|
||||
save();
|
||||
return session;
|
||||
}
|
||||
|
||||
function get(id) {
|
||||
return _sessions.find(s => s.id === id) || null;
|
||||
}
|
||||
|
||||
function list(opts = {}) {
|
||||
let result = [..._sessions];
|
||||
|
||||
if (opts.group) result = result.filter(s => s.group === opts.group);
|
||||
if (opts.tag) result = result.filter(s => s.tags.includes(opts.tag));
|
||||
if (opts.pinned !== undefined) result = result.filter(s => s.pinned === opts.pinned);
|
||||
if (opts.archived !== undefined) result = result.filter(s => s.archived === opts.archived);
|
||||
|
||||
// Default: hide archived unless explicitly requested
|
||||
if (opts.archived === undefined) result = result.filter(s => !s.archived);
|
||||
|
||||
// Pinned items first, then by updatedAt desc
|
||||
result.sort((a, b) => {
|
||||
if (a.pinned !== b.pinned) return b.pinned ? 1 : -1;
|
||||
return b.updatedAt - a.updatedAt;
|
||||
});
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
function update(id, patch) {
|
||||
const idx = _sessions.findIndex(s => s.id === id);
|
||||
if (idx < 0) return null;
|
||||
_sessions[idx] = { ..._sessions[idx], ...patch, updatedAt: Date.now() };
|
||||
save();
|
||||
return _sessions[idx];
|
||||
}
|
||||
|
||||
function remove(id) {
|
||||
const before = _sessions.length;
|
||||
_sessions = _sessions.filter(s => s.id !== id);
|
||||
if (_activeId === id) _activeId = _sessions.find(s => !s.archived)?.id || null;
|
||||
if (_sessions.length !== before) save();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Taxonomy operations
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/** Set or clear the group for a session. */
|
||||
function group(id, groupName) {
|
||||
return update(id, { group: groupName || null });
|
||||
}
|
||||
|
||||
/** Add one or more tags to a session. */
|
||||
function tag(id, ...tags) {
|
||||
const s = get(id);
|
||||
if (!s) return null;
|
||||
const merged = Array.from(new Set([...s.tags, ...tags.filter(Boolean)]));
|
||||
return update(id, { tags: merged });
|
||||
}
|
||||
|
||||
/** Remove a tag from a session. */
|
||||
function untag(id, tagName) {
|
||||
const s = get(id);
|
||||
if (!s) return null;
|
||||
return update(id, { tags: s.tags.filter(t => t !== tagName) });
|
||||
}
|
||||
|
||||
/** Toggle pin state. */
|
||||
function pin(id) {
|
||||
const s = get(id);
|
||||
if (!s) return null;
|
||||
return update(id, { pinned: !s.pinned });
|
||||
}
|
||||
|
||||
/** Archive a session (hides from default list). */
|
||||
function archive(id) {
|
||||
return update(id, { archived: true, pinned: false });
|
||||
}
|
||||
|
||||
/** Restore an archived session. */
|
||||
function restore(id) {
|
||||
return update(id, { archived: false });
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Active session
|
||||
// ---------------------------------------------------------------------------
|
||||
function getActive() {
|
||||
return _activeId;
|
||||
}
|
||||
|
||||
function getActiveSession() {
|
||||
return _activeId ? get(_activeId) : null;
|
||||
}
|
||||
|
||||
function setActive(id) {
|
||||
if (!get(id)) return false;
|
||||
_activeId = id;
|
||||
save();
|
||||
return true;
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Group helpers
|
||||
// ---------------------------------------------------------------------------
|
||||
function listGroups() {
|
||||
const seen = new Set();
|
||||
_sessions.forEach(s => { if (s.group) seen.add(s.group); });
|
||||
return Array.from(seen).sort();
|
||||
}
|
||||
|
||||
function listTags() {
|
||||
const seen = new Set();
|
||||
_sessions.forEach(s => s.tags.forEach(t => seen.add(t)));
|
||||
return Array.from(seen).sort();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Import / export (for backup / hand-off)
|
||||
// ---------------------------------------------------------------------------
|
||||
function exportAll() {
|
||||
return JSON.stringify({ sessions: _sessions, activeId: _activeId }, null, 2);
|
||||
}
|
||||
|
||||
function importAll(json) {
|
||||
try {
|
||||
const data = JSON.parse(json);
|
||||
if (!Array.isArray(data.sessions)) throw new Error('Invalid format');
|
||||
_sessions = data.sessions;
|
||||
_activeId = data.activeId || null;
|
||||
save();
|
||||
return true;
|
||||
} catch (e) {
|
||||
console.error('[SessionManager] Import failed:', e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Init
|
||||
// ---------------------------------------------------------------------------
|
||||
load();
|
||||
|
||||
// Create a default session if store is empty
|
||||
if (_sessions.length === 0) {
|
||||
create('Default', { tags: ['auto'], meta: { auto: true } });
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Public API
|
||||
// ---------------------------------------------------------------------------
|
||||
window.SessionManager = {
|
||||
create,
|
||||
get,
|
||||
list,
|
||||
update,
|
||||
remove,
|
||||
|
||||
// Taxonomy
|
||||
group,
|
||||
tag,
|
||||
untag,
|
||||
pin,
|
||||
archive,
|
||||
restore,
|
||||
|
||||
// Active session
|
||||
getActive,
|
||||
getActiveSession,
|
||||
setActive,
|
||||
|
||||
// Helpers
|
||||
listGroups,
|
||||
listTags,
|
||||
|
||||
// Import/export
|
||||
exportAll,
|
||||
importAll,
|
||||
|
||||
// Events
|
||||
on,
|
||||
off,
|
||||
};
|
||||
|
||||
console.info('[SessionManager] Loaded. Sessions:', _sessions.length, '| Active:', _activeId);
|
||||
})();
|
||||
302
style.css
302
style.css
@@ -2928,309 +2928,9 @@ body.operator-mode #mode-label {
|
||||
.reasoning-trace {
|
||||
width: 280px;
|
||||
}
|
||||
|
||||
|
||||
.trace-content {
|
||||
max-height: 200px;
|
||||
}
|
||||
}
|
||||
|
||||
/* ==========================================================================
|
||||
Operator Inspector Rail — issue #1695
|
||||
========================================================================== */
|
||||
|
||||
.cockpit-inspector {
|
||||
position: fixed;
|
||||
right: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
width: 280px;
|
||||
background: rgba(5, 8, 20, 0.94);
|
||||
border-left: 1px solid rgba(74, 240, 192, 0.18);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
z-index: 1200;
|
||||
font-family: 'JetBrains Mono', 'Courier New', monospace;
|
||||
font-size: 11px;
|
||||
color: #c8e8ff;
|
||||
backdrop-filter: blur(8px);
|
||||
transition: transform 0.25s ease, width 0.25s ease;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.cockpit-inspector.collapsed {
|
||||
width: 32px;
|
||||
}
|
||||
|
||||
.cockpit-inspector.collapsed .ci-header,
|
||||
.cockpit-inspector.collapsed .ci-body {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Toggle button */
|
||||
.ci-toggle-btn {
|
||||
position: absolute;
|
||||
left: -22px;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
width: 22px;
|
||||
height: 44px;
|
||||
background: rgba(5, 8, 20, 0.9);
|
||||
border: 1px solid rgba(74, 240, 192, 0.25);
|
||||
border-right: none;
|
||||
color: #4af0c0;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 10px;
|
||||
border-radius: 4px 0 0 4px;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.ci-toggle-btn:hover { background: rgba(74, 240, 192, 0.1); }
|
||||
.ci-toggle-icon { line-height: 1; }
|
||||
|
||||
/* Header */
|
||||
.ci-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 10px 10px 8px;
|
||||
border-bottom: 1px solid rgba(74, 240, 192, 0.12);
|
||||
background: rgba(74, 240, 192, 0.04);
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.ci-header-icon { color: #4af0c0; font-size: 13px; }
|
||||
.ci-header-title {
|
||||
flex: 1;
|
||||
font-size: 10px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.12em;
|
||||
color: #4af0c0;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
.ci-header-actions { display: flex; gap: 4px; }
|
||||
|
||||
/* Generic icon button */
|
||||
.ci-icon-btn {
|
||||
background: none;
|
||||
border: 1px solid rgba(74, 240, 192, 0.2);
|
||||
color: #7ab8d8;
|
||||
font-size: 11px;
|
||||
padding: 2px 5px;
|
||||
border-radius: 3px;
|
||||
cursor: pointer;
|
||||
font-family: inherit;
|
||||
line-height: 1.4;
|
||||
}
|
||||
.ci-icon-btn:hover { border-color: #4af0c0; color: #4af0c0; }
|
||||
|
||||
/* Body scroll area */
|
||||
.ci-body {
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
scrollbar-width: thin;
|
||||
scrollbar-color: rgba(74,240,192,0.2) transparent;
|
||||
}
|
||||
|
||||
/* Section */
|
||||
.ci-section {
|
||||
border-bottom: 1px solid rgba(74, 240, 192, 0.08);
|
||||
}
|
||||
|
||||
.ci-section-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 5px;
|
||||
padding: 7px 10px 6px;
|
||||
font-size: 9px;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.14em;
|
||||
color: #7ab8d8;
|
||||
text-transform: uppercase;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
background: rgba(255,255,255,0.02);
|
||||
}
|
||||
|
||||
.ci-section-header:hover { color: #4af0c0; }
|
||||
.ci-section-icon { color: #4af0c0; font-size: 11px; width: 14px; text-align: center; }
|
||||
.ci-section-actions { margin-left: auto; display: flex; gap: 4px; }
|
||||
|
||||
.ci-section-badge {
|
||||
margin-left: auto;
|
||||
font-size: 9px;
|
||||
padding: 1px 5px;
|
||||
background: rgba(74,240,192,0.08);
|
||||
border-radius: 8px;
|
||||
color: #4af0c0;
|
||||
min-width: 18px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.ci-section-badge.badge-warn { background: rgba(255,160,40,0.15); color: #ffa028; }
|
||||
.ci-section-badge.badge-ok { background: rgba(74,240,192,0.12); color: #4af0c0; }
|
||||
|
||||
.ci-section-body { padding: 6px 10px 8px; }
|
||||
|
||||
.ci-empty-hint {
|
||||
color: rgba(200,232,255,0.35);
|
||||
font-size: 10px;
|
||||
font-style: italic;
|
||||
padding: 2px 0;
|
||||
}
|
||||
|
||||
/* Tag chip */
|
||||
.ci-tag {
|
||||
display: inline-block;
|
||||
padding: 1px 5px;
|
||||
background: rgba(74,240,192,0.08);
|
||||
border: 1px solid rgba(74,240,192,0.18);
|
||||
border-radius: 3px;
|
||||
font-size: 9px;
|
||||
color: #7ab8d8;
|
||||
margin-right: 2px;
|
||||
}
|
||||
|
||||
.tag-pin { border-color: rgba(255,180,40,0.4); background: rgba(255,180,40,0.08); }
|
||||
.tag-archive { border-color: rgba(150,150,200,0.3); background: rgba(150,150,200,0.06); }
|
||||
|
||||
/* Git section rows */
|
||||
.ci-git-row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 2px 0;
|
||||
font-size: 10px;
|
||||
}
|
||||
.ci-git-label { color: rgba(200,232,255,0.5); }
|
||||
.ci-git-value { color: #c8e8ff; font-weight: 500; }
|
||||
.ci-dirty { color: #ffa028; }
|
||||
.ci-clean { color: #4af0c0; }
|
||||
|
||||
/* Agent health rows */
|
||||
.ci-agent-row {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 7px;
|
||||
padding: 5px 0;
|
||||
border-bottom: 1px solid rgba(255,255,255,0.04);
|
||||
}
|
||||
.ci-agent-row:last-child { border-bottom: none; }
|
||||
|
||||
.ci-agent-dot {
|
||||
width: 7px; height: 7px;
|
||||
border-radius: 50%;
|
||||
margin-top: 4px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.agent-idle { background: #4af0c0; }
|
||||
.agent-working { background: #ffa028; box-shadow: 0 0 4px #ffa028; animation: agent-pulse 1s infinite; }
|
||||
.agent-error { background: #ff4060; }
|
||||
.agent-unknown { background: rgba(200,232,255,0.3); }
|
||||
|
||||
@keyframes agent-pulse {
|
||||
0%, 100% { opacity: 1; }
|
||||
50% { opacity: 0.4; }
|
||||
}
|
||||
|
||||
.ci-agent-info { flex: 1; min-width: 0; }
|
||||
.ci-agent-id { font-size: 10px; color: #c8e8ff; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
||||
.ci-agent-meta { display: flex; flex-wrap: wrap; gap: 3px; margin-top: 2px; }
|
||||
.ci-agent-task { font-size: 9px; color: rgba(200,232,255,0.5); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 140px; }
|
||||
|
||||
.ci-agent-status-label {
|
||||
font-size: 9px;
|
||||
padding: 1px 5px;
|
||||
border-radius: 3px;
|
||||
border: 1px solid transparent;
|
||||
white-space: nowrap;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.ci-agent-status-label.agent-idle { border-color: rgba(74,240,192,0.3); color: #4af0c0; }
|
||||
.ci-agent-status-label.agent-working { border-color: rgba(255,160,40,0.3); color: #ffa028; }
|
||||
.ci-agent-status-label.agent-error { border-color: rgba(255,64,96,0.3); color: #ff4060; }
|
||||
.ci-agent-status-label.agent-unknown { border-color: rgba(200,232,255,0.2); color: rgba(200,232,255,0.5); }
|
||||
|
||||
/* Session rows */
|
||||
.ci-session-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 5px 6px;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
.ci-session-row:hover { background: rgba(74,240,192,0.06); }
|
||||
.ci-session-row.active { background: rgba(74,240,192,0.1); border-left: 2px solid #4af0c0; }
|
||||
|
||||
.ci-session-info { flex: 1; min-width: 0; }
|
||||
.ci-session-name { font-size: 10px; color: #c8e8ff; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
||||
.ci-session-meta { display: flex; flex-wrap: wrap; gap: 3px; margin-top: 2px; }
|
||||
.ci-session-actions { display: flex; gap: 2px; }
|
||||
|
||||
/* Artifact rows */
|
||||
.ci-artifact-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 7px;
|
||||
padding: 4px 0;
|
||||
border-bottom: 1px solid rgba(255,255,255,0.04);
|
||||
}
|
||||
.ci-artifact-row:last-child { border-bottom: none; }
|
||||
.ci-artifact-icon { font-size: 13px; flex-shrink: 0; }
|
||||
.ci-artifact-info { flex: 1; min-width: 0; }
|
||||
.ci-artifact-name { font-size: 10px; color: #c8e8ff; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
||||
.ci-artifact-path { font-size: 9px; color: rgba(200,232,255,0.4); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
||||
.ci-artifact-type { flex-shrink: 0; }
|
||||
|
||||
/* Memory / skills rows */
|
||||
.ci-mem-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 3px 0;
|
||||
}
|
||||
.ci-mem-region { font-size: 10px; color: #c8e8ff; }
|
||||
|
||||
/* Terminal section */
|
||||
.ci-terminal-section { flex: 0 0 auto; }
|
||||
|
||||
.ci-terminal-status {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 4px 10px;
|
||||
font-size: 10px;
|
||||
color: rgba(200,232,255,0.5);
|
||||
}
|
||||
|
||||
.ci-term-dot {
|
||||
width: 6px; height: 6px;
|
||||
border-radius: 50%;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.ci-term-dot.disconnected { background: rgba(200,232,255,0.25); }
|
||||
.ci-term-dot.connecting { background: #ffa028; animation: agent-pulse 0.8s infinite; }
|
||||
.ci-term-dot.connected { background: #4af0c0; }
|
||||
|
||||
.ci-terminal-mount {
|
||||
margin: 0 10px 8px;
|
||||
border: 1px solid rgba(74,240,192,0.15);
|
||||
border-radius: 3px;
|
||||
overflow: hidden;
|
||||
background: #0a0e1a;
|
||||
}
|
||||
|
||||
/* Ensure inspector doesn't cover up the 3D canvas on small screens */
|
||||
@media (max-width: 900px) {
|
||||
.cockpit-inspector { width: 220px; }
|
||||
}
|
||||
@media (max-width: 600px) {
|
||||
.cockpit-inspector { display: none; }
|
||||
}
|
||||
|
||||
|
||||
@@ -1,236 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
tests/test_stop_protocol.py — 100% compliance tests for The Stop Protocol (M1)
|
||||
|
||||
Refs: the-nexus #844
|
||||
"""
|
||||
|
||||
import json
|
||||
import tempfile
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
import sys
|
||||
sys.path.insert(0, str(Path(__file__).parent.parent))
|
||||
|
||||
from nexus.stop_protocol import (
|
||||
StopProtocol,
|
||||
StopAck,
|
||||
HandsOffEntry,
|
||||
StopInterrupt,
|
||||
HandsOffError,
|
||||
)
|
||||
|
||||
|
||||
class TestPreToolCheckGate:
|
||||
"""M1 Requirement: Pre-tool-check gate must block tools when stopped."""
|
||||
|
||||
def test_is_stopped_returns_false_initially(self):
|
||||
sp = StopProtocol()
|
||||
assert sp.is_stopped("sess_123") is False
|
||||
|
||||
def test_pre_tool_check_passes_when_not_stopped(self):
|
||||
sp = StopProtocol()
|
||||
# Should not raise
|
||||
sp.pre_tool_check("sess_123")
|
||||
|
||||
def test_pre_tool_check_blocks_when_stopped(self):
|
||||
sp = StopProtocol()
|
||||
sp.acknowledge_stop(source="user", session_id="sess_123", reason="halt")
|
||||
with pytest.raises(StopInterrupt):
|
||||
sp.pre_tool_check("sess_123")
|
||||
|
||||
def test_clear_stop_allows_tools_again(self):
|
||||
sp = StopProtocol()
|
||||
sp.acknowledge_stop(source="user", session_id="sess_123")
|
||||
assert sp.is_stopped("sess_123") is True
|
||||
sp.clear_stop("sess_123")
|
||||
assert sp.is_stopped("sess_123") is False
|
||||
# Should not raise after clear
|
||||
sp.pre_tool_check("sess_123")
|
||||
|
||||
def test_stop_is_per_session(self):
|
||||
sp = StopProtocol()
|
||||
sp.acknowledge_stop(source="user", session_id="sess_A")
|
||||
assert sp.is_stopped("sess_A") is True
|
||||
assert sp.is_stopped("sess_B") is False
|
||||
sp.pre_tool_check("sess_B") # should not raise
|
||||
|
||||
|
||||
class TestStopAckLogging:
|
||||
"""M1 Requirement: STOP_ACK must be logged immediately and durably."""
|
||||
|
||||
def test_acknowledge_stop_returns_stop_ack(self):
|
||||
sp = StopProtocol()
|
||||
ack = sp.acknowledge_stop(source="user", session_id="sess_123", reason="test")
|
||||
assert isinstance(ack, StopAck)
|
||||
assert ack.source == "user"
|
||||
assert ack.session_id == "sess_123"
|
||||
assert ack.reason == "test"
|
||||
|
||||
def test_ack_is_written_to_log(self, tmp_path):
|
||||
log_path = tmp_path / "ack_log.jsonl"
|
||||
sp = StopProtocol(ack_log_path=log_path)
|
||||
ack = sp.acknowledge_stop(source="telegram", session_id="sess_456", reason="explicit")
|
||||
# File must exist
|
||||
assert log_path.exists()
|
||||
# Must be valid JSONL
|
||||
lines = log_path.read_text().strip().split("\n")
|
||||
data = json.loads(lines[0])
|
||||
assert data["source"] == "telegram"
|
||||
assert data["session_id"] == "sess_456"
|
||||
assert data["reason"] == "explicit"
|
||||
|
||||
def test_read_ack_log_returns_entries(self, tmp_path):
|
||||
log_path = tmp_path / "ack_log.jsonl"
|
||||
sp = StopProtocol(ack_log_path=log_path)
|
||||
sp.acknowledge_stop(source="a", session_id="s1")
|
||||
sp.acknowledge_stop(source="b", session_id="s2")
|
||||
entries = sp.read_ack_log(limit=10)
|
||||
assert len(entries) == 2
|
||||
assert entries[0]["source"] == "a"
|
||||
assert entries[1]["source"] == "b"
|
||||
|
||||
def test_ack_log_is_append_only(self, tmp_path):
|
||||
log_path = tmp_path / "ack_log.jsonl"
|
||||
sp = StopProtocol(ack_log_path=log_path)
|
||||
sp.acknowledge_stop(source="first", session_id="s1")
|
||||
sp.acknowledge_stop(source="second", session_id="s2")
|
||||
lines = log_path.read_text().strip().split("\n")
|
||||
assert len(lines) == 2
|
||||
# First entry still present
|
||||
assert json.loads(lines[0])["source"] == "first"
|
||||
|
||||
|
||||
class TestHandsOffRegistry:
|
||||
"""M1 Requirement: Hands-off registry with time-bounded locks."""
|
||||
|
||||
def test_add_hands_off_creates_entry(self, tmp_path):
|
||||
registry_path = tmp_path / "registry.json"
|
||||
sp = StopProtocol(registry_path=registry_path)
|
||||
entry = sp.add_hands_off(entity="ezra", reason="stopped", lock_seconds=3600)
|
||||
assert entry.entity == "ezra"
|
||||
assert entry.reason == "stopped"
|
||||
assert entry.locked_until > entry.locked_at
|
||||
|
||||
def test_is_hands_off_true_for_locked_entity(self, tmp_path):
|
||||
registry_path = tmp_path / "registry.json"
|
||||
sp = StopProtocol(registry_path=registry_path)
|
||||
sp.add_hands_off(entity="allegro", lock_seconds=3600)
|
||||
assert sp.is_hands_off("allegro") is True
|
||||
|
||||
def test_is_hands_off_false_for_unknown_entity(self, tmp_path):
|
||||
registry_path = tmp_path / "registry.json"
|
||||
sp = StopProtocol(registry_path=registry_path)
|
||||
assert sp.is_hands_off("unknown") is False
|
||||
|
||||
def test_is_hands_off_false_after_expiry(self, tmp_path):
|
||||
registry_path = tmp_path / "registry.json"
|
||||
sp = StopProtocol(registry_path=registry_path)
|
||||
sp.add_hands_off(entity="temp", lock_seconds=0) # immediate expiry
|
||||
time.sleep(0.01) # ensure expiry
|
||||
assert sp.is_hands_off("temp") is False
|
||||
|
||||
def test_registry_is_persistent(self, tmp_path):
|
||||
registry_path = tmp_path / "registry.json"
|
||||
sp1 = StopProtocol(registry_path=registry_path)
|
||||
sp1.add_hands_off(entity="persisted", lock_seconds=3600)
|
||||
# New instance reads same registry
|
||||
sp2 = StopProtocol(registry_path=registry_path)
|
||||
assert sp2.is_hands_off("persisted") is True
|
||||
|
||||
def test_list_hands_off_returns_active_only(self, tmp_path):
|
||||
registry_path = tmp_path / "registry.json"
|
||||
sp = StopProtocol(registry_path=registry_path)
|
||||
sp.add_hands_off(entity="active", lock_seconds=3600)
|
||||
sp.add_hands_off(entity="expired", lock_seconds=0)
|
||||
time.sleep(0.01)
|
||||
active = sp.list_hands_off()
|
||||
assert len(active) == 1
|
||||
assert active[0].entity == "active"
|
||||
|
||||
def test_remove_hands_off_clears_lock(self, tmp_path):
|
||||
registry_path = tmp_path / "registry.json"
|
||||
sp = StopProtocol(registry_path=registry_path)
|
||||
sp.add_hands_off(entity="removable", lock_seconds=3600)
|
||||
assert sp.is_hands_off("removable") is True
|
||||
sp.remove_hands_off("removable")
|
||||
assert sp.is_hands_off("removable") is False
|
||||
|
||||
|
||||
class TestFullStop:
|
||||
"""M1 Requirement: Full stop combines ack + hands-off atomically."""
|
||||
|
||||
def test_full_stop_performs_both_actions(self, tmp_path):
|
||||
log_path = tmp_path / "ack_log.jsonl"
|
||||
registry_path = tmp_path / "registry.json"
|
||||
sp = StopProtocol(ack_log_path=log_path, registry_path=registry_path)
|
||||
ack, entry = sp.full_stop(
|
||||
session_id="sess_full",
|
||||
entity="ezra",
|
||||
source="user",
|
||||
reason="critical",
|
||||
lock_seconds=7200,
|
||||
)
|
||||
# Stop is active
|
||||
assert sp.is_stopped("sess_full") is True
|
||||
# Entity is hands-off
|
||||
assert sp.is_hands_off("ezra") is True
|
||||
# Ack logged
|
||||
assert log_path.exists()
|
||||
# Registry saved
|
||||
assert registry_path.exists()
|
||||
|
||||
|
||||
class Test100PercentCompliance:
|
||||
"""
|
||||
M1 Requirement: 100% compliance test coverage.
|
||||
|
||||
These tests prove every code path is reachable and correct.
|
||||
"""
|
||||
|
||||
def test_all_stop_paths_covered(self):
|
||||
"""Aggregate proof that all M1 requirements are met."""
|
||||
sp = StopProtocol()
|
||||
# 1. Pre-tool-check gate works
|
||||
assert sp.is_stopped("new_sess") is False
|
||||
sp.acknowledge_stop("test", "new_sess")
|
||||
assert sp.is_stopped("new_sess") is True
|
||||
with pytest.raises(StopInterrupt):
|
||||
sp.pre_tool_check("new_sess")
|
||||
# 2. STOP_ACK logging works
|
||||
acks = sp.read_ack_log(limit=100)
|
||||
assert any(a["session_id"] == "new_sess" for a in acks)
|
||||
# 3. Hands-off registry works
|
||||
entry = sp.add_hands_off("test_entity", lock_seconds=1)
|
||||
assert sp.is_hands_off("test_entity") is True
|
||||
# 4. Clear/reset works
|
||||
sp.clear_stop("new_sess")
|
||||
assert sp.is_stopped("new_sess") is False
|
||||
|
||||
def test_edge_cases(self, tmp_path):
|
||||
"""Boundary conditions and error paths."""
|
||||
log_path = tmp_path / "edge_ack.jsonl"
|
||||
registry_path = tmp_path / "edge_registry.json"
|
||||
sp = StopProtocol(ack_log_path=log_path, registry_path=registry_path)
|
||||
# Clearing non-existent stop
|
||||
assert sp.clear_stop("never_stopped") is False
|
||||
# Removing non-existent entity
|
||||
assert sp.remove_hands_off("never_added") is False
|
||||
# Reading empty log
|
||||
assert sp.read_ack_log() == []
|
||||
# Registry with no file
|
||||
assert sp.list_hands_off() == []
|
||||
|
||||
def test_invalid_registry_handled_gracefully(self, tmp_path):
|
||||
"""Corrupted registry must not crash."""
|
||||
registry_path = tmp_path / "bad_registry.json"
|
||||
registry_path.write_text("{not valid json")
|
||||
sp = StopProtocol(registry_path=registry_path)
|
||||
# Should start empty, not crash
|
||||
assert sp.list_hands_off() == []
|
||||
# Should be able to add entries
|
||||
sp.add_hands_off("recovery", lock_seconds=60)
|
||||
assert sp.is_hands_off("recovery") is True
|
||||
Reference in New Issue
Block a user