Compare commits
12 Commits
mimo/code/
...
fix/1537
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17317aaf64 | ||
|
|
da258e772c | ||
| c97364ac13 | |||
| 324cdb0d26 | |||
| b4473267e0 | |||
| ed733d4eea | |||
| 7c9f4310d0 | |||
| 2016a7e076 | |||
| 15b9a4398c | |||
| 3f7277d920 | |||
|
|
ec2ed3c62f | ||
|
|
11175e72c0 |
37
app.js
37
app.js
@@ -734,6 +734,9 @@ async function init() {
|
|||||||
const response = await fetch('./portals.json');
|
const response = await fetch('./portals.json');
|
||||||
const portalData = await response.json();
|
const portalData = await response.json();
|
||||||
createPortals(portalData);
|
createPortals(portalData);
|
||||||
|
|
||||||
|
// Start portal hot-reload watcher
|
||||||
|
if (window.PortalHotReload) PortalHotReload.start(5000);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('Failed to load portals.json:', e);
|
console.error('Failed to load portals.json:', e);
|
||||||
addChatMessage('error', 'Portal registry offline. Check logs.');
|
addChatMessage('error', 'Portal registry offline. Check logs.');
|
||||||
@@ -2145,7 +2148,7 @@ function setupControls() {
|
|||||||
|
|
||||||
function sendChatMessage(overrideText = null) {
|
function sendChatMessage(overrideText = null) {
|
||||||
// Mine chat message to MemPalace
|
// Mine chat message to MemPalace
|
||||||
if (overrideText) {
|
if (overrideText && window.electronAPI?.execPython) {
|
||||||
window.electronAPI.execPython(`mempalace add_drawer "${this.wing}" "chat" "${overrideText}"`);
|
window.electronAPI.execPython(`mempalace add_drawer "${this.wing}" "chat" "${overrideText}"`);
|
||||||
}
|
}
|
||||||
const input = document.getElementById('chat-input');
|
const input = document.getElementById('chat-input');
|
||||||
@@ -2153,19 +2156,25 @@ function sendChatMessage(overrideText = null) {
|
|||||||
if (!text) return;
|
if (!text) return;
|
||||||
addChatMessage('user', text);
|
addChatMessage('user', text);
|
||||||
if (!overrideText) input.value = '';
|
if (!overrideText) input.value = '';
|
||||||
setTimeout(() => {
|
|
||||||
const responses = [
|
if (!wsConnected || !hermesWs || hermesWs.readyState !== WebSocket.OPEN) {
|
||||||
'Processing your request through the harness...',
|
addChatMessage('error', 'Message not sent. Nexus gateway offline.');
|
||||||
'I have noted this in my thought stream.',
|
input.blur();
|
||||||
'Acknowledged. Routing to appropriate agent loop.',
|
return;
|
||||||
'The sovereign space recognizes your command.',
|
}
|
||||||
'Running analysis. Results will appear on the main terminal.',
|
|
||||||
'My crystal ball says... yes. Implementing.',
|
try {
|
||||||
'Understood, Alexander. Adjusting priorities.',
|
hermesWs.send(JSON.stringify({
|
||||||
];
|
type: 'chat',
|
||||||
const resp = responses[Math.floor(Math.random() * responses.length)];
|
text,
|
||||||
addChatMessage('timmy', resp);
|
agent: 'nexus',
|
||||||
}, 500 + Math.random() * 1000);
|
source: 'nexus_chat',
|
||||||
|
timestamp: Date.now(),
|
||||||
|
}));
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Failed to send Nexus chat message:', err);
|
||||||
|
addChatMessage('error', 'Message not sent. Nexus gateway offline.');
|
||||||
|
}
|
||||||
input.blur();
|
input.blur();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
719
cockpit-inspector.js
Normal file
719
cockpit-inspector.js
Normal file
@@ -0,0 +1,719 @@
|
|||||||
|
/**
|
||||||
|
* 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);
|
||||||
|
}
|
||||||
|
})();
|
||||||
84
docs/ADR-001-shell-boundary.md
Normal file
84
docs/ADR-001-shell-boundary.md
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
# 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
|
||||||
125
docs/ATLAS-COCKPIT-PATTERNS.md
Normal file
125
docs/ATLAS-COCKPIT-PATTERNS.md
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
# 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 |
|
||||||
@@ -394,9 +394,16 @@
|
|||||||
<div id="memory-inspect-panel" class="memory-inspect-panel" style="display:none;" aria-label="Memory Inspect Panel"></div>
|
<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>
|
<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="./boot.js"></script>
|
||||||
<script src="./avatar-customization.js"></script>
|
<script src="./avatar-customization.js"></script>
|
||||||
<script src="./lod-system.js"></script>
|
<script src="./lod-system.js"></script>
|
||||||
|
<script src="./portal-hot-reload.js"></script>
|
||||||
|
<script src="./cockpit-inspector.js"></script>
|
||||||
<script>
|
<script>
|
||||||
function openMemoryFilter() { renderFilterList(); document.getElementById('memory-filter').style.display = 'flex'; }
|
function openMemoryFilter() { renderFilterList(); document.getElementById('memory-filter').style.display = 'flex'; }
|
||||||
function closeMemoryFilter() { document.getElementById('memory-filter').style.display = 'none'; }
|
function closeMemoryFilter() { document.getElementById('memory-filter').style.display = 'none'; }
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ from typing import Any, Callable, Optional
|
|||||||
|
|
||||||
import websockets
|
import websockets
|
||||||
|
|
||||||
from bannerlord_trace import BannerlordTraceLogger
|
from nexus.bannerlord_trace import BannerlordTraceLogger
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
# CONFIGURATION
|
# CONFIGURATION
|
||||||
|
|||||||
@@ -304,6 +304,43 @@ async def inject_event(event_type: str, ws_url: str, **kwargs):
|
|||||||
sys.exit(1)
|
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():
|
def main():
|
||||||
parser = argparse.ArgumentParser(description="Evennia -> Nexus WebSocket Bridge")
|
parser = argparse.ArgumentParser(description="Evennia -> Nexus WebSocket Bridge")
|
||||||
sub = parser.add_subparsers(dest="mode")
|
sub = parser.add_subparsers(dest="mode")
|
||||||
|
|||||||
113
nexus/telegram_bridge.py
Normal file
113
nexus/telegram_bridge.py
Normal file
@@ -0,0 +1,113 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import urllib.parse
|
||||||
|
import urllib.request
|
||||||
|
from typing import Any, Callable, Optional
|
||||||
|
|
||||||
|
|
||||||
|
class TelegramBridgeConfig:
|
||||||
|
def __init__(self, bot_token: str, chat_id: str, poll_timeout: int = 4):
|
||||||
|
self.bot_token = bot_token
|
||||||
|
self.chat_id = chat_id
|
||||||
|
self.poll_timeout = poll_timeout
|
||||||
|
|
||||||
|
@property
|
||||||
|
def api_base(self) -> str:
|
||||||
|
return f"https://api.telegram.org/bot{self.bot_token}"
|
||||||
|
|
||||||
|
|
||||||
|
def config_from_env(env: Optional[dict[str, str]] = None) -> Optional[TelegramBridgeConfig]:
|
||||||
|
env = env or os.environ
|
||||||
|
bot_token = env.get("NEXUS_TELEGRAM_BOT_TOKEN") or env.get("TELEGRAM_BOT_TOKEN")
|
||||||
|
chat_id = (
|
||||||
|
env.get("NEXUS_TELEGRAM_CHAT_ID")
|
||||||
|
or env.get("TELEGRAM_HOME_CHANNEL")
|
||||||
|
or env.get("TELEGRAM_CHAT_ID")
|
||||||
|
)
|
||||||
|
if not bot_token or not chat_id:
|
||||||
|
return None
|
||||||
|
return TelegramBridgeConfig(bot_token=bot_token, chat_id=str(chat_id), poll_timeout=int(env.get("NEXUS_TELEGRAM_POLL_TIMEOUT", "4")))
|
||||||
|
|
||||||
|
|
||||||
|
def format_outbound_text(sender: str, text: str) -> str:
|
||||||
|
sender = (sender or "Nexus").strip() or "Nexus"
|
||||||
|
return f"[{sender}] {text}"
|
||||||
|
|
||||||
|
|
||||||
|
def extract_update_message(update: dict[str, Any], expected_chat_id: str) -> Optional[dict[str, Any]]:
|
||||||
|
message = update.get("message") or update.get("edited_message")
|
||||||
|
if not isinstance(message, dict):
|
||||||
|
return None
|
||||||
|
if str((message.get("chat") or {}).get("id")) != str(expected_chat_id):
|
||||||
|
return None
|
||||||
|
text = message.get("text")
|
||||||
|
if not text:
|
||||||
|
return None
|
||||||
|
sender_info = message.get("from") or {}
|
||||||
|
sender = sender_info.get("first_name") or sender_info.get("username") or "Telegram"
|
||||||
|
return {
|
||||||
|
"update_id": update.get("update_id", 0),
|
||||||
|
"sender": sender,
|
||||||
|
"text": text,
|
||||||
|
"timestamp": message.get("date"),
|
||||||
|
"source": "telegram",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _default_get_json(url: str) -> dict[str, Any]:
|
||||||
|
with urllib.request.urlopen(url, timeout=15) as resp:
|
||||||
|
return json.loads(resp.read().decode())
|
||||||
|
|
||||||
|
|
||||||
|
def _default_post_json(url: str, payload: dict[str, Any]) -> dict[str, Any]:
|
||||||
|
data = json.dumps(payload).encode()
|
||||||
|
req = urllib.request.Request(url, data=data, headers={"Content-Type": "application/json"}, method="POST")
|
||||||
|
with urllib.request.urlopen(req, timeout=15) as resp:
|
||||||
|
return json.loads(resp.read().decode())
|
||||||
|
|
||||||
|
|
||||||
|
class TelegramBridge:
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
config: TelegramBridgeConfig,
|
||||||
|
*,
|
||||||
|
get_json: Optional[Callable[[str], dict[str, Any]]] = None,
|
||||||
|
post_json: Optional[Callable[[str, dict[str, Any]], dict[str, Any]]] = None,
|
||||||
|
logger: Any = None,
|
||||||
|
) -> None:
|
||||||
|
self.config = config
|
||||||
|
self.get_json = get_json or _default_get_json
|
||||||
|
self.post_json = post_json or _default_post_json
|
||||||
|
self.logger = logger
|
||||||
|
|
||||||
|
async def send_chat(self, text: str, sender: str = "Nexus") -> dict[str, Any]:
|
||||||
|
payload = {
|
||||||
|
"chat_id": self.config.chat_id,
|
||||||
|
"text": format_outbound_text(sender, text),
|
||||||
|
}
|
||||||
|
result = await asyncio.to_thread(self.post_json, f"{self.config.api_base}/sendMessage", payload)
|
||||||
|
if self.logger and not result.get("ok", True):
|
||||||
|
self.logger.error("Telegram sendMessage failed: %s", result)
|
||||||
|
return result
|
||||||
|
|
||||||
|
async def poll_once(self, last_update_id: int) -> tuple[int, list[dict[str, Any]]]:
|
||||||
|
params = urllib.parse.urlencode({
|
||||||
|
"offset": last_update_id + 1,
|
||||||
|
"timeout": self.config.poll_timeout,
|
||||||
|
})
|
||||||
|
result = await asyncio.to_thread(self.get_json, f"{self.config.api_base}/getUpdates?{params}")
|
||||||
|
if not result.get("ok", False):
|
||||||
|
if self.logger:
|
||||||
|
self.logger.error("Telegram getUpdates failed: %s", result)
|
||||||
|
return last_update_id, []
|
||||||
|
messages: list[dict[str, Any]] = []
|
||||||
|
new_last_update_id = last_update_id
|
||||||
|
for update in result.get("result", []):
|
||||||
|
new_last_update_id = max(new_last_update_id, int(update.get("update_id", last_update_id)))
|
||||||
|
msg = extract_update_message(update, self.config.chat_id)
|
||||||
|
if msg:
|
||||||
|
messages.append(msg)
|
||||||
|
return new_last_update_id, messages
|
||||||
105
portal-hot-reload.js
Normal file
105
portal-hot-reload.js
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
/**
|
||||||
|
* 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;
|
||||||
237
server.py
237
server.py
@@ -15,19 +15,24 @@ import asyncio
|
|||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
import pty
|
||||||
import signal
|
import signal
|
||||||
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
from typing import Set, Dict, Optional
|
from typing import Set, Dict, Optional
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
|
|
||||||
|
from nexus.telegram_bridge import TelegramBridge, config_from_env
|
||||||
|
|
||||||
# Branch protected file - see POLICY.md
|
# Branch protected file - see POLICY.md
|
||||||
import websockets
|
import websockets
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
PORT = int(os.environ.get("NEXUS_WS_PORT", "8765"))
|
PORT = int(os.environ.get("NEXUS_WS_PORT", "8765"))
|
||||||
HOST = os.environ.get("NEXUS_WS_HOST", "127.0.0.1") # Default to localhost only
|
PTY_PORT = int(os.environ.get("NEXUS_PTY_PORT", "8766")) # operator shell PTY gateway
|
||||||
AUTH_TOKEN = os.environ.get("NEXUS_WS_TOKEN", "") # Empty = no auth required
|
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_WINDOW = 60 # seconds
|
||||||
RATE_LIMIT_MAX_CONNECTIONS = 10 # max connections per IP per window
|
RATE_LIMIT_MAX_CONNECTIONS = 10 # max connections per IP per window
|
||||||
RATE_LIMIT_MAX_MESSAGES = 100 # max messages per connection per window
|
RATE_LIMIT_MAX_MESSAGES = 100 # max messages per connection per window
|
||||||
@@ -44,6 +49,34 @@ logger = logging.getLogger("nexus-gateway")
|
|||||||
clients: Set[websockets.WebSocketServerProtocol] = set()
|
clients: Set[websockets.WebSocketServerProtocol] = set()
|
||||||
connection_tracker: Dict[str, list] = defaultdict(list) # IP -> [timestamps]
|
connection_tracker: Dict[str, list] = defaultdict(list) # IP -> [timestamps]
|
||||||
message_tracker: Dict[int, list] = defaultdict(list) # connection_id -> [timestamps]
|
message_tracker: Dict[int, list] = defaultdict(list) # connection_id -> [timestamps]
|
||||||
|
telegram_bridge: Optional[TelegramBridge] = None
|
||||||
|
|
||||||
|
|
||||||
|
async def broadcast_json(payload, exclude: Optional[websockets.WebSocketServerProtocol] = None):
|
||||||
|
"""Broadcast a payload to all connected clients except *exclude*."""
|
||||||
|
if not clients:
|
||||||
|
return
|
||||||
|
disconnected = set()
|
||||||
|
message = payload if isinstance(payload, str) else json.dumps(payload)
|
||||||
|
task_client_pairs = []
|
||||||
|
for client in clients:
|
||||||
|
if client != exclude and client.open:
|
||||||
|
task = asyncio.create_task(client.send(message))
|
||||||
|
task_client_pairs.append((task, client))
|
||||||
|
|
||||||
|
if not task_client_pairs:
|
||||||
|
return
|
||||||
|
|
||||||
|
tasks = [pair[0] for pair in task_client_pairs]
|
||||||
|
results = await asyncio.gather(*tasks, return_exceptions=True)
|
||||||
|
for i, result in enumerate(results):
|
||||||
|
if isinstance(result, Exception):
|
||||||
|
target_client = task_client_pairs[i][1]
|
||||||
|
logger.error(f"Failed to send to client {target_client.remote_address}: {result}")
|
||||||
|
disconnected.add(target_client)
|
||||||
|
|
||||||
|
if disconnected:
|
||||||
|
clients.difference_update(disconnected)
|
||||||
|
|
||||||
def check_rate_limit(ip: str) -> bool:
|
def check_rate_limit(ip: str) -> bool:
|
||||||
"""Check if IP has exceeded connection rate limit."""
|
"""Check if IP has exceeded connection rate limit."""
|
||||||
@@ -102,6 +135,141 @@ async def authenticate_connection(websocket: websockets.WebSocketServerProtocol)
|
|||||||
logger.error(f"Authentication error from {websocket.remote_address}: {e}")
|
logger.error(f"Authentication error from {websocket.remote_address}: {e}")
|
||||||
return False
|
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 telegram_bridge_loop() -> None:
|
||||||
|
"""Poll Telegram and rebroadcast inbound chat into the Nexus websocket fabric."""
|
||||||
|
if telegram_bridge is None:
|
||||||
|
return
|
||||||
|
|
||||||
|
last_update_id = 0
|
||||||
|
logger.info("Telegram bridge polling started")
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
last_update_id, messages = await telegram_bridge.poll_once(last_update_id)
|
||||||
|
for msg in messages:
|
||||||
|
await broadcast_json({
|
||||||
|
"type": "chat",
|
||||||
|
"text": msg["text"],
|
||||||
|
"agent": msg["sender"],
|
||||||
|
"source": "telegram",
|
||||||
|
"timestamp": msg.get("timestamp"),
|
||||||
|
})
|
||||||
|
except asyncio.CancelledError:
|
||||||
|
raise
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Telegram bridge polling error: {e}")
|
||||||
|
await asyncio.sleep(1.0)
|
||||||
|
|
||||||
|
|
||||||
async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
|
async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
|
||||||
"""Handles individual client connections and message broadcasting."""
|
"""Handles individual client connections and message broadcasting."""
|
||||||
addr = websocket.remote_address
|
addr = websocket.remote_address
|
||||||
@@ -132,41 +300,33 @@ async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
|
|||||||
"message": "Message rate limit exceeded"
|
"message": "Message rate limit exceeded"
|
||||||
}))
|
}))
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
data = None
|
||||||
|
msg_type = None
|
||||||
# Parse for logging/validation if it's JSON
|
# Parse for logging/validation if it's JSON
|
||||||
try:
|
try:
|
||||||
data = json.loads(message)
|
data = json.loads(message)
|
||||||
msg_type = data.get("type", "unknown")
|
msg_type = data.get("type", "unknown")
|
||||||
# Optional: log specific important message types
|
# Optional: log specific important message types
|
||||||
if msg_type in ["agent_register", "thought", "action"]:
|
if msg_type in ["agent_register", "thought", "action", "chat"]:
|
||||||
logger.debug(f"Received {msg_type} from {addr}")
|
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
|
||||||
|
if msg_type == "chat" and telegram_bridge and data.get("source") != "telegram":
|
||||||
|
text = str(data.get("text", "")).strip()
|
||||||
|
if text:
|
||||||
|
sender = data.get("agent") or data.get("user") or "Nexus"
|
||||||
|
await telegram_bridge.send_chat(text, sender=str(sender))
|
||||||
except (json.JSONDecodeError, TypeError):
|
except (json.JSONDecodeError, TypeError):
|
||||||
pass
|
data = None
|
||||||
|
msg_type = None
|
||||||
|
|
||||||
# Broadcast to all OTHER clients
|
# Broadcast to all OTHER clients
|
||||||
if not clients:
|
await broadcast_json(data if data is not None else message, exclude=websocket)
|
||||||
continue
|
|
||||||
|
|
||||||
disconnected = set()
|
|
||||||
# Create broadcast tasks, tracking which client each task targets
|
|
||||||
task_client_pairs = []
|
|
||||||
for client in clients:
|
|
||||||
if client != websocket and client.open:
|
|
||||||
task = asyncio.create_task(client.send(message))
|
|
||||||
task_client_pairs.append((task, client))
|
|
||||||
|
|
||||||
if task_client_pairs:
|
|
||||||
tasks = [pair[0] for pair in task_client_pairs]
|
|
||||||
results = await asyncio.gather(*tasks, return_exceptions=True)
|
|
||||||
for i, result in enumerate(results):
|
|
||||||
if isinstance(result, Exception):
|
|
||||||
target_client = task_client_pairs[i][1]
|
|
||||||
logger.error(f"Failed to send to client {target_client.remote_address}: {result}")
|
|
||||||
disconnected.add(target_client)
|
|
||||||
|
|
||||||
if disconnected:
|
|
||||||
clients.difference_update(disconnected)
|
|
||||||
|
|
||||||
except websockets.exceptions.ConnectionClosed:
|
except websockets.exceptions.ConnectionClosed:
|
||||||
logger.debug(f"Connection closed by client {addr}")
|
logger.debug(f"Connection closed by client {addr}")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -177,6 +337,8 @@ async def broadcast_handler(websocket: websockets.WebSocketServerProtocol):
|
|||||||
|
|
||||||
async def main():
|
async def main():
|
||||||
"""Main server loop with graceful shutdown."""
|
"""Main server loop with graceful shutdown."""
|
||||||
|
global telegram_bridge
|
||||||
|
|
||||||
# Log security configuration
|
# Log security configuration
|
||||||
if AUTH_TOKEN:
|
if AUTH_TOKEN:
|
||||||
logger.info("Authentication: ENABLED (token required)")
|
logger.info("Authentication: ENABLED (token required)")
|
||||||
@@ -196,6 +358,15 @@ async def main():
|
|||||||
# Set up signal handlers for graceful shutdown
|
# Set up signal handlers for graceful shutdown
|
||||||
loop = asyncio.get_running_loop()
|
loop = asyncio.get_running_loop()
|
||||||
stop = loop.create_future()
|
stop = loop.create_future()
|
||||||
|
telegram_task = None
|
||||||
|
|
||||||
|
bridge_config = config_from_env(os.environ)
|
||||||
|
if bridge_config:
|
||||||
|
telegram_bridge = TelegramBridge(bridge_config, logger=logger)
|
||||||
|
telegram_task = asyncio.create_task(telegram_bridge_loop())
|
||||||
|
logger.info(f"Telegram bridge enabled for chat {bridge_config.chat_id}")
|
||||||
|
else:
|
||||||
|
logger.info("Telegram bridge disabled — set NEXUS_TELEGRAM_BOT_TOKEN/NEXUS_TELEGRAM_CHAT_ID to enable")
|
||||||
|
|
||||||
def shutdown():
|
def shutdown():
|
||||||
if not stop.done():
|
if not stop.done():
|
||||||
@@ -210,7 +381,15 @@ async def main():
|
|||||||
|
|
||||||
async with websockets.serve(broadcast_handler, HOST, PORT):
|
async with websockets.serve(broadcast_handler, HOST, PORT):
|
||||||
logger.info("Gateway is ready and listening.")
|
logger.info("Gateway is ready and listening.")
|
||||||
await stop
|
# 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
|
||||||
|
|
||||||
|
if telegram_task:
|
||||||
|
telegram_task.cancel()
|
||||||
|
await asyncio.gather(telegram_task, return_exceptions=True)
|
||||||
|
telegram_bridge = None
|
||||||
|
|
||||||
logger.info("Shutting down Nexus WS gateway...")
|
logger.info("Shutting down Nexus WS gateway...")
|
||||||
# Close any remaining client connections (handlers may have already cleaned up)
|
# Close any remaining client connections (handlers may have already cleaned up)
|
||||||
|
|||||||
294
session-manager.js
Normal file
294
session-manager.js
Normal file
@@ -0,0 +1,294 @@
|
|||||||
|
/**
|
||||||
|
* 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,9 +2928,309 @@ body.operator-mode #mode-label {
|
|||||||
.reasoning-trace {
|
.reasoning-trace {
|
||||||
width: 280px;
|
width: 280px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.trace-content {
|
.trace-content {
|
||||||
max-height: 200px;
|
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; }
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
12
tests/test_nexus_chat_gateway_wiring.py
Normal file
12
tests/test_nexus_chat_gateway_wiring.py
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parent.parent
|
||||||
|
APP_JS = ROOT / "app.js"
|
||||||
|
|
||||||
|
|
||||||
|
def test_send_chat_message_uses_gateway_not_mock_replies():
|
||||||
|
source = APP_JS.read_text(encoding="utf-8")
|
||||||
|
assert "Processing your request through the harness..." not in source
|
||||||
|
assert "Message not sent. Nexus gateway offline." in source
|
||||||
|
assert "hermesWs.send(JSON.stringify({" in source
|
||||||
|
assert "source: 'nexus_chat'" in source
|
||||||
97
tests/test_nexus_telegram_bridge.py
Normal file
97
tests/test_nexus_telegram_bridge.py
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
from importlib.util import module_from_spec, spec_from_file_location
|
||||||
|
from pathlib import Path
|
||||||
|
import asyncio
|
||||||
|
|
||||||
|
ROOT = Path(__file__).resolve().parent.parent
|
||||||
|
MODULE_PATH = ROOT / "nexus" / "telegram_bridge.py"
|
||||||
|
|
||||||
|
|
||||||
|
def load_module():
|
||||||
|
spec = spec_from_file_location("nexus_telegram_bridge", MODULE_PATH)
|
||||||
|
module = module_from_spec(spec)
|
||||||
|
assert spec.loader is not None
|
||||||
|
spec.loader.exec_module(module)
|
||||||
|
return module
|
||||||
|
|
||||||
|
|
||||||
|
def test_config_from_env_prefers_nexus_specific_values():
|
||||||
|
module = load_module()
|
||||||
|
cfg = module.config_from_env({
|
||||||
|
"NEXUS_TELEGRAM_BOT_TOKEN": "bridge-token",
|
||||||
|
"NEXUS_TELEGRAM_CHAT_ID": "-100123",
|
||||||
|
"TELEGRAM_BOT_TOKEN": "shared-token",
|
||||||
|
"TELEGRAM_HOME_CHANNEL": "-100999",
|
||||||
|
})
|
||||||
|
assert cfg.bot_token == "bridge-token"
|
||||||
|
assert cfg.chat_id == "-100123"
|
||||||
|
|
||||||
|
|
||||||
|
def test_extract_update_message_filters_wrong_chat_and_formats_sender():
|
||||||
|
module = load_module()
|
||||||
|
update = {
|
||||||
|
"update_id": 7,
|
||||||
|
"message": {
|
||||||
|
"chat": {"id": -100123},
|
||||||
|
"from": {"first_name": "Alex", "username": "alex"},
|
||||||
|
"text": "hello from telegram",
|
||||||
|
"date": 1710000000,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
msg = module.extract_update_message(update, "-100123")
|
||||||
|
assert msg["sender"] == "Alex"
|
||||||
|
assert msg["text"] == "hello from telegram"
|
||||||
|
assert module.extract_update_message(update, "-100999") is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_poll_once_normalizes_updates_and_advances_offset():
|
||||||
|
module = load_module()
|
||||||
|
cfg = module.TelegramBridgeConfig(bot_token="token", chat_id="-100123", poll_timeout=1)
|
||||||
|
|
||||||
|
async def run_test():
|
||||||
|
bridge = module.TelegramBridge(
|
||||||
|
cfg,
|
||||||
|
get_json=lambda url: {
|
||||||
|
"ok": True,
|
||||||
|
"result": [
|
||||||
|
{
|
||||||
|
"update_id": 11,
|
||||||
|
"message": {
|
||||||
|
"chat": {"id": -100123},
|
||||||
|
"from": {"username": "timmy-time"},
|
||||||
|
"text": "nexus ping",
|
||||||
|
"date": 1710000001,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
],
|
||||||
|
},
|
||||||
|
post_json=lambda url, payload: {"ok": True},
|
||||||
|
)
|
||||||
|
last_id, messages = await bridge.poll_once(0)
|
||||||
|
assert last_id == 11
|
||||||
|
assert messages == [{
|
||||||
|
"update_id": 11,
|
||||||
|
"sender": "timmy-time",
|
||||||
|
"text": "nexus ping",
|
||||||
|
"timestamp": 1710000001,
|
||||||
|
"source": "telegram",
|
||||||
|
}]
|
||||||
|
|
||||||
|
asyncio.run(run_test())
|
||||||
|
|
||||||
|
|
||||||
|
def test_send_chat_formats_sender_prefix():
|
||||||
|
module = load_module()
|
||||||
|
sent = {}
|
||||||
|
cfg = module.TelegramBridgeConfig(bot_token="token", chat_id="-100123")
|
||||||
|
|
||||||
|
async def run_test():
|
||||||
|
bridge = module.TelegramBridge(
|
||||||
|
cfg,
|
||||||
|
get_json=lambda url: {"ok": True, "result": []},
|
||||||
|
post_json=lambda url, payload: sent.setdefault("payload", payload) or {"ok": True},
|
||||||
|
)
|
||||||
|
await bridge.send_chat("hello nexus", sender="Nexus")
|
||||||
|
|
||||||
|
asyncio.run(run_test())
|
||||||
|
assert sent["payload"]["chat_id"] == "-100123"
|
||||||
|
assert sent["payload"]["text"] == "[Nexus] hello nexus"
|
||||||
Reference in New Issue
Block a user