@meshagent/meshagent-agents 0.46.4 → 0.47.1

package/dist/node/chat-client.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChatThreadSession = exports.MessagingChatClient = exports.BaseChatClient = exports.ChatThreadStartResult = exports.ChatThreadSessionLoadState = exports.ChatThreadSessionLoadPhase = exports.PendingAgentInput = exports.AgentMessageEvent = void 0;
+exports.ChatThreadSession = exports.MessagingChatClient = exports.BaseMessagingChatClient = exports.ThreadListSubscribe = exports.ThreadSubscribe = exports.messagingChatThreadListSubscribeType = exports.messagingChatThreadSubscribeType = exports.BaseChatClient = exports.ChatThreadStartResult = exports.ChatThreadSessionLoadState = exports.ChatThreadSessionLoadPhase = exports.PendingAgentInput = exports.AgentMessageEvent = void 0;
 const meshagent_1 = require("@meshagent/meshagent");
 const uuid_1 = require("uuid");
 const agent_messages_js_1 = require("./agent-messages.js");
@@ -175,6 +175,13 @@ class BaseChatClient extends change_emitter_js_1.ChangeEmitter {
     localParticipantName() {
         return undefined;
     }
+    localParticipantId() {
+        return undefined;
+    }
+    isClientToolCallForLocalParticipant(request) {
+        const targetParticipantId = request.targetParticipantId?.trim();
+        return targetParticipantId == null || targetParticipantId === "" || targetParticipantId === this.localParticipantId();
+    }
     cleanParticipantName(value) {
         return nonEmptyTrimmed(value);
     }
@@ -280,6 +287,10 @@ class BaseChatClient extends change_emitter_js_1.ChangeEmitter {
         }
     }
     handleAgentMessage(message, { createdAt, attachment } = {}) {
+        if (message instanceof agent_messages_js_1.AgentClientToolCallRequested &&
+            !this.isClientToolCallForLocalParticipant(message)) {
+            return;
+        }
         if (message.type === agent_messages_js_1.agentConnectionStatusType) {
             this._connectionStatus = message;
         }
@@ -332,7 +343,41 @@ class BaseChatClient extends change_emitter_js_1.ChangeEmitter {
     }
 }
 exports.BaseChatClient = BaseChatClient;
