@mastra/client-js 0.16.9 → 0.16.10-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @mastra/client-js
 
+## 0.16.10-alpha.0
+
+### Patch Changes
+
+- Fix clientTools execution in client js ([#10051](https://github.com/mastra-ai/mastra/pull/10051))
+
+- Updated dependencies [[`0a0aa87`](https://github.com/mastra-ai/mastra/commit/0a0aa87910dd9234ae11e8146fbf54d71f0b1516), [`56bbbd0`](https://github.com/mastra-ai/mastra/commit/56bbbd0eb4510455ff03d6bf2827fdbd307938be), [`d576fd8`](https://github.com/mastra-ai/mastra/commit/d576fd8f2a3c61bcf2f7d5d2bdfb496d442c46c2), [`5e48406`](https://github.com/mastra-ai/mastra/commit/5e48406766fa94e2b7c56b70fb7d6068cf7f3989), [`7fcce62`](https://github.com/mastra-ai/mastra/commit/7fcce62880c3525fbf752d59c0ac2c478cffe024), [`16a324f`](https://github.com/mastra-ai/mastra/commit/16a324f8c30a07d0d899bc2e4e7998c6b40a4cb6), [`26aee16`](https://github.com/mastra-ai/mastra/commit/26aee160149e7acb84a533bf45631aaed6dd7077), [`b063a81`](https://github.com/mastra-ai/mastra/commit/b063a8144176915a766ea15888e1e8a06a020776), [`5ff9462`](https://github.com/mastra-ai/mastra/commit/5ff9462691c80a6841b014bcc68f6a85c3fd3fbf)]:
+  - @mastra/core@0.24.1-alpha.0
+
 ## 0.16.9
 
 ### Patch Changes

package/dist/index.cjs

@@ -98,7 +98,6 @@ async function sharedProcessMastraStream({
         if (line.startsWith("data: ")) {
           const data = line.slice(6);
           if (data === "[DONE]") {
-            console.info("\u{1F3C1} Stream finished");
             return;
           }
           let json;
@@ -215,11 +214,11 @@ async function executeToolCallAndRespond({
       return response;
     }
     for (const toolCall of toolCalls) {
-      const clientTool = params.clientTools?.[toolCall.toolName];
+      const clientTool = params.clientTools?.[toolCall.payload.toolName];
       if (clientTool && clientTool.execute) {
         const result = await clientTool.execute(
           {
-            context: toolCall?.args,
+            context: toolCall?.payload.args,
             runId,
             resourceId,
             threadId,
@@ -230,7 +229,7 @@ async function executeToolCallAndRespond({
           },
           {
             messages: response.messages,
-            toolCallId: toolCall?.toolCallId
+            toolCallId: toolCall?.payload.toolCallId
           }
         );
         const updatedMessages = [
@@ -240,8 +239,8 @@ async function executeToolCallAndRespond({
             content: [
               {
                 type: "tool-result",
-                toolCallId: toolCall.toolCallId,
-                toolName: toolCall.toolName,
+                toolCallId: toolCall.payload.toolCallId,
+                toolName: toolCall.payload.toolName,
                 result
               }
             ]
@@ -254,6 +253,7 @@ async function executeToolCallAndRespond({
       }
     }
   }
+  return response;
 }
 var AgentVoice = class extends BaseResource {
   constructor(options, agentId) {
@@ -986,7 +986,7 @@ var Agent = class extends BaseResource {
     });
     onFinish?.({ message, finishReason, usage });
   }
-  async processStreamResponse(processedParams, writable, route = "stream") {
+  async processStreamResponse(processedParams, controller, route = "stream") {
     const response = await this.request(`/api/agents/${this.agentId}/${route}`, {
       method: "POST",
       body: processedParams,
@@ -998,29 +998,30 @@ var Agent = class extends BaseResource {
     try {
       let toolCalls = [];
       let messages = [];
-      const [streamForWritable, streamForProcessing] = response.body.tee();
-      streamForWritable.pipeTo(
+      const [streamForController, streamForProcessing] = response.body.tee();
+      const pipePromise = streamForController.pipeTo(
         new WritableStream({
           async write(chunk) {
-            let writer;
             try {
-              writer = writable.getWriter();
               const text = new TextDecoder().decode(chunk);
               const lines = text.split("\n\n");
-              const readableLines = lines.filter((line) => line !== "[DONE]").join("\n\n");
-              await writer.write(new TextEncoder().encode(readableLines));
-            } catch {
-              await writer?.write(chunk);
-            } finally {
-              writer?.releaseLock();
+              const readableLines = lines.filter((line) => line.trim() !== "[DONE]" && line.trim() !== "data: [DONE]").join("\n\n");
+              if (readableLines) {
+                const encoded = new TextEncoder().encode(readableLines);
+                controller.enqueue(encoded);
+              }
+            } catch (error) {
+              console.error("Error enqueueing to controller:", error);
+              controller.enqueue(chunk);
             }
           }
-        }),
-        {
-          preventClose: true
-        }
+        })
       ).catch((error) => {
-        console.error("Error piping to writable stream:", error);
+        console.error("Error piping to controller:", error);
+        try {
+          controller.close();
+        } catch {
+        }
       });
       this.processChatResponse_vNext({
         stream: streamForProcessing,
@@ -1080,31 +1081,36 @@ var Agent = class extends BaseResource {
                   toolInvocation.result = result;
                 }
                 const updatedMessages = lastMessage != null ? [...messages.filter((m) => m.id !== lastMessage.id), lastMessage] : [...messages];
-                this.processStreamResponse(
-                  {
-                    ...processedParams,
-                    messages: updatedMessages
-                  },
-                  writable
-                ).catch((error) => {
-                  console.error("Error processing stream response:", error);
-                });
+                try {
+                  await this.processStreamResponse(
+                    {
+                      ...processedParams,
+                      messages: updatedMessages
+                    },
+                    controller
+                  );
+                } catch (error) {
+                  console.error("Error processing recursive stream response:", error);
+                }
               }
             }
             if (!shouldExecuteClientTool) {
-              setTimeout(() => {
-                writable.close();
-              }, 0);
+              await pipePromise;
+              controller.close();
             }
           } else {
-            setTimeout(() => {
-              writable.close();
-            }, 0);
+            await pipePromise;
+            controller.close();
           }
         },
         lastMessage: void 0
-      }).catch((error) => {
+      }).catch(async (error) => {
         console.error("Error processing stream response:", error);
+        try {
+          await pipePromise;
+          controller.close();
+        } catch {
+        }
       });
     } catch (error) {
       console.error("Error processing stream response:", error);
@@ -1155,8 +1161,13 @@ var Agent = class extends BaseResource {
         schema: zodToJsonSchema(params.structuredOutput.schema)
       } : void 0
     };
-    const { readable, writable } = new TransformStream();
-    const response = await this.processStreamResponse(processedParams, writable);
+    let readableController;
+    const readable = new ReadableStream({
+      start(controller) {
+        readableController = controller;
+      }
+    });
+    const response = await this.processStreamResponse(processedParams, readableController);
     const streamResponse = new Response(readable, {
       status: response.status,
       statusText: response.statusText,
@@ -1173,8 +1184,13 @@ var Agent = class extends BaseResource {
     return streamResponse;
   }
   async approveToolCall(params) {
-    const { readable, writable } = new TransformStream();
-    const response = await this.processStreamResponse(params, writable, "approve-tool-call");
+    let readableController;
+    const readable = new ReadableStream({
+      start(controller) {
+        readableController = controller;
+      }
+    });
+    const response = await this.processStreamResponse(params, readableController, "approve-tool-call");
     const streamResponse = new Response(readable, {
       status: response.status,
       statusText: response.statusText,
@@ -1191,8 +1207,13 @@ var Agent = class extends BaseResource {
     return streamResponse;
   }
   async declineToolCall(params) {
-    const { readable, writable } = new TransformStream();
-    const response = await this.processStreamResponse(params, writable, "decline-tool-call");
+    let readableController;
+    const readable = new ReadableStream({
+      start(controller) {
+        readableController = controller;
+      }
+    });
+    const response = await this.processStreamResponse(params, readableController, "decline-tool-call");
     const streamResponse = new Response(readable, {
       status: response.status,
       statusText: response.statusText,