@mastra/client-js 0.10.10 → 0.10.11-alpha.0

package/dist/index.js

@@ -1,6 +1,6 @@
 import { AbstractAgent, EventType } from '@ag-ui/client';
 import { Observable } from 'rxjs';
-import { processDataStream, parsePartialJson } from '@ai-sdk/ui-utils';
+import { processTextStream, processDataStream, parsePartialJson } from '@ai-sdk/ui-utils';
 import { ZodSchema } from 'zod';
 import originalZodToJsonSchema from 'zod-to-json-schema';
 import { isVercelTool } from '@mastra/core/tools';
@@ -376,7 +376,11 @@ var Agent = class extends BaseResource {
       body: processedParams
     });
     if (response.finishReason === "tool-calls") {
-      for (const toolCall of response.toolCalls) {
+      const toolCalls = response.toolCalls;
+      if (!toolCalls || !Array.isArray(toolCalls)) {
+        return response;
+      }
+      for (const toolCall of toolCalls) {
         const clientTool = params.clientTools?.[toolCall.toolName];
         if (clientTool && clientTool.execute) {
           const result = await clientTool.execute(
@@ -419,7 +423,8 @@ var Agent = class extends BaseResource {
     onToolCall,
     onFinish,
     getCurrentDate = () => /* @__PURE__ */ new Date(),
-    lastMessage
+    lastMessage,
+    streamProtocol
   }) {
     const replaceLastMessage = lastMessage?.role === "assistant";
     let step = replaceLastMessage ? 1 + // find max step in existing tool invocations:
@@ -480,228 +485,213 @@ var Agent = class extends BaseResource {
         replaceLastMessage
       });
     }
-    await processDataStream({
-      stream,
-      onTextPart(value) {
-        if (currentTextPart == null) {
-          currentTextPart = {
-            type: "text",
-            text: value
-          };
-          message.parts.push(currentTextPart);
-        } else {
-          currentTextPart.text += value;
+    if (streamProtocol === "text") {
+      await processTextStream({
+        stream,
+        onTextPart(value) {
+          message.content += value;
+          execUpdate();
         }
-        message.content += value;
-        execUpdate();
-      },
-      onReasoningPart(value) {
-        if (currentReasoningTextDetail == null) {
-          currentReasoningTextDetail = { type: "text", text: value };
-          if (currentReasoningPart != null) {
-            currentReasoningPart.details.push(currentReasoningTextDetail);
+      });
+      onFinish?.({ message, finishReason, usage });
+    } else {
+      await processDataStream({
+        stream,
+        onTextPart(value) {
+          if (currentTextPart == null) {
+            currentTextPart = {
+              type: "text",
+              text: value
+            };
+            message.parts.push(currentTextPart);
+          } else {
+            currentTextPart.text += value;
           }
-        } else {
-          currentReasoningTextDetail.text += value;
-        }
-        if (currentReasoningPart == null) {
-          currentReasoningPart = {
-            type: "reasoning",
-            reasoning: value,
-            details: [currentReasoningTextDetail]
-          };
-          message.parts.push(currentReasoningPart);
-        } else {
-          currentReasoningPart.reasoning += value;
-        }
-        message.reasoning = (message.reasoning ?? "") + value;
-        execUpdate();
-      },
-      onReasoningSignaturePart(value) {
-        if (currentReasoningTextDetail != null) {
-          currentReasoningTextDetail.signature = value.signature;
-        }
-      },
-      onRedactedReasoningPart(value) {
-        if (currentReasoningPart == null) {
-          currentReasoningPart = {
-            type: "reasoning",
-            reasoning: "",
-            details: []
-          };
-          message.parts.push(currentReasoningPart);
-        }
-        currentReasoningPart.details.push({
-          type: "redacted",
-          data: value.data
-        });
-        currentReasoningTextDetail = void 0;
-        execUpdate();
-      },
-      onFilePart(value) {
-        message.parts.push({
-          type: "file",
-          mimeType: value.mimeType,
-          data: value.data
-        });
-        execUpdate();
-      },
-      onSourcePart(value) {
-        message.parts.push({
-          type: "source",
-          source: value
-        });
-        execUpdate();
-      },
-      onToolCallStreamingStartPart(value) {
-        if (message.toolInvocations == null) {
-          message.toolInvocations = [];
-        }
-        partialToolCalls[value.toolCallId] = {
-          text: "",
-          step,
-          toolName: value.toolName,
-          index: message.toolInvocations.length
-        };
-        const invocation = {
-          state: "partial-call",
-          step,
-          toolCallId: value.toolCallId,
-          toolName: value.toolName,
-          args: void 0
-        };
-        message.toolInvocations.push(invocation);
-        updateToolInvocationPart(value.toolCallId, invocation);
-        execUpdate();
-      },
-      onToolCallDeltaPart(value) {
-        const partialToolCall = partialToolCalls[value.toolCallId];
-        partialToolCall.text += value.argsTextDelta;
-        const { value: partialArgs } = parsePartialJson(partialToolCall.text);
-        const invocation = {
-          state: "partial-call",
-          step: partialToolCall.step,
-          toolCallId: value.toolCallId,
-          toolName: partialToolCall.toolName,
-          args: partialArgs
-        };
-        message.toolInvocations[partialToolCall.index] = invocation;
-        updateToolInvocationPart(value.toolCallId, invocation);
-        execUpdate();
-      },
-      async onToolCallPart(value) {
-        const invocation = {
-          state: "call",
-          step,
-          ...value
-        };
-        if (partialToolCalls[value.toolCallId] != null) {
-          message.toolInvocations[partialToolCalls[value.toolCallId].index] = invocation;
-        } else {
+          message.content += value;
+          execUpdate();
+        },
+        onReasoningPart(value) {
+          if (currentReasoningTextDetail == null) {
+            currentReasoningTextDetail = { type: "text", text: value };
+            if (currentReasoningPart != null) {
+              currentReasoningPart.details.push(currentReasoningTextDetail);
+            }
+          } else {
+            currentReasoningTextDetail.text += value;
+          }
+          if (currentReasoningPart == null) {
+            currentReasoningPart = {
+              type: "reasoning",
+              reasoning: value,
+              details: [currentReasoningTextDetail]
+            };
+            message.parts.push(currentReasoningPart);
+          } else {
+            currentReasoningPart.reasoning += value;
+          }
+          message.reasoning = (message.reasoning ?? "") + value;
+          execUpdate();
+        },
+        onReasoningSignaturePart(value) {
+          if (currentReasoningTextDetail != null) {
+            currentReasoningTextDetail.signature = value.signature;
+          }
+        },
+        onRedactedReasoningPart(value) {
+          if (currentReasoningPart == null) {
+            currentReasoningPart = {
+              type: "reasoning",
+              reasoning: "",
+              details: []
+            };
+            message.parts.push(currentReasoningPart);
+          }
+          currentReasoningPart.details.push({
+            type: "redacted",
+            data: value.data
+          });
+          currentReasoningTextDetail = void 0;
+          execUpdate();
+        },
+        onFilePart(value) {
+          message.parts.push({
+            type: "file",
+            mimeType: value.mimeType,
+            data: value.data
+          });
+          execUpdate();
+        },
+        onSourcePart(value) {
+          message.parts.push({
+            type: "source",
+            source: value
+          });
+          execUpdate();
+        },
+        onToolCallStreamingStartPart(value) {
           if (message.toolInvocations == null) {
             message.toolInvocations = [];
           }
+          partialToolCalls[value.toolCallId] = {
+            text: "",
+            step,
+            toolName: value.toolName,
+            index: message.toolInvocations.length
+          };
+          const invocation = {
+            state: "partial-call",
+            step,
+            toolCallId: value.toolCallId,
+            toolName: value.toolName,
+            args: void 0
+          };
           message.toolInvocations.push(invocation);
-        }
-        updateToolInvocationPart(value.toolCallId, invocation);
-        execUpdate();
-        if (onToolCall) {
-          const result = await onToolCall({ toolCall: value });
-          if (result != null) {
-            const invocation2 = {
-              state: "result",
-              step,
-              ...value,
-              result
-            };
-            message.toolInvocations[message.toolInvocations.length - 1] = invocation2;
-            updateToolInvocationPart(value.toolCallId, invocation2);
-            execUpdate();
+          updateToolInvocationPart(value.toolCallId, invocation);
+          execUpdate();
+        },
+        onToolCallDeltaPart(value) {
+          const partialToolCall = partialToolCalls[value.toolCallId];
+          partialToolCall.text += value.argsTextDelta;
+          const { value: partialArgs } = parsePartialJson(partialToolCall.text);
+          const invocation = {
+            state: "partial-call",
+            step: partialToolCall.step,
+            toolCallId: value.toolCallId,
+            toolName: partialToolCall.toolName,
+            args: partialArgs
+          };
+          message.toolInvocations[partialToolCall.index] = invocation;
+          updateToolInvocationPart(value.toolCallId, invocation);
+          execUpdate();
+        },
+        async onToolCallPart(value) {
+          const invocation = {
+            state: "call",
+            step,
+            ...value
+          };
+          if (partialToolCalls[value.toolCallId] != null) {
+            message.toolInvocations[partialToolCalls[value.toolCallId].index] = invocation;
+          } else {
+            if (message.toolInvocations == null) {
+              message.toolInvocations = [];
+            }
+            message.toolInvocations.push(invocation);
           }
+          updateToolInvocationPart(value.toolCallId, invocation);
+          execUpdate();
+          if (onToolCall) {
+            const result = await onToolCall({ toolCall: value });
+            if (result != null) {
+              const invocation2 = {
+                state: "result",
+                step,
+                ...value,
+                result
+              };
+              message.toolInvocations[message.toolInvocations.length - 1] = invocation2;
+              updateToolInvocationPart(value.toolCallId, invocation2);
+              execUpdate();
+            }
+          }
+        },
+        onToolResultPart(value) {
+          const toolInvocations = message.toolInvocations;
+          if (toolInvocations == null) {
+            throw new Error("tool_result must be preceded by a tool_call");
+          }
+          const toolInvocationIndex = toolInvocations.findIndex(
+            (invocation2) => invocation2.toolCallId === value.toolCallId
+          );
+          if (toolInvocationIndex === -1) {
+            throw new Error("tool_result must be preceded by a tool_call with the same toolCallId");
+          }
+          const invocation = {
+            ...toolInvocations[toolInvocationIndex],
+            state: "result",
+            ...value
+          };
+          toolInvocations[toolInvocationIndex] = invocation;
+          updateToolInvocationPart(value.toolCallId, invocation);
+          execUpdate();
+        },
+        onDataPart(value) {
+          data.push(...value);
+          execUpdate();
+        },
+        onMessageAnnotationsPart(value) {
+          if (messageAnnotations == null) {
+            messageAnnotations = [...value];
+          } else {
+            messageAnnotations.push(...value);
+          }
+          execUpdate();
+        },
+        onFinishStepPart(value) {
+          step += 1;
+          currentTextPart = value.isContinued ? currentTextPart : void 0;
+          currentReasoningPart = void 0;
+          currentReasoningTextDetail = void 0;
+        },
+        onStartStepPart(value) {
+          if (!replaceLastMessage) {
+            message.id = value.messageId;
+          }
+          message.parts.push({ type: "step-start" });
+          execUpdate();
+        },
+        onFinishMessagePart(value) {
+          finishReason = value.finishReason;
+          if (value.usage != null) {
+            usage = value.usage;
+          }
+        },
+        onErrorPart(error) {
+          throw new Error(error);
         }
-      },
-      onToolResultPart(value) {
-        const toolInvocations = message.toolInvocations;
-        if (toolInvocations == null) {
-          throw new Error("tool_result must be preceded by a tool_call");
-        }
-        const toolInvocationIndex = toolInvocations.findIndex((invocation2) => invocation2.toolCallId === value.toolCallId);
-        if (toolInvocationIndex === -1) {
-          throw new Error("tool_result must be preceded by a tool_call with the same toolCallId");
-        }
-        const invocation = {
-          ...toolInvocations[toolInvocationIndex],
-          state: "result",
-          ...value
-        };
-        toolInvocations[toolInvocationIndex] = invocation;
-        updateToolInvocationPart(value.toolCallId, invocation);
-        execUpdate();
-      },
-      onDataPart(value) {
-        data.push(...value);
-        execUpdate();
-      },
-      onMessageAnnotationsPart(value) {
-        if (messageAnnotations == null) {
-          messageAnnotations = [...value];
-        } else {
-          messageAnnotations.push(...value);
-        }
-        execUpdate();
-      },
-      onFinishStepPart(value) {
-        step += 1;
-        currentTextPart = value.isContinued ? currentTextPart : void 0;
-        currentReasoningPart = void 0;
-        currentReasoningTextDetail = void 0;
-      },
-      onStartStepPart(value) {
-        if (!replaceLastMessage) {
-          message.id = value.messageId;
-        }
-        message.parts.push({ type: "step-start" });
-        execUpdate();
-      },
-      onFinishMessagePart(value) {
-        finishReason = value.finishReason;
-        if (value.usage != null) {
-          usage = value.usage;
-        }
-      },
-      onErrorPart(error) {
-        throw new Error(error);
-      }
-    });
-    onFinish?.({ message, finishReason, usage });
-  }
-  /**
-   * Streams a response from the agent
-   * @param params - Stream parameters including prompt
-   * @returns Promise containing the enhanced Response object with processDataStream method
-   */
-  async stream(params) {
-    const processedParams = {
-      ...params,
-      output: params.output ? zodToJsonSchema(params.output) : void 0,
-      experimental_output: params.experimental_output ? zodToJsonSchema(params.experimental_output) : void 0,
-      runtimeContext: parseClientRuntimeContext(params.runtimeContext),
-      clientTools: processClientTools(params.clientTools)
-    };
-    const { readable, writable } = new TransformStream();
-    const response = await this.processStreamResponse(processedParams, writable);
-    const streamResponse = new Response(readable, {
-      status: response.status,
-      statusText: response.statusText,
-      headers: response.headers
-    });
-    streamResponse.processDataStream = async (options = {}) => {
-      await processDataStream({
-        stream: streamResponse.body,
-        ...options
       });
-    };
-    return streamResponse;
+      onFinish?.({ message, finishReason, usage });
+    }
   }
   /**
    * Processes the stream response and handles tool calls
@@ -716,6 +706,7 @@ var Agent = class extends BaseResource {
       throw new Error("No response body");
     }
     try {
+      const streamProtocol = processedParams.output ? "text" : "data";
       let toolCalls = [];
       let messages = [];
       const [streamForWritable, streamForProcessing] = response.body.tee();
@@ -795,17 +786,55 @@ var Agent = class extends BaseResource {
             }
           } else {
             setTimeout(() => {
-              writable.close();
+              if (!writable.locked) {
+                writable.close();
+              }
             }, 0);
           }
         },
-        lastMessage: void 0
+        lastMessage: void 0,
+        streamProtocol
       });
     } catch (error) {
       console.error("Error processing stream response:", error);
     }
     return response;
   }
+  /**
+   * Streams a response from the agent
+   * @param params - Stream parameters including prompt
+   * @returns Promise containing the enhanced Response object with processDataStream and processTextStream methods
+   */
+  async stream(params) {
+    const processedParams = {
+      ...params,
+      output: params.output ? zodToJsonSchema(params.output) : void 0,
+      experimental_output: params.experimental_output ? zodToJsonSchema(params.experimental_output) : void 0,
+      runtimeContext: parseClientRuntimeContext(params.runtimeContext),
+      clientTools: processClientTools(params.clientTools)
+    };
+    const { readable, writable } = new TransformStream();
+    const response = await this.processStreamResponse(processedParams, writable);
+    const streamResponse = new Response(readable, {
+      status: response.status,
+      statusText: response.statusText,
+      headers: response.headers
+    });
+    streamResponse.processDataStream = async (options = {}) => {
+      await processDataStream({
+        stream: streamResponse.body,
+        ...options
+      });
+    };
+    streamResponse.processTextStream = async (options) => {
+      await processTextStream({
+        stream: streamResponse.body,
+        onTextPart: options?.onTextPart ?? (() => {
+        })
+      });
+    };
+    return streamResponse;
+  }
   /**
    * Gets details about a specific tool available to the agent
    * @param toolId - ID of the tool to retrieve

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/client-js",
-  "version": "0.10.10",
+  "version": "0.10.11-alpha.0",
   "description": "The official TypeScript library for the Mastra Client API",
   "author": "",
   "type": "module",
@@ -33,7 +33,7 @@
     "rxjs": "7.8.1",
     "zod": "^3.25.67",
     "zod-to-json-schema": "^3.24.5",
-    "@mastra/core": "0.10.11"
+    "@mastra/core": "0.10.12-alpha.0"
   },
   "peerDependencies": {
     "zod": "^3.0.0"

package/src/example.ts

@@ -14,25 +14,53 @@ import z from 'zod';
     const agent = client.getAgent('weatherAgent');
     const response = await agent.stream({
       messages: 'what is the weather in new york?',
+      output: z.object({
+        weather: z.string(),
+        temperature: z.number(),
+        humidity: z.number(),
+        windSpeed: z.number(),
+        windDirection: z.string(),
+        windGust: z.number(),
+        windChill: z.number(),
+      }),
     });
 
-    response.processDataStream({
-      onTextPart: text => {
-        process.stdout.write(text);
-      },
-      onFilePart: file => {
-        console.log(file);
-      },
-      onDataPart: data => {
-        console.log(data);
-      },
-      onErrorPart: error => {
-        console.error(error);
-      },
-      onToolCallPart(streamPart) {
-        console.log(streamPart);
-      },
-    });
+    // Process data stream - unstructured output
+
+    // response.processDataStream({
+    //   onTextPart: text => {
+    //     process.stdout.write(text);
+    //   },
+    //   onFilePart: file => {
+    //     console.log(file);
+    //   },
+    //   onDataPart: data => {
+    //     console.log(data);
+    //   },
+    //   onErrorPart: error => {
+    //     console.error(error);
+    //   },
+    //   onToolCallPart(streamPart) {
+    //     console.log(streamPart);
+    //   },
+    // });
+
+    // Process text stream - structured output
+
+    // response.processTextStream({
+    //   onTextPart: text => {
+    //     process.stdout.write(text);
+    //   },
+    // });
+
+    // read the response body directly
+
+    // const reader = response.body!.getReader();
+    // while (true) {
+    //   const { done, value } = await reader.read();
+    //   if (done) break;
+    //   console.log(new TextDecoder().decode(value));
+    // }
   } catch (error) {
     console.error(error);
   }