@nordbyte/nordrelay 0.4.0 → 0.4.1

package/dist/relay-runtime.js

@@ -6,6 +6,7 @@ import { buildFileInstructions, outboxPath, stageFile, } from "./attachments.js"
 import { CODEX_AGENT_CAPABILITIES, agentLabel, agentReasoningLabel, agentReasoningOptions, } from "./agent.js";
 import { getAgentDiagnostics, getExternalSnapshotForSession, } from "./agent-activity.js";
 import { listAgentAdapterDescriptors } from "./agent-adapter.js";
+import { AgentUpdateManager } from "./agent-updates.js";
 import { createAgentSessionService, enabledAgents } from "./agent-factory.js";
 import { AuditLogStore } from "./audit-log.js";
 import { checkAuthStatus, startLogin as startCodexLogin, startLogout as startCodexLogout } from "./codex-auth.js";
@@ -13,10 +14,10 @@ import { checkClaudeCodeAuthStatus, startClaudeCodeLogin, startClaudeCodeLogout
 import { friendlyErrorText } from "./error-messages.js";
 import { checkHermesAuthStatus, startHermesLogin, startHermesLogout } from "./hermes-auth.js";
 import { checkOpenClawAuthStatus } from "./openclaw-auth.js";
-import { getConnectorHealth, getVersionChecks, readConnectorState, readFormattedLogTail, spawnConnectorRestart, spawnSelfUpdate } from "./operations.js";
+import { clearLogFile, getAgentUpdateLogPath, getConnectorHealth, getConnectorLogPath, getPackageVersion, getUpdateLogPath, getVersionChecks, readConnectorState, readFormattedLogTail, spawnConnectorRestart, spawnSelfUpdate } from "./operations.js";
 import { checkPiAuthStatus } from "./pi-auth.js";
 import { PromptStore, toPromptEnvelope } from "./prompt-store.js";
-import { renderSessionInfoPlain } from "./session-format.js";
+import { renderSessionInfoPlain, renderSessionUsageRows } from "./session-format.js";
 import { SessionLockStore } from "./session-locks.js";
 import { SessionRegistry } from "./session-registry.js";
 import { transcribeAudio } from "./voice.js";
@@ -34,6 +35,7 @@ export class RelayRuntime {
     activityStore;
     auditStore;
     lockStore;
+    agentUpdates;
     subscribers = new Set();
     externalMonitor;
     draining = false;
@@ -53,6 +55,9 @@ export class RelayRuntime {
         this.activityStore = new WebActivityStore(config.workspace, config.stateBackend, config.auditMaxEvents);
         this.auditStore = new AuditLogStore(config.workspace, config.stateBackend, config.auditMaxEvents);
         this.lockStore = new SessionLockStore(config.workspace, config.stateBackend);
+        this.agentUpdates = new AgentUpdateManager({
+            onUpdate: (job) => this.broadcast({ type: "agent_update", job }),
+        });
         if (config.codexExternalBusyCheckMs > 0) {
             this.externalMonitor = setInterval(() => {
                 void this.monitorExternalActivity().catch((error) => this.broadcastStatus(friendlyErrorText(error), "error"));
@@ -87,6 +92,15 @@ export class RelayRuntime {
             snapshot: await this.snapshot(),
         };
     }
+    async bootstrapStatus() {
+        return {
+            health: {
+                version: await getPackageVersion(),
+                state: await readConnectorState(),
+            },
+            snapshot: await this.snapshot(),
+        };
+    }
     async version() {
         return {
             health: await getConnectorHealth({ piCliPath: this.config.piCliPath, hermesCliPath: this.config.hermesCliPath, openClawCliPath: this.config.openClawCliPath, claudeCodeCliPath: this.config.claudeCodeCliPath }),
@@ -114,6 +128,45 @@ export class RelayRuntime {
         });
         return update;
     }
+    agentUpdateJobs() {
+        return this.agentUpdates.list();
+    }
+    startAgentUpdate(agentId) {
+        const job = this.agentUpdates.start(agentId, {
+            piCliPath: this.config.piCliPath,
+            hermesCliPath: this.config.hermesCliPath,
+            openClawCliPath: this.config.openClawCliPath,
+            claudeCodeCliPath: this.config.claudeCodeCliPath,
+        });
+        this.broadcastStatus(`${job.agentLabel} update started. Log: ${job.logPath}`, "warn");
+        this.appendActivity({
+            source: "web",
+            status: "info",
+            type: "agent_update_started",
+            agentId,
+            threadId: null,
+            workspace: this.config.workspace,
+            detail: `${job.method}: ${job.summary}`,
+        });
+        this.appendAudit({
+            action: "command",
+            status: "ok",
+            contextKey: WEB_CONTEXT_KEY,
+            agentId,
+            description: `update ${agentId}`,
+            detail: job.summary,
+        });
+        return job;
+    }
+    agentUpdateLog(id) {
+        return this.agentUpdates.readLog(id);
+    }
+    sendAgentUpdateInput(id, input) {
+        return this.agentUpdates.sendInput(id, input);
+    }
+    cancelAgentUpdate(id) {
+        return this.agentUpdates.cancel(id);
+    }
     async diagnostics() {
         return {
             health: await getConnectorHealth({ piCliPath: this.config.piCliPath, hermesCliPath: this.config.hermesCliPath, openClawCliPath: this.config.openClawCliPath, claudeCodeCliPath: this.config.claudeCodeCliPath }),
@@ -380,9 +433,11 @@ export class RelayRuntime {
     async sessionDetail(threadId) {
         const session = await this.getSession(true);
         const record = session.getSessionRecord(threadId);
+        const active = this.publicInfo(session);
         return {
             record,
-            active: this.publicInfo(session),
+            active,
+            usageRows: active.threadId === threadId ? renderSessionUsageRows(active) : [],
             messages: this.chatStore.list(threadId, 100),
             activity: this.activity({ limit: 100 }).filter((event) => event.threadId === threadId),
         };
@@ -395,7 +450,7 @@ export class RelayRuntime {
         return { removed, messages };
     }
     activity(options = {}) {
-        return this.activityStore.list(options);
+        return this.activityStore.list(options).map((event) => this.enrichActivityEvent(event));
     }
     async retry() {
         const cached = this.promptStore.getLastPrompt(WEB_CONTEXT_KEY);
@@ -442,25 +497,40 @@ export class RelayRuntime {
         });
         return result;
     }
-    async listSessions(limit = 80, query = "") {
-        return this.filteredSessions(await this.getSession(true), query, Math.max(1, limit * 3)).slice(0, limit);
+    async listSessions(limit = 80, query = "", agentId) {
+        const { session, dispose } = await this.getControlSession(agentId);
+        try {
+            return this.filteredSessions(session, query, Math.max(1, limit * 3)).slice(0, limit);
+        }
+        finally {
+            if (dispose) {
+                session.dispose();
+            }
+        }
     }
-    async listSessionsPage(page = 1, pageSize = MAX_WEB_SESSION_PAGE_SIZE, query = "") {
-        const session = await this.getSession(true);
-        const effectivePage = Math.max(1, Math.floor(page));
-        const effectivePageSize = Math.min(MAX_WEB_SESSION_PAGE_SIZE, Math.max(1, Math.floor(pageSize)));
-        const offset = (effectivePage - 1) * effectivePageSize;
-        const requested = Math.min(5_000, Math.max(100, (offset + effectivePageSize + 1) * 3));
-        const records = this.filteredSessions(session, query, requested);
-        return {
-            sessions: records.slice(offset, offset + effectivePageSize),
-            pagination: {
-                page: effectivePage,
-                pageSize: effectivePageSize,
-                hasPrevious: effectivePage > 1,
-                hasNext: records.length > offset + effectivePageSize,
-            },
-        };
+    async listSessionsPage(page = 1, pageSize = MAX_WEB_SESSION_PAGE_SIZE, query = "", agentId) {
+        const { session, dispose } = await this.getControlSession(agentId);
+        try {
+            const effectivePage = Math.max(1, Math.floor(page));
+            const effectivePageSize = Math.min(MAX_WEB_SESSION_PAGE_SIZE, Math.max(1, Math.floor(pageSize)));
+            const offset = (effectivePage - 1) * effectivePageSize;
+            const requested = Math.min(5_000, Math.max(100, (offset + effectivePageSize + 1) * 3));
+            const records = this.filteredSessions(session, query, requested);
+            return {
+                sessions: records.slice(offset, offset + effectivePageSize),
+                pagination: {
+                    page: effectivePage,
+                    pageSize: effectivePageSize,
+                    hasPrevious: effectivePage > 1,
+                    hasNext: records.length > offset + effectivePageSize,
+                },
+            };
+        }
+        finally {
+            if (dispose) {
+                session.dispose();
+            }
+        }
     }
     filteredSessions(session, query, limit) {
         const normalized = query.trim().toLowerCase();
@@ -814,11 +884,25 @@ export class RelayRuntime {
     }
     async logs(target = "connector", lines = 100) {
         if (target === "update") {
-            const { getUpdateLogPath } = await import("./operations.js");
             return readFormattedLogTail(lines, getUpdateLogPath());
         }
+        if (target === "agent-updates") {
+            return readFormattedLogTail(lines, getAgentUpdateLogPath());
+        }
         return readFormattedLogTail(lines);
     }
+    clearLogs(target = "connector") {
+        const result = clearLogFile(target === "update" ? getUpdateLogPath() : target === "agent-updates" ? getAgentUpdateLogPath() : getConnectorLogPath());
+        this.appendActivity({
+            source: "web",
+            status: "info",
+            type: "logs_cleared",
+            threadId: null,
+            workspace: this.config.workspace,
+            detail: `Cleared ${target} log.`,
+        });
+        return { ok: true, filePath: result.filePath, clearedAt: result.clearedAt.toISOString() };
+    }
     restartConnector() {
         spawnConnectorRestart();
         this.broadcastStatus("Restart requested. The dashboard may disconnect briefly.", "warn");
@@ -836,6 +920,7 @@ export class RelayRuntime {
         if (this.externalMonitor) {
             clearInterval(this.externalMonitor);
         }
+        this.agentUpdates.cancelAll();
         this.registry.disposeAll();
         this.subscribers.clear();
     }
@@ -1254,10 +1339,29 @@ export class RelayRuntime {
         this.broadcast({ type: "session_update", session: this.publicInfo(session) });
     }
     appendActivity(input) {
-        const event = this.activityStore.append(input);
+        const event = this.activityStore.append(this.enrichActivityInput(input));
         this.broadcast({ type: "activity_update", events: this.activity({ limit: 50 }) });
         return event;
     }
+    enrichActivityInput(input) {
+        return this.enrichActivityFields(input);
+    }
+    enrichActivityEvent(event) {
+        return this.enrichActivityFields(event);
+    }
+    enrichActivityFields(event) {
+        const info = this.registry.get(WEB_CONTEXT_KEY)?.getInfo();
+        if (!info) {
+            return !event.threadId && !event.workspace ? { ...event, workspace: this.config.workspace } : event;
+        }
+        if (event.threadId && info.threadId && event.threadId === info.threadId) {
+            return { ...event, workspace: event.workspace ?? info.workspace, agentId: event.agentId ?? info.agentId };
+        }
+        if (!event.threadId && !event.workspace) {
+            return { ...event, workspace: this.config.workspace };
+        }
+        return event;
+    }
     appendAudit(input) {
         return this.auditStore.append({ ...input, channelId: "web" });
     }

package/dist/session-format.js

@@ -17,13 +17,27 @@ export function renderSessionInfoPlain(info) {
         capabilities.fastMode
             ? `Reasoning/Fast: ${info.reasoningEffort ?? "(model default)"} / ${info.fastMode ? "on" : "off"}`
             : `${agentReasoningLabel(agentId)}: ${info.reasoningEffort ?? "(model default)"}`,
-        ...renderCodexUsagePlain(info, capabilities),
-        ...renderAgentUsagePlain(info, capabilities),
-        info.sessionTokens ? formatSessionTokensPlain(info.sessionTokens) : undefined,
+        ...renderSessionUsageRowsPlain(info),
     ]
         .filter((line) => Boolean(line))
         .join("\n");
 }
+export function renderSessionUsageRowsPlain(info) {
+    const capabilities = info.capabilities ?? CODEX_AGENT_CAPABILITIES;
+    return [
+        ...renderCodexUsagePlain(info, capabilities),
+        ...renderAgentUsagePlain(info, capabilities),
+        info.sessionTokens ? formatSessionTokensPlain(info.sessionTokens) : undefined,
+    ].filter((line) => Boolean(line));
+}
+export function renderSessionUsageRows(info) {
+    const capabilities = info.capabilities ?? CODEX_AGENT_CAPABILITIES;
+    return [
+        ...renderCodexUsageRows(info, capabilities),
+        ...renderAgentUsageRows(info, capabilities),
+        info.sessionTokens ? ["Session tokens", formatSessionTokensValue(info.sessionTokens)] : undefined,
+    ].filter((row) => Boolean(row));
+}
 export function renderSessionInfoHTML(info) {
     const capabilities = info.capabilities ?? CODEX_AGENT_CAPABILITIES;
     const agentId = info.agentId ?? "codex";
@@ -117,6 +131,37 @@ function renderCodexUsageHTML(info, capabilities) {
     }
     return lines;
 }
+function renderCodexUsageRows(info, capabilities) {
+    const usage = info.codexUsage;
+    if (!usage) {
+        return [];
+    }
+    const rows = [];
+    if (capabilities.usageStats && usage.contextUsedPercent !== null && usage.contextWindow !== null && usage.lastTokenUsage) {
+        rows.push([
+            "Context used",
+            `${formatPercent(usage.contextUsedPercent)} (${formatCompactTokenCount(usage.lastTokenUsage.totalTokens)} / ${formatCompactTokenCount(usage.contextWindow)})`,
+        ]);
+    }
+    if (capabilities.usageStats && usage.totalTokenUsage) {
+        rows.push([
+            "Tokens",
+            [
+                `in ${formatCompactTokenCount(usage.totalTokenUsage.inputTokens)}`,
+                `cached ${formatCompactTokenCount(usage.totalTokenUsage.cachedInputTokens)}`,
+                `out ${formatCompactTokenCount(usage.totalTokenUsage.outputTokens)}`,
+                `reasoning out ${formatCompactTokenCount(usage.totalTokenUsage.reasoningOutputTokens)}`,
+            ].join(" · "),
+        ]);
+    }
+    if (capabilities.subscriptionLimits) {
+        const limits = formatLimitsLeft(usage);
+        if (limits) {
+            rows.push(["Limits left", limits]);
+        }
+    }
+    return rows;
+}
 function renderAgentUsagePlain(info, capabilities) {
     if (!capabilities.usageStats) {
         return [];
@@ -159,6 +204,30 @@ function renderAgentUsageHTML(info, capabilities) {
     }
     return lines;
 }
+function renderAgentUsageRows(info, capabilities) {
+    if (!capabilities.usageStats) {
+        return [];
+    }
+    const rows = [];
+    if (info.contextUsage?.percent !== undefined && info.contextUsage.percent !== null) {
+        const contextWindow = info.contextUsage.contextWindow !== null && info.contextUsage.contextWindow !== undefined
+            ? ` (${formatCompactTokenCount(info.contextUsage.tokens ?? 0)} / ${formatCompactTokenCount(info.contextUsage.contextWindow)})`
+            : "";
+        rows.push(["Context used", `${formatPercent(info.contextUsage.percent)}${contextWindow}`]);
+    }
+    if (info.sessionUsage) {
+        rows.push([
+            "Tokens",
+            [
+                `in ${formatCompactTokenCount(info.sessionUsage.input)}`,
+                `cache read ${formatCompactTokenCount(info.sessionUsage.cacheRead)}`,
+                `cache write ${formatCompactTokenCount(info.sessionUsage.cacheWrite)}`,
+                `out ${formatCompactTokenCount(info.sessionUsage.output)}`,
+            ].join(" · "),
+        ]);
+    }
+    return rows;
+}
 function formatLimitsLeft(usage) {
     const parts = [];
     if (usage.rateLimits?.primary) {

package/dist/web-dashboard-assets.js

@@ -0,0 +1,2 @@
+export { dashboardJs } from "./web-dashboard-client.js";
+export { dashboardCss } from "./web-dashboard-style.js";