@mastra/client-js 0.0.0-fix-tool-call-history-3-20250806004225 → 0.0.0-fix-zod-to-json-schema-ref-strategy-20250910193441

package/dist/index.js

@@ -1,217 +1,35 @@
-import { AbstractAgent, EventType } from '@ag-ui/client';
-import { Observable } from 'rxjs';
 import { processDataStream, parsePartialJson } from '@ai-sdk/ui-utils';
-import { ZodSchema } from 'zod';
-import originalZodToJsonSchema from 'zod-to-json-schema';
-import { isVercelTool } from '@mastra/core/tools/is-vercel-tool';
 import { v4 } from '@lukeed/uuid';
 import { RuntimeContext } from '@mastra/core/runtime-context';
+import { isVercelTool } from '@mastra/core/tools/is-vercel-tool';
+import { z } from 'zod';
+import originalZodToJsonSchema from 'zod-to-json-schema';
 
-// src/adapters/agui.ts
-var AGUIAdapter = class extends AbstractAgent {
-  agent;
-  resourceId;
-  constructor({ agent, agentId, resourceId, ...rest }) {
-    super({
-      agentId,
-      ...rest
-    });
-    this.agent = agent;
-    this.resourceId = resourceId;
-  }
-  run(input) {
-    return new Observable((subscriber) => {
-      const convertedMessages = convertMessagesToMastraMessages(input.messages);
-      subscriber.next({
-        type: EventType.RUN_STARTED,
-        threadId: input.threadId,
-        runId: input.runId
-      });
-      this.agent.stream({
-        threadId: input.threadId,
-        resourceId: this.resourceId ?? "",
-        runId: input.runId,
-        messages: convertedMessages,
-        clientTools: input.tools.reduce(
-          (acc, tool) => {
-            acc[tool.name] = {
-              id: tool.name,
-              description: tool.description,
-              inputSchema: tool.parameters
-            };
-            return acc;
-          },
-          {}
-        )
-      }).then((response) => {
-        let currentMessageId = void 0;
-        let isInTextMessage = false;
-        return response.processDataStream({
-          onTextPart: (text) => {
-            if (currentMessageId === void 0) {
-              currentMessageId = generateUUID();
-              const message2 = {
-                type: EventType.TEXT_MESSAGE_START,
-                messageId: currentMessageId,
-                role: "assistant"
-              };
-              subscriber.next(message2);
-              isInTextMessage = true;
-            }
-            const message = {
-              type: EventType.TEXT_MESSAGE_CONTENT,
-              messageId: currentMessageId,
-              delta: text
-            };
-            subscriber.next(message);
-          },
-          onFinishMessagePart: () => {
-            if (currentMessageId !== void 0) {
-              const message = {
-                type: EventType.TEXT_MESSAGE_END,
-                messageId: currentMessageId
-              };
-              subscriber.next(message);
-              isInTextMessage = false;
-            }
-            subscriber.next({
-              type: EventType.RUN_FINISHED,
-              threadId: input.threadId,
-              runId: input.runId
-            });
-            subscriber.complete();
-          },
-          onToolCallPart(streamPart) {
-            const parentMessageId = currentMessageId || generateUUID();
-            if (isInTextMessage) {
-              const message = {
-                type: EventType.TEXT_MESSAGE_END,
-                messageId: parentMessageId
-              };
-              subscriber.next(message);
-              isInTextMessage = false;
-            }
-            subscriber.next({
-              type: EventType.TOOL_CALL_START,
-              toolCallId: streamPart.toolCallId,
-              toolCallName: streamPart.toolName,
-              parentMessageId
-            });
-            subscriber.next({
-              type: EventType.TOOL_CALL_ARGS,
-              toolCallId: streamPart.toolCallId,
-              delta: JSON.stringify(streamPart.args),
-              parentMessageId
-            });
-            subscriber.next({
-              type: EventType.TOOL_CALL_END,
-              toolCallId: streamPart.toolCallId,
-              parentMessageId
-            });
-          }
-        });
-      }).catch((error) => {
-        console.error("error", error);
-        subscriber.error(error);
-      });
-      return () => {
-      };
-    });
-  }
-};
-function generateUUID() {
-  if (typeof crypto !== "undefined") {
-    if (typeof crypto.randomUUID === "function") {
-      return crypto.randomUUID();
-    }
-    if (typeof crypto.getRandomValues === "function") {
-      const buffer = new Uint8Array(16);
-      crypto.getRandomValues(buffer);
-      buffer[6] = buffer[6] & 15 | 64;
-      buffer[8] = buffer[8] & 63 | 128;
-      let hex = "";
-      for (let i = 0; i < 16; i++) {
-        hex += buffer[i].toString(16).padStart(2, "0");
-        if (i === 3 || i === 5 || i === 7 || i === 9) hex += "-";
-      }
-      return hex;
+// src/resources/agent.ts
+function parseClientRuntimeContext(runtimeContext) {
+  if (runtimeContext) {
+    if (runtimeContext instanceof RuntimeContext) {
+      return Object.fromEntries(runtimeContext.entries());
     }
+    return runtimeContext;
   }
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-    const r = Math.random() * 16 | 0;
-    const v = c === "x" ? r : r & 3 | 8;
-    return v.toString(16);
-  });
+  return void 0;
 }
-function convertMessagesToMastraMessages(messages) {
-  const result = [];
-  const toolCallsWithResults = /* @__PURE__ */ new Set();
-  for (const message of messages) {
-    if (message.role === "tool" && message.toolCallId) {
-      toolCallsWithResults.add(message.toolCallId);
-    }
-  }
-  for (const message of messages) {
-    if (message.role === "assistant") {
-      const parts = message.content ? [{ type: "text", text: message.content }] : [];
-      for (const toolCall of message.toolCalls ?? []) {
-        parts.push({
-          type: "tool-call",
-          toolCallId: toolCall.id,
-          toolName: toolCall.function.name,
-          args: JSON.parse(toolCall.function.arguments)
-        });
-      }
-      result.push({
-        role: "assistant",
-        content: parts
-      });
-      if (message.toolCalls?.length) {
-        for (const toolCall of message.toolCalls) {
-          if (!toolCallsWithResults.has(toolCall.id)) {
-            result.push({
-              role: "tool",
-              content: [
-                {
-                  type: "tool-result",
-                  toolCallId: toolCall.id,
-                  toolName: toolCall.function.name,
-                  result: JSON.parse(toolCall.function.arguments)
-                  // This is still wrong but matches test expectations
-                }
-              ]
-            });
-          }
-        }
-      }
-    } else if (message.role === "user") {
-      result.push({
-        role: "user",
-        content: message.content || ""
-      });
-    } else if (message.role === "tool") {
-      result.push({
-        role: "tool",
-        content: [
-          {
-            type: "tool-result",
-            toolCallId: message.toolCallId || "unknown",
-            toolName: "unknown",
-            // toolName is not available in tool messages from CopilotKit
-            result: message.content
-          }
-        ]
-      });
-    }
-  }
-  return result;
+function isZodType(value) {
+  return typeof value === "object" && value !== null && "_def" in value && "parse" in value && typeof value.parse === "function" && "safeParse" in value && typeof value.safeParse === "function";
 }
 function zodToJsonSchema(zodSchema) {
-  if (!(zodSchema instanceof ZodSchema)) {
+  if (!isZodType(zodSchema)) {
     return zodSchema;
   }
-  return originalZodToJsonSchema(zodSchema, { $refStrategy: "none" });
+  if ("toJSONSchema" in z) {
+    const fn = "toJSONSchema";
+    return z[fn].call(z, zodSchema);
+  }
+  return originalZodToJsonSchema(zodSchema, { $refStrategy: "relative" });
 }
+
+// src/utils/process-client-tools.ts
 function processClientTools(clientTools) {
   if (!clientTools) {
     return void 0;
@@ -240,6 +58,42 @@ function processClientTools(clientTools) {
   );
 }
 
+// src/utils/process-mastra-stream.ts
+async function processMastraStream({
+  stream,
+  onChunk
+}) {
+  const reader = stream.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split("\n\n");
+      buffer = lines.pop() || "";
+      for (const line of lines) {
+        if (line.startsWith("data: ")) {
+          const data = line.slice(6);
+          if (data === "[DONE]") {
+            console.log("\u{1F3C1} Stream finished");
+            return;
+          }
+          try {
+            const json = JSON.parse(data);
+            await onChunk(json);
+          } catch (error) {
+            console.error("\u274C JSON parse error:", error, "Data:", data);
+          }
+        }
+      }
+    }
+  } finally {
+    reader.releaseLock();
+  }
+}
+
 // src/resources/base.ts
 var BaseResource = class {
   options;
@@ -254,7 +108,7 @@ var BaseResource = class {
    */
   async request(path, options = {}) {
     let lastError = null;
-    const { baseUrl, retries = 3, backoffMs = 100, maxBackoffMs = 1e3, headers = {} } = this.options;
+    const { baseUrl, retries = 3, backoffMs = 100, maxBackoffMs = 1e3, headers = {}, credentials } = this.options;
     let delay = backoffMs;
     for (let attempt = 0; attempt <= retries; attempt++) {
       try {
@@ -268,6 +122,7 @@ var BaseResource = class {
             // 'x-mastra-client-type': 'js',
           },
           signal: this.options.abortSignal,
+          credentials: options.credentials ?? credentials,
           body: options.body instanceof FormData ? options.body : options.body ? JSON.stringify(options.body) : void 0
         });
         if (!response.ok) {
@@ -300,14 +155,64 @@ var BaseResource = class {
     throw lastError || new Error("Request failed");
   }
 };
-function parseClientRuntimeContext(runtimeContext) {
-  if (runtimeContext) {
-    if (runtimeContext instanceof RuntimeContext) {
-      return Object.fromEntries(runtimeContext.entries());
+
+// src/resources/agent.ts
+async function executeToolCallAndRespond({
+  response,
+  params,
+  runId,
+  resourceId,
+  threadId,
+  runtimeContext,
+  respondFn
+}) {
+  if (response.finishReason === "tool-calls") {
+    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(
+          {
+            context: toolCall?.args,
+            runId,
+            resourceId,
+            threadId,
+            runtimeContext,
+            tracingContext: { currentSpan: void 0 }
+          },
+          {
+            messages: response.messages,
+            toolCallId: toolCall?.toolCallId
+          }
+        );
+        const updatedMessages = [
+          {
+            role: "user",
+            content: params.messages
+          },
+          ...response.response.messages,
+          {
+            role: "tool",
+            content: [
+              {
+                type: "tool-result",
+                toolCallId: toolCall.toolCallId,
+                toolName: toolCall.toolName,
+                result
+              }
+            ]
+          }
+        ];
+        return respondFn({
+          ...params,
+          messages: updatedMessages
+        });
+      }
     }
-    return runtimeContext;
   }
-  return void 0;
 }
 var AgentVoice = class extends BaseResource {
   constructor(options, agentId) {
@@ -378,6 +283,12 @@ var Agent = class extends BaseResource {
     return this.request(`/api/agents/${this.agentId}`);
   }
   async generate(params) {
+    console.warn(
+      "Deprecation NOTICE:Generate method will switch to use generateVNext implementation September 16th, 2025. Please use generateLegacy if you don't want to upgrade just yet."
+    );
+    return this.generateLegacy(params);
+  }
+  async generateLegacy(params) {
     const processedParams = {
       ...params,
       output: params.output ? zodToJsonSchema(params.output) : void 0,
@@ -387,7 +298,7 @@ var Agent = class extends BaseResource {
     };
     const { runId, resourceId, threadId, runtimeContext } = processedParams;
     const response = await this.request(
-      `/api/agents/${this.agentId}/generate`,
+      `/api/agents/${this.agentId}/generate-legacy`,
       {
         method: "POST",
         body: processedParams
@@ -402,7 +313,14 @@ var Agent = class extends BaseResource {
         const clientTool = params.clientTools?.[toolCall.toolName];
         if (clientTool && clientTool.execute) {
           const result = await clientTool.execute(
-            { context: toolCall?.args, runId, resourceId, threadId, runtimeContext },
+            {
+              context: toolCall?.args,
+              runId,
+              resourceId,
+              threadId,
+              runtimeContext,
+              tracingContext: { currentSpan: void 0 }
+            },
             {
               messages: response.messages,
               toolCallId: toolCall?.toolCallId
@@ -435,6 +353,38 @@ var Agent = class extends BaseResource {
     }
     return response;
   }
+  async generateVNext(params) {
+    const processedParams = {
+      ...params,
+      output: params.output ? zodToJsonSchema(params.output) : void 0,
+      runtimeContext: parseClientRuntimeContext(params.runtimeContext),
+      clientTools: processClientTools(params.clientTools),
+      structuredOutput: params.structuredOutput ? {
+        ...params.structuredOutput,
+        schema: zodToJsonSchema(params.structuredOutput.schema)
+      } : void 0
+    };
+    const { runId, resourceId, threadId, runtimeContext } = processedParams;
+    const response = await this.request(
+      `/api/agents/${this.agentId}/generate/vnext`,
+      {
+        method: "POST",
+        body: processedParams
+      }
+    );
+    if (response.finishReason === "tool-calls") {
+      return executeToolCallAndRespond({
+        response,
+        params,
+        runId,
+        resourceId,
+        threadId,
+        runtimeContext,
+        respondFn: this.generateVNext.bind(this)
+      });
+    }
+    return response;
+  }
   async processChatResponse({
     stream,
     update,
@@ -703,6 +653,17 @@ var Agent = class extends BaseResource {
    * @returns Promise containing the enhanced Response object with processDataStream method
    */
   async stream(params) {
+    console.warn(
+      "Deprecation NOTICE:\nStream method will switch to use streamVNext implementation September 16th, 2025. Please use streamLegacy if you don't want to upgrade just yet."
+    );
+    return this.streamLegacy(params);
+  }
+  /**
+   * Streams a response from the agent
+   * @param params - Stream parameters including prompt
+   * @returns Promise containing the enhanced Response object with processDataStream method
+   */
+  async streamLegacy(params) {
     const processedParams = {
       ...params,
       output: params.output ? zodToJsonSchema(params.output) : void 0,
@@ -725,11 +686,261 @@ var Agent = class extends BaseResource {
     };
     return streamResponse;
   }
-  /**
-   * Processes the stream response and handles tool calls
-   */
-  async processStreamResponse(processedParams, writable) {
-    const response = await this.request(`/api/agents/${this.agentId}/stream`, {
+  async processChatResponse_vNext({
+    stream,
+    update,
+    onToolCall,
+    onFinish,
+    getCurrentDate = () => /* @__PURE__ */ new Date(),
+    lastMessage
+  }) {
+    const replaceLastMessage = lastMessage?.role === "assistant";
+    let step = replaceLastMessage ? 1 + // find max step in existing tool invocations:
+    (lastMessage.toolInvocations?.reduce((max, toolInvocation) => {
+      return Math.max(max, toolInvocation.step ?? 0);
+    }, 0) ?? 0) : 0;
+    const message = replaceLastMessage ? structuredClone(lastMessage) : {
+      id: v4(),
+      createdAt: getCurrentDate(),
+      role: "assistant",
+      content: "",
+      parts: []
+    };
+    let currentTextPart = void 0;
+    let currentReasoningPart = void 0;
+    let currentReasoningTextDetail = void 0;
+    function updateToolInvocationPart(toolCallId, invocation) {
+      const part = message.parts.find(
+        (part2) => part2.type === "tool-invocation" && part2.toolInvocation.toolCallId === toolCallId
+      );
+      if (part != null) {
+        part.toolInvocation = invocation;
+      } else {
+        message.parts.push({
+          type: "tool-invocation",
+          toolInvocation: invocation
+        });
+      }
+    }
+    const data = [];
+    let messageAnnotations = replaceLastMessage ? lastMessage?.annotations : void 0;
+    const partialToolCalls = {};
+    let usage = {
+      completionTokens: NaN,
+      promptTokens: NaN,
+      totalTokens: NaN
+    };
+    let finishReason = "unknown";
+    function execUpdate() {
+      const copiedData = [...data];
+      if (messageAnnotations?.length) {
+        message.annotations = messageAnnotations;
+      }
+      const copiedMessage = {
+        // deep copy the message to ensure that deep changes (msg attachments) are updated
+        // with SolidJS. SolidJS uses referential integration of sub-objects to detect changes.
+        ...structuredClone(message),
+        // add a revision id to ensure that the message is updated with SWR. SWR uses a
+        // hashing approach by default to detect changes, but it only works for shallow
+        // changes. This is why we need to add a revision id to ensure that the message
+        // is updated with SWR (without it, the changes get stuck in SWR and are not
+        // forwarded to rendering):
+        revisionId: v4()
+      };
+      update({
+        message: copiedMessage,
+        data: copiedData,
+        replaceLastMessage
+      });
+    }
+    await processMastraStream({
+      stream,
+      // TODO: casting as any here because the stream types were all typed as any before in core.
+      // but this is completely wrong and this fn is probably broken. Remove ":any" and you'll see a bunch of type errors
+      onChunk: async (chunk) => {
+        switch (chunk.type) {
+          case "step-start": {
+            if (!replaceLastMessage) {
+              message.id = chunk.payload.messageId;
+            }
+            message.parts.push({ type: "step-start" });
+            execUpdate();
+            break;
+          }
+          case "text-delta": {
+            if (currentTextPart == null) {
+              currentTextPart = {
+                type: "text",
+                text: chunk.payload.text
+              };
+              message.parts.push(currentTextPart);
+            } else {
+              currentTextPart.text += chunk.payload.text;
+            }
+            message.content += chunk.payload.text;
+            execUpdate();
+            break;
+          }
+          case "reasoning-delta": {
+            if (currentReasoningTextDetail == null) {
+              currentReasoningTextDetail = { type: "text", text: chunk.payload.text };
+              if (currentReasoningPart != null) {
+                currentReasoningPart.details.push(currentReasoningTextDetail);
+              }
+            } else {
+              currentReasoningTextDetail.text += chunk.payload.text;
+            }
+            if (currentReasoningPart == null) {
+              currentReasoningPart = {
+                type: "reasoning",
+                reasoning: chunk.payload.text,
+                details: [currentReasoningTextDetail]
+              };
+              message.parts.push(currentReasoningPart);
+            } else {
+              currentReasoningPart.reasoning += chunk.payload.text;
+            }
+            message.reasoning = (message.reasoning ?? "") + chunk.payload.text;
+            execUpdate();
+            break;
+          }
+          case "file": {
+            message.parts.push({
+              type: "file",
+              mimeType: chunk.payload.mimeType,
+              data: chunk.payload.data
+            });
+            execUpdate();
+            break;
+          }
+          case "source": {
+            message.parts.push({
+              type: "source",
+              source: chunk.payload.source
+            });
+            execUpdate();
+            break;
+          }
+          case "tool-call": {
+            const invocation = {
+              state: "call",
+              step,
+              ...chunk.payload
+            };
+            if (partialToolCalls[chunk.payload.toolCallId] != null) {
+              message.toolInvocations[partialToolCalls[chunk.payload.toolCallId].index] = invocation;
+            } else {
+              if (message.toolInvocations == null) {
+                message.toolInvocations = [];
+              }
+              message.toolInvocations.push(invocation);
+            }
+            updateToolInvocationPart(chunk.payload.toolCallId, invocation);
+            execUpdate();
+            if (onToolCall) {
+              const result = await onToolCall({ toolCall: chunk.payload });
+              if (result != null) {
+                const invocation2 = {
+                  state: "result",
+                  step,
+                  ...chunk.payload,
+                  result
+                };
+                message.toolInvocations[message.toolInvocations.length - 1] = invocation2;
+                updateToolInvocationPart(chunk.payload.toolCallId, invocation2);
+                execUpdate();
+              }
+            }
+          }
+          case "tool-call-input-streaming-start": {
+            if (message.toolInvocations == null) {
+              message.toolInvocations = [];
+            }
+            partialToolCalls[chunk.payload.toolCallId] = {
+              text: "",
+              step,
+              toolName: chunk.payload.toolName,
+              index: message.toolInvocations.length
+            };
+            const invocation = {
+              state: "partial-call",
+              step,
+              toolCallId: chunk.payload.toolCallId,
+              toolName: chunk.payload.toolName,
+              args: chunk.payload.args
+            };
+            message.toolInvocations.push(invocation);
+            updateToolInvocationPart(chunk.payload.toolCallId, invocation);
+            execUpdate();
+            break;
+          }
+          case "tool-call-delta": {
+            const partialToolCall = partialToolCalls[chunk.payload.toolCallId];
+            partialToolCall.text += chunk.payload.argsTextDelta;
+            const { value: partialArgs } = parsePartialJson(partialToolCall.text);
+            const invocation = {
+              state: "partial-call",
+              step: partialToolCall.step,
+              toolCallId: chunk.payload.toolCallId,
+              toolName: partialToolCall.toolName,
+              args: partialArgs
+            };
+            message.toolInvocations[partialToolCall.index] = invocation;
+            updateToolInvocationPart(chunk.payload.toolCallId, invocation);
+            execUpdate();
+            break;
+          }
+          case "tool-result": {
+            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 === chunk.payload.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",
+              ...chunk.payload
+            };
+            toolInvocations[toolInvocationIndex] = invocation;
+            updateToolInvocationPart(chunk.payload.toolCallId, invocation);
+            execUpdate();
+            break;
+          }
+          case "error": {
+            throw new Error(chunk.payload.error);
+          }
+          case "data": {
+            data.push(...chunk.payload.data);
+            execUpdate();
+            break;
+          }
+          case "step-finish": {
+            step += 1;
+            currentTextPart = chunk.payload.stepResult.isContinued ? currentTextPart : void 0;
+            currentReasoningPart = void 0;
+            currentReasoningTextDetail = void 0;
+            execUpdate();
+            break;
+          }
+          case "finish": {
+            finishReason = chunk.payload.stepResult.reason;
+            if (chunk.payload.usage != null) {
+              usage = chunk.payload.usage;
+            }
+            break;
+          }
+        }
+      }
+    });
+    onFinish?.({ message, finishReason, usage });
+  }
+  async processStreamResponse_vNext(processedParams, writable) {
+    const response = await this.request(`/api/agents/${this.agentId}/stream/vnext`, {
       method: "POST",
       body: processedParams,
       stream: true
@@ -741,12 +952,31 @@ var Agent = class extends BaseResource {
       let toolCalls = [];
       let messages = [];
       const [streamForWritable, streamForProcessing] = response.body.tee();
-      streamForWritable.pipeTo(writable, {
-        preventClose: true
-      }).catch((error) => {
+      streamForWritable.pipeTo(
+        new WritableStream({
+          async write(chunk) {
+            try {
+              const text = new TextDecoder().decode(chunk);
+              if (text.includes("[DONE]")) {
+                return;
+              }
+            } catch {
+            }
+            const writer = writable.getWriter();
+            try {
+              await writer.write(chunk);
+            } finally {
+              writer.releaseLock();
+            }
+          }
+        }),
+        {
+          preventClose: true
+        }
+      ).catch((error) => {
         console.error("Error piping to writable stream:", error);
       });
-      this.processChatResponse({
+      this.processChatResponse_vNext({
         stream: streamForProcessing,
         update: ({ message }) => {
           const existingIndex = messages.findIndex((m) => m.id === message.id);
@@ -771,14 +1001,17 @@ var Agent = class extends BaseResource {
                     runId: processedParams.runId,
                     resourceId: processedParams.resourceId,
                     threadId: processedParams.threadId,
-                    runtimeContext: processedParams.runtimeContext
+                    runtimeContext: processedParams.runtimeContext,
+                    // TODO: Pass proper tracing context when client-js supports tracing
+                    tracingContext: { currentSpan: void 0 }
                   },
                   {
                     messages: response.messages,
                     toolCallId: toolCall2?.toolCallId
                   }
                 );
-                const lastMessage = JSON.parse(JSON.stringify(messages[messages.length - 1]));
+                const lastMessageRaw = messages[messages.length - 1];
+                const lastMessage = lastMessageRaw != null ? JSON.parse(JSON.stringify(lastMessageRaw)) : void 0;
                 const toolInvocationPart = lastMessage?.parts?.find(
                   (part) => part.type === "tool-invocation" && part.toolInvocation?.toolCallId === toolCall2.toolCallId
                 );
@@ -796,13 +1029,143 @@ var Agent = class extends BaseResource {
                   toolInvocation.state = "result";
                   toolInvocation.result = result;
                 }
-                const writer = writable.getWriter();
-                try {
-                  await writer.write(
-                    new TextEncoder().encode(
-                      "a:" + JSON.stringify({
-                        toolCallId: toolCall2.toolCallId,
-                        result
+                const originalMessages = processedParams.messages;
+                const messageArray = Array.isArray(originalMessages) ? originalMessages : [originalMessages];
+                const updatedMessages = lastMessage != null ? [...messageArray, ...messages.filter((m) => m.id !== lastMessage.id), lastMessage] : [...messageArray, ...messages];
+                this.processStreamResponse_vNext(
+                  {
+                    ...processedParams,
+                    messages: updatedMessages
+                  },
+                  writable
+                ).catch((error) => {
+                  console.error("Error processing stream response:", error);
+                });
+              }
+            }
+          } else {
+            setTimeout(() => {
+              writable.close();
+            }, 0);
+          }
+        },
+        lastMessage: void 0
+      }).catch((error) => {
+        console.error("Error processing stream response:", error);
+      });
+    } catch (error) {
+      console.error("Error processing stream response:", error);
+    }
+    return response;
+  }
+  async streamVNext(params) {
+    const processedParams = {
+      ...params,
+      output: params.output ? zodToJsonSchema(params.output) : void 0,
+      runtimeContext: parseClientRuntimeContext(params.runtimeContext),
+      clientTools: processClientTools(params.clientTools),
+      structuredOutput: params.structuredOutput ? {
+        ...params.structuredOutput,
+        schema: zodToJsonSchema(params.structuredOutput.schema)
+      } : void 0
+    };
+    const { readable, writable } = new TransformStream();
+    const response = await this.processStreamResponse_vNext(processedParams, writable);
+    const streamResponse = new Response(readable, {
+      status: response.status,
+      statusText: response.statusText,
+      headers: response.headers
+    });
+    streamResponse.processDataStream = async ({
+      onChunk
+    }) => {
+      await processMastraStream({
+        stream: streamResponse.body,
+        onChunk
+      });
+    };
+    return streamResponse;
+  }
+  /**
+   * Processes the stream response and handles tool calls
+   */
+  async processStreamResponse(processedParams, writable) {
+    const response = await this.request(`/api/agents/${this.agentId}/stream-legacy`, {
+      method: "POST",
+      body: processedParams,
+      stream: true
+    });
+    if (!response.body) {
+      throw new Error("No response body");
+    }
+    try {
+      let toolCalls = [];
+      let messages = [];
+      const [streamForWritable, streamForProcessing] = response.body.tee();
+      streamForWritable.pipeTo(writable, {
+        preventClose: true
+      }).catch((error) => {
+        console.error("Error piping to writable stream:", error);
+      });
+      this.processChatResponse({
+        stream: streamForProcessing,
+        update: ({ message }) => {
+          const existingIndex = messages.findIndex((m) => m.id === message.id);
+          if (existingIndex !== -1) {
+            messages[existingIndex] = message;
+          } else {
+            messages.push(message);
+          }
+        },
+        onFinish: async ({ finishReason, message }) => {
+          if (finishReason === "tool-calls") {
+            const toolCall = [...message?.parts ?? []].reverse().find((part) => part.type === "tool-invocation")?.toolInvocation;
+            if (toolCall) {
+              toolCalls.push(toolCall);
+            }
+            for (const toolCall2 of toolCalls) {
+              const clientTool = processedParams.clientTools?.[toolCall2.toolName];
+              if (clientTool && clientTool.execute) {
+                const result = await clientTool.execute(
+                  {
+                    context: toolCall2?.args,
+                    runId: processedParams.runId,
+                    resourceId: processedParams.resourceId,
+                    threadId: processedParams.threadId,
+                    runtimeContext: processedParams.runtimeContext,
+                    // TODO: Pass proper tracing context when client-js supports tracing
+                    tracingContext: { currentSpan: void 0 }
+                  },
+                  {
+                    messages: response.messages,
+                    toolCallId: toolCall2?.toolCallId
+                  }
+                );
+                const lastMessage = JSON.parse(JSON.stringify(messages[messages.length - 1]));
+                const toolInvocationPart = lastMessage?.parts?.find(
+                  (part) => part.type === "tool-invocation" && part.toolInvocation?.toolCallId === toolCall2.toolCallId
+                );
+                if (toolInvocationPart) {
+                  toolInvocationPart.toolInvocation = {
+                    ...toolInvocationPart.toolInvocation,
+                    state: "result",
+                    result
+                  };
+                }
+                const toolInvocation = lastMessage?.toolInvocations?.find(
+                  (toolInvocation2) => toolInvocation2.toolCallId === toolCall2.toolCallId
+                );
+                if (toolInvocation) {
+                  toolInvocation.state = "result";
+                  toolInvocation.result = result;
+                }
+                const writer = writable.getWriter();
+                try {
+                  await writer.write(
+                    new TextEncoder().encode(
+                      "a:" + JSON.stringify({
+                        toolCallId: toolCall2.toolCallId,
+                        result
                       }) + "\n"
                     )
                   );
@@ -875,6 +1238,17 @@ var Agent = class extends BaseResource {
   liveEvals() {
     return this.request(`/api/agents/${this.agentId}/evals/live`);
   }
+  /**
+   * Updates the model for the agent
+   * @param params - Parameters for updating the model
+   * @returns Promise containing the updated model
+   */
+  updateModel(params) {
+    return this.request(`/api/agents/${this.agentId}/model`, {
+      method: "POST",
+      body: params
+    });
+  }
 };
 var Network = class extends BaseResource {
   constructor(options, networkId) {
@@ -1259,7 +1633,7 @@ var LegacyWorkflow = class extends BaseResource {
 };
 
 // src/resources/tool.ts
-var Tool2 = class extends BaseResource {
+var Tool = class extends BaseResource {
   constructor(options, toolId) {
     super(options);
     this.toolId = toolId;
@@ -1483,32 +1857,472 @@ var Workflow = class extends BaseResource {
       searchParams.set("runId", params.runId);
     }
     const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
-    return this.request(`/api/workflows/${this.workflowId}/start-async?${searchParams.toString()}`, {
+    return this.request(`/api/workflows/${this.workflowId}/start-async?${searchParams.toString()}`, {
+      method: "POST",
+      body: { inputData: params.inputData, runtimeContext }
+    });
+  }
+  /**
+   * Starts a workflow run and returns a stream
+   * @param params - Object containing the optional runId, inputData and runtimeContext
+   * @returns Promise containing the workflow execution results
+   */
+  async stream(params) {
+    const searchParams = new URLSearchParams();
+    if (!!params?.runId) {
+      searchParams.set("runId", params.runId);
+    }
+    const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
+    const response = await this.request(
+      `/api/workflows/${this.workflowId}/stream?${searchParams.toString()}`,
+      {
+        method: "POST",
+        body: { inputData: params.inputData, runtimeContext },
+        stream: true
+      }
+    );
+    if (!response.ok) {
+      throw new Error(`Failed to stream vNext workflow: ${response.statusText}`);
+    }
+    if (!response.body) {
+      throw new Error("Response body is null");
+    }
+    let failedChunk = void 0;
+    const transformStream = new TransformStream({
+      start() {
+      },
+      async transform(chunk, controller) {
+        try {
+          const decoded = new TextDecoder().decode(chunk);
+          const chunks = decoded.split(RECORD_SEPARATOR2);
+          for (const chunk2 of chunks) {
+            if (chunk2) {
+              const newChunk = failedChunk ? failedChunk + chunk2 : chunk2;
+              try {
+                const parsedChunk = JSON.parse(newChunk);
+                controller.enqueue(parsedChunk);
+                failedChunk = void 0;
+              } catch {
+                failedChunk = newChunk;
+              }
+            }
+          }
+        } catch {
+        }
+      }
+    });
+    return response.body.pipeThrough(transformStream);
+  }
+  /**
+   * Starts a workflow run and returns a stream
+   * @param params - Object containing the optional runId, inputData and runtimeContext
+   * @returns Promise containing the workflow execution results
+   */
+  async streamVNext(params) {
+    const searchParams = new URLSearchParams();
+    if (!!params?.runId) {
+      searchParams.set("runId", params.runId);
+    }
+    const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
+    const response = await this.request(
+      `/api/workflows/${this.workflowId}/streamVNext?${searchParams.toString()}`,
+      {
+        method: "POST",
+        body: { inputData: params.inputData, runtimeContext },
+        stream: true
+      }
+    );
+    if (!response.ok) {
+      throw new Error(`Failed to stream vNext workflow: ${response.statusText}`);
+    }
+    if (!response.body) {
+      throw new Error("Response body is null");
+    }
+    let failedChunk = void 0;
+    const transformStream = new TransformStream({
+      start() {
+      },
+      async transform(chunk, controller) {
+        try {
+          const decoded = new TextDecoder().decode(chunk);
+          const chunks = decoded.split(RECORD_SEPARATOR2);
+          for (const chunk2 of chunks) {
+            if (chunk2) {
+              const newChunk = failedChunk ? failedChunk + chunk2 : chunk2;
+              try {
+                const parsedChunk = JSON.parse(newChunk);
+                controller.enqueue(parsedChunk);
+                failedChunk = void 0;
+              } catch {
+                failedChunk = newChunk;
+              }
+            }
+          }
+        } catch {
+        }
+      }
+    });
+    return response.body.pipeThrough(transformStream);
+  }
+  /**
+   * Resumes a suspended workflow step asynchronously and returns a promise that resolves when the workflow is complete
+   * @param params - Object containing the runId, step, resumeData and runtimeContext
+   * @returns Promise containing the workflow resume results
+   */
+  resumeAsync(params) {
+    const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
+    return this.request(`/api/workflows/${this.workflowId}/resume-async?runId=${params.runId}`, {
+      method: "POST",
+      body: {
+        step: params.step,
+        resumeData: params.resumeData,
+        runtimeContext
+      }
+    });
+  }
+  /**
+   * Watches workflow transitions in real-time
+   * @param runId - Optional run ID to filter the watch stream
+   * @returns AsyncGenerator that yields parsed records from the workflow watch stream
+   */
+  async watch({ runId }, onRecord) {
+    const response = await this.request(`/api/workflows/${this.workflowId}/watch?runId=${runId}`, {
+      stream: true
+    });
+    if (!response.ok) {
+      throw new Error(`Failed to watch workflow: ${response.statusText}`);
+    }
+    if (!response.body) {
+      throw new Error("Response body is null");
+    }
+    for await (const record of this.streamProcessor(response.body)) {
+      if (typeof record === "string") {
+        onRecord(JSON.parse(record));
+      } else {
+        onRecord(record);
+      }
+    }
+  }
+  /**
+   * Creates a new ReadableStream from an iterable or async iterable of objects,
+   * serializing each as JSON and separating them with the record separator (\x1E).
+   *
+   * @param records - An iterable or async iterable of objects to stream
+   * @returns A ReadableStream emitting the records as JSON strings separated by the record separator
+   */
+  static createRecordStream(records) {
+    const encoder = new TextEncoder();
+    return new ReadableStream({
+      async start(controller) {
+        try {
+          for await (const record of records) {
+            const json = JSON.stringify(record) + RECORD_SEPARATOR2;
+            controller.enqueue(encoder.encode(json));
+          }
+          controller.close();
+        } catch (err) {
+          controller.error(err);
+        }
+      }
+    });
+  }
+};
+
+// src/resources/a2a.ts
+var A2A = class extends BaseResource {
+  constructor(options, agentId) {
+    super(options);
+    this.agentId = agentId;
+  }
+  /**
+   * Get the agent card with metadata about the agent
+   * @returns Promise containing the agent card information
+   */
+  async getCard() {
+    return this.request(`/.well-known/${this.agentId}/agent-card.json`);
+  }
+  /**
+   * Send a message to the agent and gets a message or task response
+   * @param params - Parameters for the task
+   * @returns Promise containing the response
+   */
+  async sendMessage(params) {
+    const response = await this.request(`/a2a/${this.agentId}`, {
+      method: "POST",
+      body: {
+        method: "message/send",
+        params
+      }
+    });
+    return response;
+  }
+  /**
+   * Sends a message to an agent to initiate/continue a task and subscribes
+   * the client to real-time updates for that task via Server-Sent Events (SSE).
+   * @param params - Parameters for the task
+   * @returns A stream of Server-Sent Events. Each SSE `data` field contains a `SendStreamingMessageResponse`
+   */
+  async sendStreamingMessage(params) {
+    const response = await this.request(`/a2a/${this.agentId}`, {
+      method: "POST",
+      body: {
+        method: "message/stream",
+        params
+      }
+    });
+    return response;
+  }
+  /**
+   * Get the status and result of a task
+   * @param params - Parameters for querying the task
+   * @returns Promise containing the task response
+   */
+  async getTask(params) {
+    const response = await this.request(`/a2a/${this.agentId}`, {
+      method: "POST",
+      body: {
+        method: "tasks/get",
+        params
+      }
+    });
+    return response;
+  }
+  /**
+   * Cancel a running task
+   * @param params - Parameters identifying the task to cancel
+   * @returns Promise containing the task response
+   */
+  async cancelTask(params) {
+    return this.request(`/a2a/${this.agentId}`, {
+      method: "POST",
+      body: {
+        method: "tasks/cancel",
+        params
+      }
+    });
+  }
+};
+
+// src/resources/mcp-tool.ts
+var MCPTool = class extends BaseResource {
+  serverId;
+  toolId;
+  constructor(options, serverId, toolId) {
+    super(options);
+    this.serverId = serverId;
+    this.toolId = toolId;
+  }
+  /**
+   * Retrieves details about this specific tool from the MCP server.
+   * @returns Promise containing the tool's information (name, description, schema).
+   */
+  details() {
+    return this.request(`/api/mcp/${this.serverId}/tools/${this.toolId}`);
+  }
+  /**
+   * Executes this specific tool on the MCP server.
+   * @param params - Parameters for tool execution, including data/args and optional runtimeContext.
+   * @returns Promise containing the result of the tool execution.
+   */
+  execute(params) {
+    const body = {};
+    if (params.data !== void 0) body.data = params.data;
+    if (params.runtimeContext !== void 0) {
+      body.runtimeContext = params.runtimeContext;
+    }
+    return this.request(`/api/mcp/${this.serverId}/tools/${this.toolId}/execute`, {
+      method: "POST",
+      body: Object.keys(body).length > 0 ? body : void 0
+    });
+  }
+};
+
+// src/resources/agent-builder.ts
+var RECORD_SEPARATOR3 = "";
+var AgentBuilder = class extends BaseResource {
+  constructor(options, actionId) {
+    super(options);
+    this.actionId = actionId;
+  }
+  // Helper function to transform workflow result to action result
+  transformWorkflowResult(result) {
+    if (result.status === "success") {
+      return {
+        success: result.result.success || false,
+        applied: result.result.applied || false,
+        branchName: result.result.branchName,
+        message: result.result.message || "Agent builder action completed",
+        validationResults: result.result.validationResults,
+        error: result.result.error,
+        errors: result.result.errors,
+        stepResults: result.result.stepResults
+      };
+    } else if (result.status === "failed") {
+      return {
+        success: false,
+        applied: false,
+        message: `Agent builder action failed: ${result.error.message}`,
+        error: result.error.message
+      };
+    } else {
+      return {
+        success: false,
+        applied: false,
+        message: "Agent builder action was suspended",
+        error: "Workflow suspended - manual intervention required"
+      };
+    }
+  }
+  /**
+   * Creates a new agent builder action run and returns the runId.
+   * This calls `/api/agent-builder/:actionId/create-run`.
+   */
+  async createRun(params) {
+    const searchParams = new URLSearchParams();
+    if (!!params?.runId) {
+      searchParams.set("runId", params.runId);
+    }
+    const url = `/api/agent-builder/${this.actionId}/create-run${searchParams.toString() ? `?${searchParams.toString()}` : ""}`;
+    return this.request(url, {
+      method: "POST"
+    });
+  }
+  /**
+   * Creates a new workflow run (alias for createRun)
+   * @param params - Optional object containing the optional runId
+   * @returns Promise containing the runId of the created run
+   */
+  createRunAsync(params) {
+    return this.createRun(params);
+  }
+  /**
+   * Starts agent builder action asynchronously and waits for completion.
+   * This calls `/api/agent-builder/:actionId/start-async`.
+   */
+  async startAsync(params, runId) {
+    const searchParams = new URLSearchParams();
+    if (runId) {
+      searchParams.set("runId", runId);
+    }
+    const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
+    const { runtimeContext: _, ...actionParams } = params;
+    const url = `/api/agent-builder/${this.actionId}/start-async${searchParams.toString() ? `?${searchParams.toString()}` : ""}`;
+    const result = await this.request(url, {
+      method: "POST",
+      body: { ...actionParams, runtimeContext }
+    });
+    return this.transformWorkflowResult(result);
+  }
+  /**
+   * Starts an existing agent builder action run.
+   * This calls `/api/agent-builder/:actionId/start`.
+   */
+  async startActionRun(params, runId) {
+    const searchParams = new URLSearchParams();
+    searchParams.set("runId", runId);
+    const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
+    const { runtimeContext: _, ...actionParams } = params;
+    const url = `/api/agent-builder/${this.actionId}/start?${searchParams.toString()}`;
+    return this.request(url, {
+      method: "POST",
+      body: { ...actionParams, runtimeContext }
+    });
+  }
+  /**
+   * Resumes a suspended agent builder action step.
+   * This calls `/api/agent-builder/:actionId/resume`.
+   */
+  async resume(params, runId) {
+    const searchParams = new URLSearchParams();
+    searchParams.set("runId", runId);
+    const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
+    const { runtimeContext: _, ...resumeParams } = params;
+    const url = `/api/agent-builder/${this.actionId}/resume?${searchParams.toString()}`;
+    return this.request(url, {
+      method: "POST",
+      body: { ...resumeParams, runtimeContext }
+    });
+  }
+  /**
+   * Resumes a suspended agent builder action step asynchronously.
+   * This calls `/api/agent-builder/:actionId/resume-async`.
+   */
+  async resumeAsync(params, runId) {
+    const searchParams = new URLSearchParams();
+    searchParams.set("runId", runId);
+    const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
+    const { runtimeContext: _, ...resumeParams } = params;
+    const url = `/api/agent-builder/${this.actionId}/resume-async?${searchParams.toString()}`;
+    const result = await this.request(url, {
       method: "POST",
-      body: { inputData: params.inputData, runtimeContext }
+      body: { ...resumeParams, runtimeContext }
     });
+    return this.transformWorkflowResult(result);
   }
   /**
-   * Starts a workflow run and returns a stream
-   * @param params - Object containing the optional runId, inputData and runtimeContext
-   * @returns Promise containing the workflow execution results
+   * Creates an async generator that processes a readable stream and yields action records
+   * separated by the Record Separator character (\x1E)
+   *
+   * @param stream - The readable stream to process
+   * @returns An async generator that yields parsed records
    */
-  async stream(params) {
+  async *streamProcessor(stream) {
+    const reader = stream.getReader();
+    let doneReading = false;
+    let buffer = "";
+    try {
+      while (!doneReading) {
+        const { done, value } = await reader.read();
+        doneReading = done;
+        if (done && !value) continue;
+        try {
+          const decoded = value ? new TextDecoder().decode(value) : "";
+          const chunks = (buffer + decoded).split(RECORD_SEPARATOR3);
+          buffer = chunks.pop() || "";
+          for (const chunk of chunks) {
+            if (chunk) {
+              if (typeof chunk === "string") {
+                try {
+                  const parsedChunk = JSON.parse(chunk);
+                  yield parsedChunk;
+                } catch {
+                }
+              }
+            }
+          }
+        } catch {
+        }
+      }
+      if (buffer) {
+        try {
+          yield JSON.parse(buffer);
+        } catch {
+        }
+      }
+    } finally {
+      reader.cancel().catch(() => {
+      });
+    }
+  }
+  /**
+   * Streams agent builder action progress in real-time.
+   * This calls `/api/agent-builder/:actionId/stream`.
+   */
+  async stream(params, runId) {
     const searchParams = new URLSearchParams();
-    if (!!params?.runId) {
-      searchParams.set("runId", params.runId);
+    if (runId) {
+      searchParams.set("runId", runId);
     }
     const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
-    const response = await this.request(
-      `/api/workflows/${this.workflowId}/stream?${searchParams.toString()}`,
-      {
-        method: "POST",
-        body: { inputData: params.inputData, runtimeContext },
-        stream: true
-      }
-    );
+    const { runtimeContext: _, ...actionParams } = params;
+    const url = `/api/agent-builder/${this.actionId}/stream${searchParams.toString() ? `?${searchParams.toString()}` : ""}`;
+    const response = await this.request(url, {
+      method: "POST",
+      body: { ...actionParams, runtimeContext },
+      stream: true
+    });
     if (!response.ok) {
-      throw new Error(`Failed to stream vNext workflow: ${response.statusText}`);
+      throw new Error(`Failed to stream agent builder action: ${response.statusText}`);
     }
     if (!response.body) {
       throw new Error("Response body is null");
@@ -1520,7 +2334,7 @@ var Workflow = class extends BaseResource {
       async transform(chunk, controller) {
         try {
           const decoded = new TextDecoder().decode(chunk);
-          const chunks = decoded.split(RECORD_SEPARATOR2);
+          const chunks = decoded.split(RECORD_SEPARATOR3);
           for (const chunk2 of chunks) {
             if (chunk2) {
               const newChunk = failedChunk ? failedChunk + chunk2 : chunk2;
@@ -1528,7 +2342,7 @@ var Workflow = class extends BaseResource {
                 const parsedChunk = JSON.parse(newChunk);
                 controller.enqueue(parsedChunk);
                 failedChunk = void 0;
-              } catch (error) {
+              } catch {
                 failedChunk = newChunk;
               }
             }
@@ -1540,32 +2354,68 @@ var Workflow = class extends BaseResource {
     return response.body.pipeThrough(transformStream);
   }
   /**
-   * Resumes a suspended workflow step asynchronously and returns a promise that resolves when the workflow is complete
-   * @param params - Object containing the runId, step, resumeData and runtimeContext
-   * @returns Promise containing the workflow resume results
+   * Streams agent builder action progress in real-time using VNext streaming.
+   * This calls `/api/agent-builder/:actionId/streamVNext`.
    */
-  resumeAsync(params) {
+  async streamVNext(params, runId) {
+    const searchParams = new URLSearchParams();
+    if (runId) {
+      searchParams.set("runId", runId);
+    }
     const runtimeContext = parseClientRuntimeContext(params.runtimeContext);
-    return this.request(`/api/workflows/${this.workflowId}/resume-async?runId=${params.runId}`, {
+    const { runtimeContext: _, ...actionParams } = params;
+    const url = `/api/agent-builder/${this.actionId}/streamVNext${searchParams.toString() ? `?${searchParams.toString()}` : ""}`;
+    const response = await this.request(url, {
       method: "POST",
-      body: {
-        step: params.step,
-        resumeData: params.resumeData,
-        runtimeContext
+      body: { ...actionParams, runtimeContext },
+      stream: true
+    });
+    if (!response.ok) {
+      throw new Error(`Failed to stream agent builder action VNext: ${response.statusText}`);
+    }
+    if (!response.body) {
+      throw new Error("Response body is null");
+    }
+    let failedChunk = void 0;
+    const transformStream = new TransformStream({
+      start() {
+      },
+      async transform(chunk, controller) {
+        try {
+          const decoded = new TextDecoder().decode(chunk);
+          const chunks = decoded.split(RECORD_SEPARATOR3);
+          for (const chunk2 of chunks) {
+            if (chunk2) {
+              const newChunk = failedChunk ? failedChunk + chunk2 : chunk2;
+              try {
+                const parsedChunk = JSON.parse(newChunk);
+                controller.enqueue(parsedChunk);
+                failedChunk = void 0;
+              } catch {
+                failedChunk = newChunk;
+              }
+            }
+          }
+        } catch {
+        }
       }
     });
+    return response.body.pipeThrough(transformStream);
   }
   /**
-   * Watches workflow transitions in real-time
-   * @param runId - Optional run ID to filter the watch stream
-   * @returns AsyncGenerator that yields parsed records from the workflow watch stream
+   * Watches an existing agent builder action run by runId.
+   * This is used for hot reload recovery - it loads the existing run state
+   * and streams any remaining progress.
+   * This calls `/api/agent-builder/:actionId/watch`.
    */
-  async watch({ runId }, onRecord) {
-    const response = await this.request(`/api/workflows/${this.workflowId}/watch?runId=${runId}`, {
+  async watch({ runId, eventType }, onRecord) {
+    const url = `/api/agent-builder/${this.actionId}/watch?runId=${runId}${eventType ? `&eventType=${eventType}` : ""}`;
+    const response = await this.request(url, {
+      method: "GET",
       stream: true
     });
     if (!response.ok) {
-      throw new Error(`Failed to watch workflow: ${response.statusText}`);
+      throw new Error(`Failed to watch agent builder action: ${response.statusText}`);
     }
     if (!response.body) {
       throw new Error("Response body is null");
@@ -1579,135 +2429,130 @@ var Workflow = class extends BaseResource {
     }
   }
   /**
-   * Creates a new ReadableStream from an iterable or async iterable of objects,
-   * serializing each as JSON and separating them with the record separator (\x1E).
-   *
-   * @param records - An iterable or async iterable of objects to stream
-   * @returns A ReadableStream emitting the records as JSON strings separated by the record separator
+   * Gets a specific action run by its ID.
+   * This calls `/api/agent-builder/:actionId/runs/:runId`.
    */
-  static createRecordStream(records) {
-    const encoder = new TextEncoder();
-    return new ReadableStream({
-      async start(controller) {
-        try {
-          for await (const record of records) {
-            const json = JSON.stringify(record) + RECORD_SEPARATOR2;
-            controller.enqueue(encoder.encode(json));
-          }
-          controller.close();
-        } catch (err) {
-          controller.error(err);
-        }
-      }
+  async runById(runId) {
+    const url = `/api/agent-builder/${this.actionId}/runs/${runId}`;
+    return this.request(url, {
+      method: "GET"
     });
   }
-};
-
-// src/resources/a2a.ts
-var A2A = class extends BaseResource {
-  constructor(options, agentId) {
-    super(options);
-    this.agentId = agentId;
-  }
   /**
-   * Get the agent card with metadata about the agent
-   * @returns Promise containing the agent card information
+   * Gets details about this agent builder action.
+   * This calls `/api/agent-builder/:actionId`.
    */
-  async getCard() {
-    return this.request(`/.well-known/${this.agentId}/agent.json`);
+  async details() {
+    const result = await this.request(`/api/agent-builder/${this.actionId}`);
+    return result;
   }
   /**
-   * Send a message to the agent and get a response
-   * @param params - Parameters for the task
-   * @returns Promise containing the task response
+   * Gets all runs for this agent builder action.
+   * This calls `/api/agent-builder/:actionId/runs`.
    */
-  async sendMessage(params) {
-    const response = await this.request(`/a2a/${this.agentId}`, {
-      method: "POST",
-      body: {
-        method: "tasks/send",
-        params
-      }
+  async runs(params) {
+    const searchParams = new URLSearchParams();
+    if (params?.fromDate) {
+      searchParams.set("fromDate", params.fromDate.toISOString());
+    }
+    if (params?.toDate) {
+      searchParams.set("toDate", params.toDate.toISOString());
+    }
+    if (params?.limit !== void 0) {
+      searchParams.set("limit", String(params.limit));
+    }
+    if (params?.offset !== void 0) {
+      searchParams.set("offset", String(params.offset));
+    }
+    if (params?.resourceId) {
+      searchParams.set("resourceId", params.resourceId);
+    }
+    const url = `/api/agent-builder/${this.actionId}/runs${searchParams.toString() ? `?${searchParams.toString()}` : ""}`;
+    return this.request(url, {
+      method: "GET"
     });
-    return { task: response.result };
   }
   /**
-   * Get the status and result of a task
-   * @param params - Parameters for querying the task
-   * @returns Promise containing the task response
+   * Gets the execution result of an agent builder action run.
+   * This calls `/api/agent-builder/:actionId/runs/:runId/execution-result`.
    */
-  async getTask(params) {
-    const response = await this.request(`/a2a/${this.agentId}`, {
-      method: "POST",
-      body: {
-        method: "tasks/get",
-        params
-      }
+  async runExecutionResult(runId) {
+    const url = `/api/agent-builder/${this.actionId}/runs/${runId}/execution-result`;
+    return this.request(url, {
+      method: "GET"
     });
-    return response.result;
   }
   /**
-   * Cancel a running task
-   * @param params - Parameters identifying the task to cancel
-   * @returns Promise containing the task response
+   * Cancels an agent builder action run.
+   * This calls `/api/agent-builder/:actionId/runs/:runId/cancel`.
    */
-  async cancelTask(params) {
-    return this.request(`/a2a/${this.agentId}`, {
-      method: "POST",
-      body: {
-        method: "tasks/cancel",
-        params
-      }
+  async cancelRun(runId) {
+    const url = `/api/agent-builder/${this.actionId}/runs/${runId}/cancel`;
+    return this.request(url, {
+      method: "POST"
     });
   }
   /**
-   * Send a message and subscribe to streaming updates (not fully implemented)
-   * @param params - Parameters for the task
-   * @returns Promise containing the task response
+   * Sends an event to an agent builder action run.
+   * This calls `/api/agent-builder/:actionId/runs/:runId/send-event`.
    */
-  async sendAndSubscribe(params) {
-    return this.request(`/a2a/${this.agentId}`, {
+  async sendRunEvent(params) {
+    const url = `/api/agent-builder/${this.actionId}/runs/${params.runId}/send-event`;
+    return this.request(url, {
       method: "POST",
-      body: {
-        method: "tasks/sendSubscribe",
-        params
-      },
-      stream: true
+      body: { event: params.event, data: params.data }
     });
   }
 };
 
-// src/resources/mcp-tool.ts
-var MCPTool = class extends BaseResource {
-  serverId;
-  toolId;
-  constructor(options, serverId, toolId) {
+// src/resources/observability.ts
+var Observability = class extends BaseResource {
+  constructor(options) {
     super(options);
-    this.serverId = serverId;
-    this.toolId = toolId;
   }
   /**
-   * Retrieves details about this specific tool from the MCP server.
-   * @returns Promise containing the tool's information (name, description, schema).
+   * Retrieves a specific AI trace by ID
+   * @param traceId - ID of the trace to retrieve
+   * @returns Promise containing the AI trace with all its spans
    */
-  details() {
-    return this.request(`/api/mcp/${this.serverId}/tools/${this.toolId}`);
+  getTrace(traceId) {
+    return this.request(`/api/observability/traces/${traceId}`);
   }
   /**
-   * Executes this specific tool on the MCP server.
-   * @param params - Parameters for tool execution, including data/args and optional runtimeContext.
-   * @returns Promise containing the result of the tool execution.
+   * Retrieves paginated list of AI traces with optional filtering
+   * @param params - Parameters for pagination and filtering
+   * @returns Promise containing paginated traces and pagination info
    */
-  execute(params) {
-    const body = {};
-    if (params.data !== void 0) body.data = params.data;
-    if (params.runtimeContext !== void 0) {
-      body.runtimeContext = params.runtimeContext;
+  getTraces(params) {
+    const { pagination, filters } = params;
+    const { page, perPage, dateRange } = pagination || {};
+    const { name, spanType, entityId, entityType } = filters || {};
+    const searchParams = new URLSearchParams();
+    if (page !== void 0) {
+      searchParams.set("page", String(page));
     }
-    return this.request(`/api/mcp/${this.serverId}/tools/${this.toolId}/execute`, {
-      method: "POST",
-      body: Object.keys(body).length > 0 ? body : void 0
-    });
+    if (perPage !== void 0) {
+      searchParams.set("perPage", String(perPage));
+    }
+    if (name) {
+      searchParams.set("name", name);
+    }
+    if (spanType !== void 0) {
+      searchParams.set("spanType", String(spanType));
+    }
+    if (entityId && entityType) {
+      searchParams.set("entityId", entityId);
+      searchParams.set("entityType", entityType);
+    }
+    if (dateRange) {
+      const dateRangeStr = JSON.stringify({
+        start: dateRange.start instanceof Date ? dateRange.start.toISOString() : dateRange.start,
+        end: dateRange.end instanceof Date ? dateRange.end.toISOString() : dateRange.end
+      });
+      searchParams.set("dateRange", dateRangeStr);
+    }
+    const queryString = searchParams.toString();
+    return this.request(`/api/observability/traces${queryString ? `?${queryString}` : ""}`);
   }
 };
 
@@ -1775,7 +2620,7 @@ var NetworkMemoryThread = class extends BaseResource {
 };
 
 // src/resources/vNextNetwork.ts
-var RECORD_SEPARATOR3 = "";
+var RECORD_SEPARATOR4 = "";
 var VNextNetwork = class extends BaseResource {
   constructor(options, networkId) {
     super(options);
@@ -1827,7 +2672,7 @@ var VNextNetwork = class extends BaseResource {
         if (done && !value) continue;
         try {
           const decoded = value ? new TextDecoder().decode(value) : "";
-          const chunks = (buffer + decoded).split(RECORD_SEPARATOR3);
+          const chunks = (buffer + decoded).split(RECORD_SEPARATOR4);
           buffer = chunks.pop() || "";
           for (const chunk of chunks) {
             if (chunk) {
@@ -1914,8 +2759,10 @@ var VNextNetwork = class extends BaseResource {
 
 // src/client.ts
 var MastraClient = class extends BaseResource {
+  observability;
   constructor(options) {
     super(options);
+    this.observability = new Observability(options);
   }
   /**
    * Retrieves all available agents
@@ -1924,21 +2771,6 @@ var MastraClient = class extends BaseResource {
   getAgents() {
     return this.request("/api/agents");
   }
-  async getAGUI({ resourceId }) {
-    const agents = await this.getAgents();
-    return Object.entries(agents).reduce(
-      (acc, [agentId]) => {
-        const agent = this.getAgent(agentId);
-        acc[agentId] = new AGUIAdapter({
-          agentId,
-          agent,
-          resourceId
-        });
-        return acc;
-      },
-      {}
-    );
-  }
   /**
    * Gets an agent instance by ID
    * @param agentId - ID of the agent to retrieve
@@ -2044,7 +2876,7 @@ var MastraClient = class extends BaseResource {
    * @returns Tool instance
    */
   getTool(toolId) {
-    return new Tool2(this.options, toolId);
+    return new Tool(this.options, toolId);
   }
   /**
    * Retrieves all available legacy workflows
@@ -2076,6 +2908,20 @@ var MastraClient = class extends BaseResource {
   getWorkflow(workflowId) {
     return new Workflow(this.options, workflowId);
   }
+  /**
+   * Gets all available agent builder actions
+   * @returns Promise containing map of action IDs to action details
+   */
+  getAgentBuilderActions() {
+    return this.request("/api/agent-builder/");
+  }
+  /**
+   * Gets an agent builder instance for executing agent-builder workflows
+   * @returns AgentBuilder instance
+   */
+  getAgentBuilderAction(actionId) {
+    return new AgentBuilder(this.options, actionId);
+  }
   /**
    * Gets a vector instance by name
    * @param vectorName - Name of the vector to retrieve
@@ -2419,6 +3265,19 @@ var MastraClient = class extends BaseResource {
       body: params
     });
   }
+  /**
+   * Retrieves model providers with available keys
+   * @returns Promise containing model providers with available keys
+   */
+  getModelProviders() {
+    return this.request(`/api/model-providers`);
+  }
+  getAITrace(traceId) {
+    return this.observability.getTrace(traceId);
+  }
+  getAITraces(params) {
+    return this.observability.getTraces(params);
+  }
 };
 
 export { MastraClient };