-class MessagingChatClient extends BaseChatClient {
+exports.messagingChatThreadSubscribeType = "meshagent.chat.thread.subscribe";
+exports.messagingChatThreadListSubscribeType = "meshagent.chat.thread_list.subscribe";
+class ThreadSubscribe {
+    constructor({ threadId, stream }) {
+        this.threadId = threadId;
+        this.stream = stream;
+    }
+    get closed() {
+        return this.stream.closed;
+    }
+    async send(message, { attachment } = {}) {
+        await this.stream.sendMessage({
+            type: agent_messages_js_1.agentRoomMessageType,
+            message: message.toJson(),
+            attachment,
+        });
+    }
+    async close() {
+        await this.stream.close();
+    }
+}
+exports.ThreadSubscribe = ThreadSubscribe;
+class ThreadListSubscribe {
+    constructor({ stream }) {
+        this.stream = stream;
+    }
+    get closed() {
+        return this.stream.closed;
+    }
+    async close() {
+        await this.stream.close();
+    }
+}
+exports.ThreadListSubscribe = ThreadListSubscribe;
+class BaseMessagingChatClient extends BaseChatClient {
     constructor({ room, agentName }) {
         super();
         this.pendingParticipantWaits = new Map();
@@ -420,6 +465,9 @@ class MessagingChatClient extends BaseChatClient {
         const name = this.room.localParticipant?.getAttribute("name");
         return typeof name === "string" ? this.cleanParticipantName(name) : undefined;
     }
+    localParticipantId() {
+        return this.room.localParticipant?.id;
+    }
     async start() {
         if (this.started) {
             return;
@@ -546,6 +594,123 @@ class MessagingChatClient extends BaseChatClient {
         }
     }
 }
+exports.BaseMessagingChatClient = BaseMessagingChatClient;
+class MessagingChatClient extends BaseMessagingChatClient {
+    constructor() {
+        super(...arguments);
+        this.threadSubscriptions = new Map();
+        this.streamTasks = new Set();
+    }
+    async stop() {
+        const subscriptions = [
+            ...this.threadSubscriptions.values(),
+        ];
+        if (this.threadListSubscription != null) {
+            subscriptions.push(this.threadListSubscription);
+        }
+        this.threadSubscriptions.clear();
+        this.threadListSubscription = undefined;
+        await Promise.all(subscriptions.map(async (subscription) => subscription.close()));
+        await Promise.all(this.streamTasks);
+        await super.stop();
+    }
+    supportsThreadSubscriptions(participant) {
+        return participant.getAttribute("supports_messaging_streams") === true;
+    }
+    trackStream(subscription) {
+        const task = (async () => {
+            try {
+                for await (const event of subscription.stream) {
+                    if (event.kind !== "message" || event.message.type !== agent_messages_js_1.agentRoomMessageType) {
+                        continue;
+                    }
+                    const raw = event.message.message;
+                    if (typeof raw["type"] !== "string") {
+                        continue;
+                    }
+                    this.handleAgentMessage(agent_messages_js_1.AgentMessage.fromJson(raw), {
+                        createdAt: dateOrNull(raw["created_at"]),
+                        attachment: event.message.attachment,
+                    });
+                }
+            }
+            finally {
+                if (subscription instanceof ThreadSubscribe) {
+                    if (this.threadSubscriptions.get(subscription.threadId) === subscription) {
+                        this.threadSubscriptions.delete(subscription.threadId);
+                    }
+                }
+                else if (this.threadListSubscription === subscription) {
+                    this.threadListSubscription = undefined;
+                }
+            }
+        })();
+        this.streamTasks.add(task);
+        void task.finally(() => this.streamTasks.delete(task));
+    }
+    async sendAgentMessage(message, { attachment } = {}) {
+        await this.start();
+        const participant = this.agentParticipant();
+        if (participant == null) {
+            throw new Error("Agent messaging participant is not available.");
+        }
+        if (!this.supportsThreadSubscriptions(participant)) {
+            await super.sendAgentMessage(message, { attachment });
+            return;
+        }
+        if (message.type === agent_messages_js_1.agentThreadOpenType) {
+            const previous = this.threadSubscriptions.get(message.threadId);
+            if (previous != null) {
+                await previous.close();
+            }
+            const stream = await this.room.messaging.stream({
+                to: participant,
+                type: exports.messagingChatThreadSubscribeType,
+                message: message.toJson(),
+                attachment,
+            });
+            const subscription = new ThreadSubscribe({ threadId: message.threadId, stream });
+            this.threadSubscriptions.set(message.threadId, subscription);
+            this.trackStream(subscription);
+            return;
+        }
+        if (message.type === agent_messages_js_1.agentThreadCloseType) {
+            const subscription = this.threadSubscriptions.get(message.threadId);
+            if (subscription != null) {
+                this.threadSubscriptions.delete(message.threadId);
+                await subscription.close();
+                return;
+            }
+        }
+        if (message.type === agent_messages_js_1.agentThreadWatchType) {
+            await this.threadListSubscription?.close();
+            const stream = await this.room.messaging.stream({
+                to: participant,
+                type: exports.messagingChatThreadListSubscribeType,
+                message: message.toJson(),
+                attachment,
+            });
+            const subscription = new ThreadListSubscribe({ stream });
+            this.threadListSubscription = subscription;
+            this.trackStream(subscription);
+            return;
+        }
+        if (message.type === agent_messages_js_1.agentThreadUnwatchType && this.threadListSubscription != null) {
+            const subscription = this.threadListSubscription;
+            this.threadListSubscription = undefined;
+            await subscription.close();
+            return;
+        }
+        if ("threadId" in message && typeof message.threadId === "string") {
+            const subscription = this.threadSubscriptions.get(message.threadId);
+            if (subscription != null) {
+                await subscription.send(message, { attachment });
+                return;
+            }
+        }
+        await super.sendAgentMessage(message, { attachment });
+    }
+}
 exports.MessagingChatClient = MessagingChatClient;
 function isThreadListMessage(message) {
     return message.type === agent_messages_js_1.agentThreadListedType
@@ -560,6 +725,8 @@ class ChatThreadSession extends change_emitter_js_1.ChangeEmitter {
         this.messageIndexes = new Map();
         this.localAgentMessageIds = new Set();
         this.pendingLocalInputMessageIds = new Set();
+        this.resolvedInputMessageIds = new Set();
+        this.completedTurnIds = new Set();
         this.mergedDeltaMessageIds = new Set();
         this.pendingInputsById = new Map();
         this.openState = false;
@@ -638,6 +805,8 @@ class ChatThreadSession extends change_emitter_js_1.ChangeEmitter {
         this.messageIndexes.clear();
         this.localAgentMessageIds.clear();
         this.pendingLocalInputMessageIds.clear();
+        this.resolvedInputMessageIds.clear();
+        this.completedTurnIds.clear();
         this.mergedDeltaMessageIds.clear();
         this.pendingInputsById.clear();
         this.lastCompletedTurnIdValue = undefined;
@@ -789,15 +958,19 @@ class ChatThreadSession extends change_emitter_js_1.ChangeEmitter {
             return;
         }
         if (message.type === agent_messages_js_1.agentThreadStatusType && message instanceof agent_messages_js_1.AgentThreadStatus) {
-            this.threadStatusValue = message;
             const mode = normalizedString(message.mode);
             const status = normalizedString(message.status);
             const turnId = normalizedString(message.turnId);
-            if (status != null && mode === "steerable" && turnId != null) {
-                this.activeTurnIdValue = turnId;
+            if (status == null) {
+                this.threadStatusValue = undefined;
+                if (turnId != null && this.activeTurnIdValue === turnId) {
+                    this.activeTurnIdValue = undefined;
+                }
+                return;
             }
-            else if (status == null && turnId != null && this.activeTurnIdValue === turnId) {
-                this.activeTurnIdValue = undefined;
+            this.threadStatusValue = message;
+            if (mode === "steerable" && turnId != null) {
+                this.activeTurnIdValue = turnId;
             }
             return;
         }
@@ -825,21 +998,29 @@ class ChatThreadSession extends change_emitter_js_1.ChangeEmitter {
     updatePendingInputsForMessage(message, createdAt) {
         const type = message.type;
         const messageId = message.messageId;
-        const sourceMessageId = sourceMessageIdFor(message);
+        const sourceMessageId = normalizedString(sourceMessageIdFor(message));
         if (type === agent_messages_js_1.agentThreadStartType || type === agent_messages_js_1.agentTurnStartType || type === agent_messages_js_1.agentTurnSteerType) {
             const normalizedMessageId = messageId.trim();
             if (normalizedMessageId !== "") {
+                const wasPending = this.pendingInputsById.has(normalizedMessageId);
+                const turnId = type === agent_messages_js_1.agentTurnStartType || type === agent_messages_js_1.agentTurnSteerType
+                    ? normalizedString(threadMessageValue(message, "turnId"))
+                    : undefined;
+                const wasAlreadyResolved = !wasPending && (this.resolvedInputMessageIds.has(normalizedMessageId) ||
+                    (turnId != null && this.completedTurnIds.has(turnId)));
                 this.localAgentMessageIds.add(normalizedMessageId);
                 this.pendingLocalInputMessageIds.add(normalizedMessageId);
-                this.markPending(new PendingAgentInput({
-                    messageId: normalizedMessageId,
-                    messageType: type,
-                    threadPath: this.threadPath,
-                    payload: message,
-                    createdAt,
-                    awaitingAcceptance: true,
-                    awaitingApplication: true,
-                }));
+                if (!wasAlreadyResolved) {
+                    this.markPending(new PendingAgentInput({
+                        messageId: normalizedMessageId,
+                        messageType: type,
+                        threadPath: this.threadPath,
+                        payload: message,
+                        createdAt,
+                        awaitingAcceptance: true,
+                        awaitingApplication: true,
+                    }));
+                }
             }
         }
         else if (type === agent_messages_js_1.agentThreadStartRejectedType) {
@@ -852,12 +1033,14 @@ class ChatThreadSession extends change_emitter_js_1.ChangeEmitter {
         }
         else if (type === agent_messages_js_1.agentTurnStartedType || type === agent_messages_js_1.agentTurnSteeredType) {
             if (sourceMessageId != null) {
+                this.resolvedInputMessageIds.add(sourceMessageId);
                 this.pendingInputsById.delete(sourceMessageId);
                 this.pendingLocalInputMessageIds.delete(sourceMessageId);
             }
         }
         else if (type === agent_messages_js_1.agentTurnStartRejectedType || type === agent_messages_js_1.agentTurnSteerRejectedType) {
             if (sourceMessageId != null) {
+                this.resolvedInputMessageIds.add(sourceMessageId);
                 this.pendingInputsById.delete(sourceMessageId);
                 this.pendingLocalInputMessageIds.delete(sourceMessageId);
             }
@@ -865,6 +1048,15 @@ class ChatThreadSession extends change_emitter_js_1.ChangeEmitter {
         else if (type === agent_messages_js_1.agentTurnEndedType || type === agent_messages_js_1.agentThreadClearedType) {
             this.pendingInputsById.clear();
             this.pendingLocalInputMessageIds.clear();
+            if (type === agent_messages_js_1.agentTurnEndedType) {
+                const turnId = normalizedString(threadMessageValue(message, "turnId"));
+                if (turnId != null)
+                    this.completedTurnIds.add(turnId);
+            }
+            else if (type === agent_messages_js_1.agentThreadClearedType) {
+                this.resolvedInputMessageIds.clear();
+                this.completedTurnIds.clear();
+            }
         }
     }
     appendRenderableMessage(event) {

package/package.json

@@ -1,10 +1,11 @@
 {
     "name": "@meshagent/meshagent-agents",
-    "version": "0.46.4",
+    "version": "0.47.1",
     "description": "Agent chat sessions and clients for Meshagent TypeScript applications.",
     "homepage": "https://github.com/meshagent/meshagent-agents-ts",
     "scripts": {
         "test": "./run-tests.sh",
+        "test:rust-process-e2e": "bash ./run-rust-process-agent-e2e.sh",
         "build": "mkdir -p dist && ./scripts/build.sh"
     },
     "author": "Timu, LLC",
@@ -47,7 +48,7 @@
         "typescript": "^5.8.2"
     },
     "dependencies": {
-        "@meshagent/meshagent": "^0.46.4",
+        "@meshagent/meshagent": "^0.47.1",
         "apache-arrow": "^21.0.0",
         "uuid": "^14.0.0"
     },