@nordbyte/nordrelay 0.8.1 → 0.8.3

package/dist/{channel-turn-service.js → channels/shared/channel-turn-service.js}

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
-import { CODEX_AGENT_CAPABILITIES, agentLabel, } from "./agent.js";
-import { friendlyErrorText } from "./error-messages.js";
+import { CODEX_AGENT_CAPABILITIES, agentLabel, } from "../../agents/shared/agent.js";
+import { friendlyErrorText } from "../../core/error-messages.js";
 export class ChannelTurnService {
     options;
     constructor(options) {
@@ -17,12 +17,14 @@ export class ChannelTurnService {
             }
         }
         const turnId = randomUUID().slice(0, 12);
+        const correlationId = envelope.correlationId ?? turnId;
         const startedMs = Date.now();
         this.options.setCurrentTurn(turnId, startedMs, "");
         this.options.setCurrentProgress({
             id: turnId,
             source: this.options.source,
             status: "running",
+            correlationId,
             prompt: envelope.description,
             agentId: info.agentId,
             agentLabel: info.agentLabel,
@@ -42,6 +44,7 @@ export class ChannelTurnService {
             role: "user",
             text: envelope.description,
             source: this.options.source,
+            correlationId,
             turnId,
             timestamp: startedAt,
         });
@@ -53,6 +56,7 @@ export class ChannelTurnService {
             workspace: info.workspace,
             agentId: info.agentId,
             actor,
+            correlationId,
             prompt: envelope.description,
         });
         this.options.appendAudit({
@@ -63,9 +67,10 @@ export class ChannelTurnService {
             threadId: info.threadId,
             workspace: info.workspace,
             actor,
+            correlationId,
             description: envelope.description,
         });
-        this.options.broadcast({ type: "turn_start", id: turnId, prompt: envelope.description, at: startedAt, source: this.options.source });
+        this.options.broadcast({ type: "turn_start", id: turnId, prompt: envelope.description, at: startedAt, source: this.options.source, correlationId });
         try {
             await session.prompt(envelope.input, this.callbacks(turnId, info, envelope, actor));
             this.options.updateSession(session);
@@ -77,6 +82,7 @@ export class ChannelTurnService {
                     role: "agent",
                     text,
                     source: this.options.source,
+                    correlationId,
                     turnId,
                 });
             }
@@ -88,6 +94,7 @@ export class ChannelTurnService {
                 workspace: info.workspace,
                 agentId: info.agentId,
                 actor,
+                correlationId,
                 prompt: envelope.description,
                 durationMs: Date.now() - this.options.getCurrentTurnStartedAt(),
             });
@@ -99,10 +106,11 @@ export class ChannelTurnService {
                 threadId: info.threadId,
                 workspace: info.workspace,
                 actor,
+                correlationId,
                 description: envelope.description,
             });
             this.updateCurrentProgress({ status: "completed" });
