@nordbyte/nordrelay 0.8.1 → 0.8.3

package/dist/{relay-external-activity-monitor.js → runtime/relay-external-activity-monitor.js}

@@ -1,7 +1,8 @@
-import {} from "./agent.js";
-import { getExternalSnapshotForSession } from "./agent-activity.js";
-import { friendlyErrorText } from "./error-messages.js";
-import {} from "./web-state.js";
+import {} from "../agents/shared/agent.js";
+import { getExternalSnapshotForSession } from "../agents/shared/agent-activity.js";
+import { renderExternalMirrorEvent, renderExternalMirrorStatus, trimLine, } from "../channels/shared/bot-rendering.js";
+import { friendlyErrorText } from "../core/error-messages.js";
+import {} from "../web/web-state.js";
 const CLI_ACTIVITY_ACTOR = {
     channel: "cli",
     label: "CLI",
@@ -16,6 +17,9 @@ export class RelayExternalActivityMonitor {
     snapshot() {
         return this.mirror ? { ...this.mirror } : null;
     }
+    reset() {
+        this.mirror = null;
+    }
     task() {
         if (!this.mirror) {
             return null;
@@ -81,7 +85,7 @@ export class RelayExternalActivityMonitor {
                 startedAt: snapshot.activity.startedAt?.toISOString() ?? null,
             };
             if (snapshot.activity.active) {
-                this.startExternalTurn(snapshot, info);
+                await this.startExternalTurn(snapshot, info);
             }
             return;
         }
@@ -91,36 +95,53 @@ export class RelayExternalActivityMonitor {
                 mirror.turnId = snapshot.activity.turnId;
                 mirror.startedAt = snapshot.activity.startedAt?.toISOString() ?? null;
                 mirror.latestAgentLine = undefined;
-                this.startExternalTurn(snapshot, info);
+                mirror.latestStatusAt = undefined;
+                mirror.latestMirroredEventLine = undefined;
+                await this.startExternalTurn(snapshot, info);
+            }
+            const mirrorMode = this.options.mirrorMode();
+            const newEvents = snapshot.events.filter((event) => event.lineNumber > mirror.lastLine);
+            this.broadcastExternalEvents(snapshot, newEvents, info, mirrorMode === "full");
+            if (mirrorMode === "full") {
+                await this.appendExternalEventMessages(snapshot, newEvents, mirror);
             }
-            this.broadcastExternalEvents(snapshot, snapshot.events.filter((event) => event.lineNumber > mirror.lastLine), info);
             mirror.lastLine = Math.max(mirror.lastLine, snapshot.lineCount);
             mirror.latestStatus = externalStatusLine(snapshot, this.options.queueLength());
-            this.options.broadcastStatus(mirror.latestStatus, "info");
+            if (mirrorMode === "status" || mirrorMode === "full") {
+                await this.updateExternalStatusMessage(snapshot, mirror);
+            }
+            if (mirrorMode !== "off") {
+                this.options.broadcastStatus(mirror.latestStatus, "info");
+            }
             return;
         }
         const terminalEvent = [...snapshot.events].reverse().find((event) => event.kind === "task" && event.status && event.status !== "started");
         if (terminalEvent && terminalEvent.lineNumber > mirror.lastLine) {
+            const mirrorMode = this.options.mirrorMode();
             const finalAgent = snapshot.events.filter((event) => event.kind === "agent" && event.text).at(-1);
             const finalText = finalAgent?.text ?? snapshot.latestAgentMessage;
             const finalLine = finalAgent?.lineNumber ?? snapshot.lineCount;
-            if (finalText && finalLine !== mirror.latestAgentLine) {
-                this.options.chatStore.append({
+            if ((mirrorMode === "final" || mirrorMode === "full") && finalText && finalLine !== mirror.latestAgentLine) {
+                this.options.chatStore.appendWithResult({
                     threadId: snapshot.threadId,
                     role: "agent",
                     text: finalText,
                     source: "cli",
+                    correlationId: externalCorrelationId(snapshot),
                     turnId: terminalEvent.turnId ?? undefined,
+                    key: externalMessageKey("final", snapshot, terminalEvent.lineNumber),
                 });
-                this.options.broadcast({ type: "text_delta", id: terminalEvent.turnId ?? "cli", delta: finalText });
                 mirror.latestAgentLine = finalLine;
             }
             const externalStartedAt = mirror.startedAt ? new Date(mirror.startedAt) : snapshot.activity.startedAt;
-            this.options.broadcast({
-                type: "turn_complete",
-                id: terminalEvent.turnId ?? "cli",
-                at: terminalEvent.timestamp?.toISOString() ?? new Date().toISOString(),
-            });
+            if (mirrorMode !== "off") {
+                this.options.broadcast({
+                    type: "turn_complete",
+                    id: terminalEvent.turnId ?? "cli",
+                    at: terminalEvent.timestamp?.toISOString() ?? new Date().toISOString(),
+                    correlationId: externalCorrelationId(snapshot),
+                });
+            }
             this.options.appendActivity({
                 source: "cli",
                 status: terminalEvent.status === "aborted" ? "aborted" : terminalEvent.status === "failed" ? "failed" : "completed",
@@ -129,6 +150,7 @@ export class RelayExternalActivityMonitor {
                 workspace: info.workspace,
                 agentId: info.agentId,
                 actor: CLI_ACTIVITY_ACTOR,
+                correlationId: externalCorrelationId(snapshot),
                 prompt: snapshot.latestUserMessage ?? undefined,
                 detail: `${snapshot.agentLabel} CLI task ${terminalEvent.status ?? "finished"}.`,
                 durationMs: durationFromDates(externalStartedAt, terminalEvent.timestamp),
@@ -137,29 +159,36 @@ export class RelayExternalActivityMonitor {
                 await this.options.persistWorkspaceArtifactsForTurn(info.workspace, terminalEvent.turnId, externalStartedAt);
             }
             mirror.latestStatus = `${snapshot.agentLabel} CLI task ${terminalEvent.status ?? "finished"}.`;
-            this.options.broadcastStatus(`${snapshot.agentLabel} CLI task ${terminalEvent.status ?? "finished"}.`, terminalEvent.status === "failed" ? "error" : terminalEvent.status === "aborted" ? "warn" : "info");
-            this.options.broadcast({ type: "chat_history", messages: await this.options.chatHistory() });
+            if (mirrorMode === "status" || mirrorMode === "full") {
+                await this.updateExternalStatusMessage(snapshot, mirror, mirror.latestStatus);
+            }
+            if (mirrorMode !== "off") {
+                this.options.broadcastStatus(`${snapshot.agentLabel} CLI task ${terminalEvent.status ?? "finished"}.`, terminalEvent.status === "failed" ? "error" : terminalEvent.status === "aborted" ? "warn" : "info");
+                await this.broadcastChatHistory();
+            }
             await this.options.drainQueue();
         }
         mirror.lastLine = Math.max(mirror.lastLine, snapshot.lineCount);
     }
-    startExternalTurn(snapshot, info) {
+    async startExternalTurn(snapshot, info) {
         const prompt = snapshot.latestUserMessage ?? `${snapshot.agentLabel} CLI task`;
-        this.options.chatStore.append({
-            threadId: snapshot.threadId,
-            role: "user",
-            text: prompt,
-            source: "cli",
-            turnId: snapshot.activity.turnId ?? undefined,
-            timestamp: snapshot.activity.startedAt?.toISOString(),
-        });
-        this.options.broadcast({
-            type: "turn_start",
-            id: snapshot.activity.turnId ?? "cli",
-            prompt,
-            at: snapshot.activity.startedAt?.toISOString() ?? new Date().toISOString(),
-            source: "cli",
-        });
+        const mode = this.options.mirrorMode();
+        if (mode === "final" || mode === "full") {
+            this.options.chatStore.appendWithResult({
+                threadId: snapshot.threadId,
+                role: "system",
+                text: `Working on ${trimLine(prompt, 500)}`,
+                source: "cli",
+                correlationId: externalCorrelationId(snapshot),
+                turnId: snapshot.activity.turnId ?? undefined,
+                timestamp: snapshot.activity.startedAt?.toISOString(),
+                key: externalMessageKey("working", snapshot),
+            });
+            await this.broadcastChatHistory();
+        }
+        if ((mode === "status" || mode === "full") && this.mirror) {
+            await this.updateExternalStatusMessage(snapshot, this.mirror);
+        }
         this.options.appendActivity({
             source: "cli",
             status: "running",
@@ -168,19 +197,23 @@ export class RelayExternalActivityMonitor {
             workspace: info.workspace,
             agentId: info.agentId,
             actor: CLI_ACTIVITY_ACTOR,
+            correlationId: externalCorrelationId(snapshot),
             prompt,
             detail: `${snapshot.sourceLabel}: ${snapshot.sourcePath}`,
         });
     }
-    broadcastExternalEvents(snapshot, events, info) {
+    broadcastExternalEvents(snapshot, events, info, broadcastTools) {
         for (const event of events) {
             if (event.kind === "tool" && event.status === "started") {
-                this.options.broadcast({
-                    type: "tool_start",
-                    id: snapshot.activity.turnId ?? "cli",
-                    toolCallId: `cli-${event.lineNumber}`,
-                    toolName: event.toolName ?? "tool",
-                });
+                if (broadcastTools) {
+                    this.options.broadcast({
+                        type: "tool_start",
+                        id: snapshot.activity.turnId ?? "cli",
+                        toolCallId: `cli-${event.lineNumber}`,
+                        toolName: event.toolName ?? "tool",
+                        correlationId: externalCorrelationId(snapshot),
+                    });
+                }
                 this.options.appendActivity({
                     source: "cli",
                     status: "running",
@@ -189,16 +222,20 @@ export class RelayExternalActivityMonitor {
                     workspace: info.workspace,
                     agentId: info.agentId,
                     actor: CLI_ACTIVITY_ACTOR,
+                    correlationId: externalCorrelationId(snapshot),
                     detail: event.toolName ?? "tool",
                 });
             }
             if (event.kind === "tool" && event.status === "finished") {
-                this.options.broadcast({
-                    type: "tool_end",
-                    id: snapshot.activity.turnId ?? "cli",
-                    toolCallId: `cli-${event.lineNumber}`,
-                    isError: false,
-                });
+                if (broadcastTools) {
+                    this.options.broadcast({
+                        type: "tool_end",
+                        id: snapshot.activity.turnId ?? "cli",
+                        toolCallId: `cli-${event.lineNumber}`,
+                        isError: false,
+                        correlationId: externalCorrelationId(snapshot),
+                    });
+                }
                 this.options.appendActivity({
                     source: "cli",
                     status: "completed",
@@ -207,16 +244,20 @@ export class RelayExternalActivityMonitor {
                     workspace: info.workspace,
                     agentId: info.agentId,
                     actor: CLI_ACTIVITY_ACTOR,
+                    correlationId: externalCorrelationId(snapshot),
                     detail: event.toolName ?? "tool",
                 });
             }
             if (event.kind === "tool" && event.status === "failed") {
-                this.options.broadcast({
-                    type: "tool_end",
-                    id: snapshot.activity.turnId ?? "cli",
-                    toolCallId: `cli-${event.lineNumber}`,
-                    isError: true,
-                });
+                if (broadcastTools) {
+                    this.options.broadcast({
+                        type: "tool_end",
+                        id: snapshot.activity.turnId ?? "cli",
+                        toolCallId: `cli-${event.lineNumber}`,
+                        isError: true,
+                        correlationId: externalCorrelationId(snapshot),
+                    });
+                }
                 this.options.appendActivity({
                     source: "cli",
                     status: "failed",
@@ -230,6 +271,67 @@ export class RelayExternalActivityMonitor {
             }
         }
     }
+    async appendExternalEventMessages(snapshot, events, mirror) {
+        let changed = false;
+        for (const event of events) {
+            if (event.lineNumber <= (mirror.latestMirroredEventLine ?? mirror.lastLine)) {
+                continue;
+            }
+            const rendered = renderExternalMirrorEvent(event);
+            if (!rendered) {
+                continue;
+            }
+            const stored = this.options.chatStore.appendWithResult({
+                threadId: snapshot.threadId,
+                role: event.kind === "tool" ? "tool" : "system",
+                text: rendered.plain,
+                source: "cli",
+                correlationId: externalCorrelationId(snapshot),
+                turnId: event.turnId ?? snapshot.activity.turnId ?? undefined,
+                timestamp: event.timestamp?.toISOString(),
+                key: externalMessageKey("event", snapshot, event.lineNumber),
+            });
+            changed = changed || stored.inserted;
+            mirror.latestMirroredEventLine = event.lineNumber;
+        }
+        if (changed) {
+            await this.broadcastChatHistory();
+        }
+    }
+    async updateExternalStatusMessage(snapshot, mirror, text) {
+        const now = Date.now();
+        const minInterval = this.options.mirrorMinUpdateMs();
+        if (!text && mirror.latestStatusAt && now - mirror.latestStatusAt < minInterval) {
+            return;
+        }
+        this.options.chatStore.upsertByKey({
+            threadId: snapshot.threadId,
+            role: "system",
+            text: text ?? renderExternalMirrorStatus(snapshot, this.options.queueLength()).plain,
+            source: "cli",
+            correlationId: externalCorrelationId(snapshot),
+            turnId: snapshot.activity.turnId ?? undefined,
+            key: externalMessageKey("status", snapshot),
+        });
+        mirror.latestStatusAt = now;
+        await this.broadcastChatHistory();
+    }
+    async broadcastChatHistory() {
+        this.options.broadcast({ type: "chat_history", messages: await this.options.chatHistory() });
+    }
+}
+function externalMessageKey(kind, snapshot, lineNumber) {
+    return [
+        "external",
+        kind,
+        snapshot.agentId,
+        snapshot.threadId,
+        snapshot.activity.turnId ?? "turn",
+        lineNumber ?? "",
+    ].join(":");
+}
+function externalCorrelationId(snapshot) {
+    return `cli:${snapshot.agentId}:${snapshot.activity.turnId ?? snapshot.threadId}`;
 }
 function externalStatusLine(snapshot, queueLength) {
     const elapsed = snapshot.activity.startedAt

package/dist/{relay-queue-service.js → runtime/relay-queue-service.js}

@@ -60,6 +60,7 @@ export function queueItemDto(item) {
         description: item.description,
         createdAt: new Date(item.createdAt).toISOString(),
         attempts: item.attempts ?? 0,
+        correlationId: item.correlationId,
         notBefore: item.notBefore ? new Date(item.notBefore).toISOString() : undefined,
         lastError: item.lastError,
     };