@mastra/client-js 1.7.2 → 1.7.3-alpha.0

package/dist/index.js

@@ -1365,7 +1365,7 @@ async function executeToolCallAndRespond({
             resourceId
           }
         });
-        const updatedMessages = [
+        const newMessages = [
           ...response.response.messages || [],
           {
             role: "tool",
@@ -1379,6 +1379,7 @@ async function executeToolCallAndRespond({
             ]
           }
         ];
+        const updatedMessages = threadId ? newMessages : [...Array.isArray(params.messages) ? params.messages : [], ...newMessages];
         return respondFn(updatedMessages, params);
       }
     }
@@ -2130,6 +2131,10 @@ var Agent = class extends BaseResource {
     onFinish?.({ message, finishReason, usage });
   }
   async processStreamResponse(processedParams, controller, route = "stream") {
+    const { memory } = processedParams ?? {};
+    const { resource, thread } = memory ?? {};
+    const threadId = processedParams.threadId ?? (typeof thread === "string" ? thread : thread?.id);
+    const resourceId = processedParams.resourceId ?? resource;
     const response = await this.request(`/agents/${this.agentId}/${route}`, {
       method: "POST",
       body: processedParams,
@@ -2196,8 +2201,8 @@ var Agent = class extends BaseResource {
                     toolCallId: toolCall2?.toolCallId,
                     suspend: async () => {
                     },
-                    threadId: processedParams.threadId,
-                    resourceId: processedParams.resourceId
+                    threadId,
+                    resourceId
                   }
                 });
                 const lastMessageRaw = messages[messages.length - 1];
@@ -2219,7 +2224,8 @@ var Agent = class extends BaseResource {
                   toolInvocation.state = "result";
                   toolInvocation.result = result;
                 }
-                const updatedMessages = lastMessage != null ? [...messages.filter((m) => m.id !== lastMessage.id), lastMessage] : [...messages];
+                const newMessages = lastMessage != null ? [...messages.filter((m) => m.id !== lastMessage.id), lastMessage] : [...messages];
+                const updatedMessages = threadId ? newMessages : [...Array.isArray(processedParams.messages) ? processedParams.messages : [], ...newMessages];
                 try {
                   await this.processStreamResponse(
                     {
@@ -2443,6 +2449,10 @@ var Agent = class extends BaseResource {
    * Processes the stream response and handles tool calls
    */
   async processStreamResponseLegacy(processedParams, writable) {
+    const { memory } = processedParams ?? {};
+    const { resource, thread } = memory ?? {};
+    const threadId = processedParams.threadId ?? (typeof thread === "string" ? thread : thread?.id);
+    const resourceId = processedParams.resourceId ?? resource;
     const response = await this.request(`/agents/${this.agentId}/stream-legacy`, {
       method: "POST",
       body: processedParams,
@@ -2488,8 +2498,8 @@ var Agent = class extends BaseResource {
                     toolCallId: toolCall2?.toolCallId,
                     suspend: async () => {
                     },
-                    threadId: processedParams.threadId,
-                    resourceId: processedParams.resourceId
+                    threadId,
+                    resourceId
                   }
                 });
                 const lastMessage = JSON.parse(JSON.stringify(messages[messages.length - 1]));
@@ -2523,10 +2533,12 @@ var Agent = class extends BaseResource {
                 } finally {
                   writer.releaseLock();
                 }
+                const newMessages = [...messages.filter((m) => m.id !== lastMessage.id), lastMessage];
+                const updatedMessages = threadId ? newMessages : [...Array.isArray(processedParams.messages) ? processedParams.messages : [], ...newMessages];
                 this.processStreamResponseLegacy(
                   {
                     ...processedParams,
-                    messages: [...messages.filter((m) => m.id !== lastMessage.id), lastMessage]
+                    messages: updatedMessages
                   },
                   writable
                 ).catch((error) => {