@nordbyte/nordrelay 0.5.2 → 0.6.0

package/dist/relay-external-activity-monitor.js

@@ -2,6 +2,10 @@ import {} from "./agent.js";
 import { getExternalSnapshotForSession } from "./agent-activity.js";
 import { friendlyErrorText } from "./error-messages.js";
 import {} from "./web-state.js";
+const CLI_ACTIVITY_ACTOR = {
+    channel: "cli",
+    label: "CLI",
+};
 export class RelayExternalActivityMonitor {
     options;
     mirror = null;
@@ -16,7 +20,9 @@ export class RelayExternalActivityMonitor {
         if (!this.mirror) {
             return null;
         }
-        const startedAt = this.mirror.startedAt ?? new Date().toISOString();
+        const startedAt = this.mirror.startedAt instanceof Date
+            ? this.mirror.startedAt.toISOString()
+            : this.mirror.startedAt ?? new Date().toISOString();
         const startedMs = new Date(startedAt).getTime();
         return {
             id: this.mirror.turnId ?? "cli",
@@ -75,7 +81,7 @@ export class RelayExternalActivityMonitor {
                 startedAt: snapshot.activity.startedAt?.toISOString() ?? null,
             };
             if (snapshot.activity.active) {
-                this.startExternalTurn(snapshot);
+                this.startExternalTurn(snapshot, info);
             }
             return;
         }
@@ -85,9 +91,9 @@ export class RelayExternalActivityMonitor {
                 mirror.turnId = snapshot.activity.turnId;
                 mirror.startedAt = snapshot.activity.startedAt?.toISOString() ?? null;
                 mirror.latestAgentLine = undefined;
-                this.startExternalTurn(snapshot);
+                this.startExternalTurn(snapshot, info);
             }
-            this.broadcastExternalEvents(snapshot, snapshot.events.filter((event) => event.lineNumber > mirror.lastLine));
+            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");
@@ -122,6 +128,7 @@ export class RelayExternalActivityMonitor {
                 threadId: snapshot.threadId,
                 workspace: info.workspace,
                 agentId: info.agentId,
+                actor: CLI_ACTIVITY_ACTOR,
                 prompt: snapshot.latestUserMessage ?? undefined,
                 detail: `${snapshot.agentLabel} CLI task ${terminalEvent.status ?? "finished"}.`,
                 durationMs: durationFromDates(externalStartedAt, terminalEvent.timestamp),
@@ -136,7 +143,7 @@ export class RelayExternalActivityMonitor {
         }
         mirror.lastLine = Math.max(mirror.lastLine, snapshot.lineCount);
     }
-    startExternalTurn(snapshot) {
+    startExternalTurn(snapshot, info) {
         const prompt = snapshot.latestUserMessage ?? `${snapshot.agentLabel} CLI task`;
         this.options.chatStore.append({
             threadId: snapshot.threadId,
@@ -158,11 +165,14 @@ export class RelayExternalActivityMonitor {
             status: "running",
             type: "cli_turn_started",
             threadId: snapshot.threadId,
+            workspace: info.workspace,
+            agentId: info.agentId,
+            actor: CLI_ACTIVITY_ACTOR,
             prompt,
             detail: `${snapshot.sourceLabel}: ${snapshot.sourcePath}`,
         });
     }
-    broadcastExternalEvents(snapshot, events) {
+    broadcastExternalEvents(snapshot, events, info) {
         for (const event of events) {
             if (event.kind === "tool" && event.status === "started") {
                 this.options.broadcast({
@@ -176,6 +186,9 @@ export class RelayExternalActivityMonitor {
                     status: "running",
                     type: "cli_tool_started",
                     threadId: snapshot.threadId,
+                    workspace: info.workspace,
+                    agentId: info.agentId,
+                    actor: CLI_ACTIVITY_ACTOR,
                     detail: event.toolName ?? "tool",
                 });
             }
@@ -186,6 +199,34 @@ export class RelayExternalActivityMonitor {
                     toolCallId: `cli-${event.lineNumber}`,
                     isError: false,
                 });
+                this.options.appendActivity({
+                    source: "cli",
+                    status: "completed",
+                    type: "cli_tool_completed",
+                    threadId: snapshot.threadId,
+                    workspace: info.workspace,
+                    agentId: info.agentId,
+                    actor: CLI_ACTIVITY_ACTOR,
+                    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,
+                });
+                this.options.appendActivity({
+                    source: "cli",
+                    status: "failed",
+                    type: "cli_tool_failed",
+                    threadId: snapshot.threadId,
+                    workspace: info.workspace,
+                    agentId: info.agentId,
+                    actor: CLI_ACTIVITY_ACTOR,
+                    detail: event.toolName ?? "tool",
+                });
             }
         }
     }