@mastra/client-js 0.0.0-support-d1-client-20250701191943 → 0.0.0-taofeeq-fix-tool-call-showing-after-message-20250806162745

package/dist/index.cjs

@@ -5,7 +5,8 @@ var rxjs = require('rxjs');
 var uiUtils = require('@ai-sdk/ui-utils');
 var zod = require('zod');
 var originalZodToJsonSchema = require('zod-to-json-schema');
-var tools = require('@mastra/core/tools');
+var isVercelTool = require('@mastra/core/tools/is-vercel-tool');
+var uuid = require('@lukeed/uuid');
 var runtimeContext = require('@mastra/core/runtime-context');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -150,6 +151,12 @@ function generateUUID() {
 }
 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 }] : [];
@@ -166,15 +173,22 @@ function convertMessagesToMastraMessages(messages) {
         content: parts
       });
       if (message.toolCalls?.length) {
-        result.push({
-          role: "tool",
-          content: message.toolCalls.map((toolCall) => ({
-            type: "tool-result",
-            toolCallId: toolCall.id,
-            toolName: toolCall.function.name,
-            result: JSON.parse(toolCall.function.arguments)
-          }))
-        });
+        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({
@@ -187,8 +201,9 @@ function convertMessagesToMastraMessages(messages) {
         content: [
           {
             type: "tool-result",
-            toolCallId: message.toolCallId,
+            toolCallId: message.toolCallId || "unknown",
             toolName: "unknown",
+            // toolName is not available in tool messages from CopilotKit
             result: message.content
           }
         ]
@@ -209,7 +224,7 @@ function processClientTools(clientTools) {
   }
   return Object.fromEntries(
     Object.entries(clientTools).map(([key, value]) => {
-      if (tools.isVercelTool(value)) {
+      if (isVercelTool.isVercelTool(value)) {
         return [
           key,
           {
@@ -252,12 +267,13 @@ var BaseResource = class {
         const response = await fetch(`${baseUrl.replace(/\/$/, "")}${path}`, {
           ...options,
           headers: {
-            ...options.method === "POST" || options.method === "PUT" ? { "content-type": "application/json" } : {},
+            ...options.body && !(options.body instanceof FormData) && (options.method === "POST" || options.method === "PUT") ? { "content-type": "application/json" } : {},
             ...headers,
             ...options.headers
             // TODO: Bring this back once we figure out what we/users need to do to make this work with cross-origin requests
             // 'x-mastra-client-type': 'js',
           },
+          signal: this.options.abortSignal,
           body: options.body instanceof FormData ? options.body : options.body ? JSON.stringify(options.body) : void 0
         });
         if (!response.ok) {
@@ -376,12 +392,19 @@ var Agent = class extends BaseResource {
       clientTools: processClientTools(params.clientTools)
     };
     const { runId, resourceId, threadId, runtimeContext } = processedParams;
-    const response = await this.request(`/api/agents/${this.agentId}/generate`, {
-      method: "POST",
-      body: processedParams
-    });
+    const response = await this.request(
+      `/api/agents/${this.agentId}/generate`,
+      {
+        method: "POST",
+        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(
@@ -432,7 +455,7 @@ var Agent = class extends BaseResource {
       return Math.max(max, toolInvocation.step ?? 0);
     }, 0) ?? 0) : 0;
     const message = replaceLastMessage ? structuredClone(lastMessage) : {
-      id: crypto.randomUUID(),
+      id: uuid.v4(),
       createdAt: getCurrentDate(),
       role: "assistant",
       content: "",
@@ -477,7 +500,7 @@ var Agent = class extends BaseResource {
         // 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: crypto.randomUUID()
+        revisionId: uuid.v4()
       };
       update({
         message: copiedMessage,
@@ -732,7 +755,12 @@ var Agent = class extends BaseResource {
       this.processChatResponse({
         stream: streamForProcessing,
         update: ({ message }) => {
-          messages.push(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") {
@@ -792,10 +820,12 @@ var Agent = class extends BaseResource {
                 this.processStreamResponse(
                   {
                     ...processedParams,
-                    messages: [...messageArray, ...messages, lastMessage]
+                    messages: [...messageArray, ...messages.filter((m) => m.id !== lastMessage.id), lastMessage]
                   },
                   writable
-                );
+                ).catch((error) => {
+                  console.error("Error processing stream response:", error);
+                });
               }
             }
           } else {
@@ -805,6 +835,8 @@ var Agent = class extends BaseResource {
           }
         },
         lastMessage: void 0
+      }).catch((error) => {
+        console.error("Error processing stream response:", error);
       });
     } catch (error) {
       console.error("Error processing stream response:", error);
@@ -953,6 +985,36 @@ var MemoryThread = class extends BaseResource {
     });
     return this.request(`/api/memory/threads/${this.threadId}/messages?${query.toString()}`);
   }
+  /**
+   * Retrieves paginated messages associated with the thread with advanced filtering and selection options
+   * @param params - Pagination parameters including selectBy criteria, page, perPage, date ranges, and message inclusion options
+   * @returns Promise containing paginated thread messages with pagination metadata (total, page, perPage, hasMore)
+   */
+  getMessagesPaginated({
+    selectBy,
+    ...rest
+  }) {
+    const query = new URLSearchParams({
+      ...rest,
+      ...selectBy ? { selectBy: JSON.stringify(selectBy) } : {}
+    });
+    return this.request(`/api/memory/threads/${this.threadId}/messages/paginated?${query.toString()}`);
+  }
+  /**
+   * Deletes one or more messages from the thread
+   * @param messageIds - Can be a single message ID (string), array of message IDs,
+   *                     message object with id property, or array of message objects
+   * @returns Promise containing deletion result
+   */
+  deleteMessages(messageIds) {
+    const query = new URLSearchParams({
+      agentId: this.agentId
+    });
+    return this.request(`/api/memory/messages/delete?${query.toString()}`, {
+      method: "POST",
+      body: { messageIds }
+    });
+  }
 };
 
 // src/resources/vector.ts
@@ -1308,10 +1370,10 @@ var Workflow = class extends BaseResource {
     if (params?.toDate) {
       searchParams.set("toDate", params.toDate.toISOString());
     }
-    if (params?.limit) {
+    if (params?.limit !== null && params?.limit !== void 0 && !isNaN(Number(params?.limit))) {
       searchParams.set("limit", String(params.limit));
     }
-    if (params?.offset) {
+    if (params?.offset !== null && params?.offset !== void 0 && !isNaN(Number(params?.offset))) {
       searchParams.set("offset", String(params.offset));
     }
     if (params?.resourceId) {
@@ -1349,6 +1411,17 @@ var Workflow = class extends BaseResource {
       method: "POST"
     });
   }
+  /**
+   * Sends an event to a specific workflow run by its ID
+   * @param params - Object containing the runId, event and data
+   * @returns Promise containing a success message
+   */
+  sendRunEvent(params) {
+    return this.request(`/api/workflows/${this.workflowId}/runs/${params.runId}/send-event`, {
+      method: "POST",
+      body: { event: params.event, data: params.data }
+    });
+  }
   /**
    * Creates a new workflow run
    * @param params - Optional object containing the optional runId
@@ -1363,6 +1436,14 @@ var Workflow = class extends BaseResource {
       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 a workflow run synchronously without waiting for the workflow to complete
    * @param params - Object containing the runId, inputData and runtimeContext
@@ -1438,6 +1519,7 @@ var Workflow = class extends BaseResource {
     if (!response.body) {
       throw new Error("Response body is null");
     }
+    let failedChunk = void 0;
     const transformStream = new TransformStream({
       start() {
       },
@@ -1447,10 +1529,13 @@ var Workflow = class extends BaseResource {
           const chunks = decoded.split(RECORD_SEPARATOR2);
           for (const chunk2 of chunks) {
             if (chunk2) {
+              const newChunk = failedChunk ? failedChunk + chunk2 : chunk2;
               try {
-                const parsedChunk = JSON.parse(chunk2);
+                const parsedChunk = JSON.parse(newChunk);
                 controller.enqueue(parsedChunk);
-              } catch {
+                failedChunk = void 0;
+              } catch (error) {
+                failedChunk = newChunk;
               }
             }
           }
@@ -1632,6 +1717,69 @@ var MCPTool = class extends BaseResource {
   }
 };
 
+// src/resources/network-memory-thread.ts
+var NetworkMemoryThread = class extends BaseResource {
+  constructor(options, threadId, networkId) {
+    super(options);
+    this.threadId = threadId;
+    this.networkId = networkId;
+  }
+  /**
+   * Retrieves the memory thread details
+   * @returns Promise containing thread details including title and metadata
+   */
+  get() {
+    return this.request(`/api/memory/network/threads/${this.threadId}?networkId=${this.networkId}`);
+  }
+  /**
+   * Updates the memory thread properties
+   * @param params - Update parameters including title and metadata
+   * @returns Promise containing updated thread details
+   */
+  update(params) {
+    return this.request(`/api/memory/network/threads/${this.threadId}?networkId=${this.networkId}`, {
+      method: "PATCH",
+      body: params
+    });
+  }
+  /**
+   * Deletes the memory thread
+   * @returns Promise containing deletion result
+   */
+  delete() {
+    return this.request(`/api/memory/network/threads/${this.threadId}?networkId=${this.networkId}`, {
+      method: "DELETE"
+    });
+  }
+  /**
+   * Retrieves messages associated with the thread
+   * @param params - Optional parameters including limit for number of messages to retrieve
+   * @returns Promise containing thread messages and UI messages
+   */
+  getMessages(params) {
+    const query = new URLSearchParams({
+      networkId: this.networkId,
+      ...params?.limit ? { limit: params.limit.toString() } : {}
+    });
+    return this.request(`/api/memory/network/threads/${this.threadId}/messages?${query.toString()}`);
+  }
+  /**
+   * Deletes one or more messages from the thread
+   * @param messageIds - Can be a single message ID (string), array of message IDs,
+   *                     message object with id property, or array of message objects
+   * @returns Promise containing deletion result
+   */
+  deleteMessages(messageIds) {
+    const query = new URLSearchParams({
+      networkId: this.networkId
+    });
+    return this.request(`/api/memory/network/messages/delete?${query.toString()}`, {
+      method: "POST",
+      body: { messageIds }
+    });
+  }
+};
+
 // src/resources/vNextNetwork.ts
 var RECORD_SEPARATOR3 = "";
 var VNextNetwork = class extends BaseResource {
@@ -1654,7 +1802,10 @@ var VNextNetwork = class extends BaseResource {
   generate(params) {
     return this.request(`/api/networks/v-next/${this.networkId}/generate`, {
       method: "POST",
-      body: params
+      body: {
+        ...params,
+        runtimeContext: parseClientRuntimeContext(params.runtimeContext)
+      }
     });
   }
   /**
@@ -1665,7 +1816,10 @@ var VNextNetwork = class extends BaseResource {
   loop(params) {
     return this.request(`/api/networks/v-next/${this.networkId}/loop`, {
       method: "POST",
-      body: params
+      body: {
+        ...params,
+        runtimeContext: parseClientRuntimeContext(params.runtimeContext)
+      }
     });
   }
   async *streamProcessor(stream) {
@@ -1714,7 +1868,10 @@ var VNextNetwork = class extends BaseResource {
   async stream(params, onRecord) {
     const response = await this.request(`/api/networks/v-next/${this.networkId}/stream`, {
       method: "POST",
-      body: params,
+      body: {
+        ...params,
+        runtimeContext: parseClientRuntimeContext(params.runtimeContext)
+      },
       stream: true
     });
     if (!response.ok) {
@@ -1739,7 +1896,10 @@ var VNextNetwork = class extends BaseResource {
   async loopStream(params, onRecord) {
     const response = await this.request(`/api/networks/v-next/${this.networkId}/loop-stream`, {
       method: "POST",
-      body: params,
+      body: {
+        ...params,
+        runtimeContext: parseClientRuntimeContext(params.runtimeContext)
+      },
       stream: true
     });
     if (!response.ok) {
@@ -1758,54 +1918,6 @@ var VNextNetwork = class extends BaseResource {
   }
 };
 
-// src/resources/network-memory-thread.ts
-var NetworkMemoryThread = class extends BaseResource {
-  constructor(options, threadId, networkId) {
-    super(options);
-    this.threadId = threadId;
-    this.networkId = networkId;
-  }
-  /**
-   * Retrieves the memory thread details
-   * @returns Promise containing thread details including title and metadata
-   */
-  get() {
-    return this.request(`/api/memory/network/threads/${this.threadId}?networkId=${this.networkId}`);
-  }
-  /**
-   * Updates the memory thread properties
-   * @param params - Update parameters including title and metadata
-   * @returns Promise containing updated thread details
-   */
-  update(params) {
-    return this.request(`/api/memory/network/threads/${this.threadId}?networkId=${this.networkId}`, {
-      method: "PATCH",
-      body: params
-    });
-  }
-  /**
-   * Deletes the memory thread
-   * @returns Promise containing deletion result
-   */
-  delete() {
-    return this.request(`/api/memory/network/threads/${this.threadId}?networkId=${this.networkId}`, {
-      method: "DELETE"
-    });
-  }
-  /**
-   * Retrieves messages associated with the thread
-   * @param params - Optional parameters including limit for number of messages to retrieve
-   * @returns Promise containing thread messages and UI messages
-   */
-  getMessages(params) {
-    const query = new URLSearchParams({
-      networkId: this.networkId,
-      ...params?.limit ? { limit: params.limit.toString() } : {}
-    });
-    return this.request(`/api/memory/network/threads/${this.threadId}/messages?${query.toString()}`);
-  }
-};
-
 // src/client.ts
 var MastraClient = class extends BaseResource {
   constructor(options) {
@@ -2200,6 +2312,121 @@ var MastraClient = class extends BaseResource {
   getA2A(agentId) {
     return new A2A(this.options, agentId);
   }
+  /**
+   * Retrieves the working memory for a specific thread (optionally resource-scoped).
+   * @param agentId - ID of the agent.
+   * @param threadId - ID of the thread.
+   * @param resourceId - Optional ID of the resource.
+   * @returns Working memory for the specified thread or resource.
+   */
+  getWorkingMemory({
+    agentId,
+    threadId,
+    resourceId
+  }) {
+    return this.request(`/api/memory/threads/${threadId}/working-memory?agentId=${agentId}&resourceId=${resourceId}`);
+  }
+  /**
+   * Updates the working memory for a specific thread (optionally resource-scoped).
+   * @param agentId - ID of the agent.
+   * @param threadId - ID of the thread.
+   * @param workingMemory - The new working memory content.
+   * @param resourceId - Optional ID of the resource.
+   */
+  updateWorkingMemory({
+    agentId,
+    threadId,
+    workingMemory,
+    resourceId
+  }) {
+    return this.request(`/api/memory/threads/${threadId}/working-memory?agentId=${agentId}`, {
+      method: "POST",
+      body: {
+        workingMemory,
+        resourceId
+      }
+    });
+  }
+  /**
+   * Retrieves all available scorers
+   * @returns Promise containing list of available scorers
+   */
+  getScorers() {
+    return this.request("/api/scores/scorers");
+  }
+  /**
+   * Retrieves a scorer by ID
+   * @param scorerId - ID of the scorer to retrieve
+   * @returns Promise containing the scorer
+   */
+  getScorer(scorerId) {
+    return this.request(`/api/scores/scorers/${scorerId}`);
+  }
+  getScoresByScorerId(params) {
+    const { page, perPage, scorerId, entityId, entityType } = params;
+    const searchParams = new URLSearchParams();
+    if (entityId) {
+      searchParams.set("entityId", entityId);
+    }
+    if (entityType) {
+      searchParams.set("entityType", entityType);
+    }
+    if (page !== void 0) {
+      searchParams.set("page", String(page));
+    }
+    if (perPage !== void 0) {
+      searchParams.set("perPage", String(perPage));
+    }
+    const queryString = searchParams.toString();
+    return this.request(`/api/scores/scorer/${scorerId}${queryString ? `?${queryString}` : ""}`);
+  }
+  /**
+   * Retrieves scores by run ID
+   * @param params - Parameters containing run ID and pagination options
+   * @returns Promise containing scores and pagination info
+   */
+  getScoresByRunId(params) {
+    const { runId, page, perPage } = params;
+    const searchParams = new URLSearchParams();
+    if (page !== void 0) {
+      searchParams.set("page", String(page));
+    }
+    if (perPage !== void 0) {
+      searchParams.set("perPage", String(perPage));
+    }
+    const queryString = searchParams.toString();
+    return this.request(`/api/scores/run/${runId}${queryString ? `?${queryString}` : ""}`);
+  }
+  /**
+   * Retrieves scores by entity ID and type
+   * @param params - Parameters containing entity ID, type, and pagination options
+   * @returns Promise containing scores and pagination info
+   */
+  getScoresByEntityId(params) {
+    const { entityId, entityType, page, perPage } = params;
+    const searchParams = new URLSearchParams();
+    if (page !== void 0) {
+      searchParams.set("page", String(page));
+    }
+    if (perPage !== void 0) {
+      searchParams.set("perPage", String(perPage));
+    }
+    const queryString = searchParams.toString();
+    return this.request(`/api/scores/entity/${entityType}/${entityId}${queryString ? `?${queryString}` : ""}`);
+  }
+  /**
+   * Saves a score
+   * @param params - Parameters containing the score data to save
+   * @returns Promise containing the saved score
+   */
+  saveScore(params) {
+    return this.request("/api/scores", {
+      method: "POST",
+      body: params
+    });
+  }
 };
 
 exports.MastraClient = MastraClient;
+//# sourceMappingURL=index.cjs.map
+//# sourceMappingURL=index.cjs.map