-            this.options.broadcast({ type: "turn_complete", id: turnId, at: new Date().toISOString() });
+            this.options.broadcast({ type: "turn_complete", id: turnId, at: new Date().toISOString(), correlationId });
             this.options.broadcast({ type: "chat_history", messages: await this.options.chatHistory() });
         }
         catch (error) {
@@ -112,6 +120,7 @@ export class ChannelTurnService {
                 role: "system",
                 text: `Error: ${errorText}`,
                 source: this.options.source,
+                correlationId,
                 turnId,
             });
             this.options.appendActivity({
@@ -122,6 +131,7 @@ export class ChannelTurnService {
                 workspace: info.workspace,
                 agentId: info.agentId,
                 actor,
+                correlationId,
                 prompt: envelope.description,
                 detail: errorText,
                 durationMs: Date.now() - this.options.getCurrentTurnStartedAt(),
@@ -134,11 +144,12 @@ export class ChannelTurnService {
                 threadId: info.threadId,
                 workspace: info.workspace,
                 actor,
+                correlationId,
                 description: envelope.description,
                 detail: errorText,
             });
             this.updateCurrentProgress({ status: "failed", detail: errorText });
-            this.options.broadcast({ type: "turn_error", id: turnId, error: errorText, at: new Date().toISOString() });
+            this.options.broadcast({ type: "turn_error", id: turnId, error: errorText, at: new Date().toISOString(), correlationId });
             this.options.broadcast({ type: "chat_history", messages: await this.options.chatHistory() });
             throw error;
         }
@@ -152,12 +163,13 @@ export class ChannelTurnService {
         }
     }
     callbacks(turnId, info, envelope, actor) {
+        const correlationId = envelope.correlationId ?? turnId;
         return {
             onTextDelta: (delta) => {
                 const nextText = this.options.getAccumulatedText() + delta;
                 this.options.setAccumulatedText(nextText);
                 this.updateCurrentProgress({ outputChars: nextText.length });
-                this.options.broadcast({ type: "text_delta", id: turnId, delta });
+                this.options.broadcast({ type: "text_delta", id: turnId, delta, correlationId });
             },
             onToolStart: (toolName, toolCallId) => {
                 this.addCurrentTool(toolName);
@@ -169,14 +181,15 @@ export class ChannelTurnService {
                     workspace: info.workspace,
                     agentId: info.agentId,
                     actor,
+                    correlationId,
                     prompt: envelope.description,
                     detail: toolName,
                 });
-                this.options.broadcast({ type: "tool_start", id: turnId, toolCallId, toolName });
+                this.options.broadcast({ type: "tool_start", id: turnId, toolCallId, toolName, correlationId });
             },
             onToolUpdate: (toolCallId, partialResult) => {
                 this.updateCurrentProgress();
-                this.options.broadcast({ type: "tool_update", id: turnId, toolCallId, partialResult });
+                this.options.broadcast({ type: "tool_update", id: turnId, toolCallId, partialResult, correlationId });
             },
             onToolEnd: (toolCallId, isError) => {
                 const progress = this.options.getCurrentProgress();
@@ -190,17 +203,18 @@ export class ChannelTurnService {
                     workspace: info.workspace,
                     agentId: info.agentId,
                     actor,
+                    correlationId,
                     prompt: envelope.description,
                     detail: toolName,
                 });
-                this.options.broadcast({ type: "tool_end", id: turnId, toolCallId, isError });
+                this.options.broadcast({ type: "tool_end", id: turnId, toolCallId, isError, correlationId });
             },
             onTodoUpdate: (items) => {
                 this.updateCurrentProgress({ detail: `Plan: ${items.filter((item) => item.completed).length}/${items.length} done` });
-                this.options.broadcast({ type: "todo_update", id: turnId, items });
+                this.options.broadcast({ type: "todo_update", id: turnId, items, correlationId });
             },
             onTurnComplete: () => { },
-            onAgentEnd: () => this.options.broadcast({ type: "turn_complete", id: turnId, at: new Date().toISOString() }),
+            onAgentEnd: () => this.options.broadcast({ type: "turn_complete", id: turnId, at: new Date().toISOString(), correlationId }),
         };
     }
     updateCurrentProgress(patch = {}) {

package/dist/{context-key.js → channels/shared/context-key.js}

@@ -1,4 +1,4 @@
-import { parsePeerRuntimeContextKey } from "./peer-context.js";
+import { parsePeerRuntimeContextKey } from "../../peers/peer-context.js";
 export function telegramContextKeyFromMessage(chatId, messageThreadId) {
     if (messageThreadId !== undefined) {
         return `${chatId}:${messageThreadId}`;

package/dist/{session-format.js → channels/shared/session-format.js}

@@ -1,5 +1,5 @@
-import { CODEX_AGENT_CAPABILITIES, agentReasoningLabel } from "./agent.js";
-import { escapeHTML } from "./format.js";
+import { CODEX_AGENT_CAPABILITIES, agentReasoningLabel } from "../../agents/shared/agent.js";
+import { escapeHTML } from "../../core/format.js";
 export function renderSessionInfoPlain(info) {
     const capabilities = info.capabilities ?? CODEX_AGENT_CAPABILITIES;
     const agentId = info.agentId ?? "codex";

package/dist/{slack-artifacts.js → channels/slack/slack-artifacts.js}

@@ -1,7 +1,7 @@
-import { collectRecentWorkspaceArtifacts, createArtifactZipBundle, formatArtifactSummary, listRecentArtifactReports } from "./artifacts.js";
-import { filterArtifactReports as filterArtifactReportsForCommand } from "./bot-rendering.js";
-import { renderArtifactReportsAction } from "./channel-actions.js";
-import { deliverChannelAction } from "./channel-runtime.js";
+import { collectRecentWorkspaceArtifacts, createArtifactZipBundle, formatArtifactSummary, listRecentArtifactReports } from "../../artifacts/artifacts.js";
+import { filterArtifactReports as filterArtifactReportsForCommand } from "../shared/bot-rendering.js";
+import { renderArtifactReportsAction } from "../shared/channel-actions.js";
+import { deliverChannelAction } from "../shared/channel-runtime.js";
 export function createSlackArtifactCommandHandler(deps) {
     return async (request, argument) => {
         const session = await deps.getSession(request, { deferThreadStart: true });