@mastra/client-js 0.10.17-alpha.2 → 0.10.17-alpha.4

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @mastra/client-js@0.10.17-alpha.2 build /home/runner/work/mastra/mastra/client-sdks/client-js
+> @mastra/client-js@0.10.17-alpha.4 build /home/runner/work/mastra/mastra/client-sdks/client-js
 > tsup src/index.ts --format esm,cjs --dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
@@ -9,11 +9,11 @@
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 74.97 KB
-ESM ⚡️ Build success in 1712ms
-CJS dist/index.cjs 75.29 KB
-CJS ⚡️ Build success in 1713ms
+CJS dist/index.cjs 75.52 KB
+CJS ⚡️ Build success in 2034ms
+ESM dist/index.js 75.21 KB
+ESM ⚡️ Build success in 2036ms
 DTS Build start
-DTS ⚡️ Build success in 16680ms
-DTS dist/index.d.ts  47.13 KB
-DTS dist/index.d.cts 47.13 KB
+DTS ⚡️ Build success in 18390ms
+DTS dist/index.d.ts  47.19 KB
+DTS dist/index.d.cts 47.19 KB

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @mastra/client-js
 
+## 0.10.17-alpha.4
+
+### Patch Changes
+
+- Updated dependencies [ad0a58b]
+  - @mastra/core@0.12.0-alpha.4
+
+## 0.10.17-alpha.3
+
+### Patch Changes
+
+- 9802f42: Added types and tests to ensure client-js and hono endpoints can save memory messages where the input is either a v1 or v2 mastra message
+- 1ac8f6b: deduplicate message
+  - @mastra/core@0.12.0-alpha.3
+
 ## 0.10.17-alpha.2
 
 ### Patch Changes

package/dist/index.cjs

@@ -741,7 +741,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") {
@@ -801,7 +806,7 @@ 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) => {

package/dist/index.d.cts

@@ -164,14 +164,14 @@ interface GetVectorIndexResponse {
     count: number;
 }
 interface SaveMessageToMemoryParams {
-    messages: MastraMessageV1[];
+    messages: (MastraMessageV1 | MastraMessageV2)[];
     agentId: string;
 }
 interface SaveNetworkMessageToMemoryParams {
-    messages: MastraMessageV1[];
+    messages: (MastraMessageV1 | MastraMessageV2)[];
     networkId: string;
 }
-type SaveMessageToMemoryResponse = MastraMessageV1[];
+type SaveMessageToMemoryResponse = (MastraMessageV1 | MastraMessageV2)[];
 interface CreateMemoryThreadParams {
     title?: string;
     metadata?: Record<string, any>;

package/dist/index.d.ts

@@ -164,14 +164,14 @@ interface GetVectorIndexResponse {
     count: number;
 }
 interface SaveMessageToMemoryParams {
-    messages: MastraMessageV1[];
+    messages: (MastraMessageV1 | MastraMessageV2)[];
     agentId: string;
 }
 interface SaveNetworkMessageToMemoryParams {
-    messages: MastraMessageV1[];
+    messages: (MastraMessageV1 | MastraMessageV2)[];
     networkId: string;
 }
-type SaveMessageToMemoryResponse = MastraMessageV1[];
+type SaveMessageToMemoryResponse = (MastraMessageV1 | MastraMessageV2)[];
 interface CreateMemoryThreadParams {
     title?: string;
     metadata?: Record<string, any>;

package/dist/index.js

@@ -735,7 +735,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") {
@@ -795,7 +800,7 @@ 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) => {

package/package.json

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

package/src/index.test.ts

@@ -310,6 +310,114 @@ describe('MastraClient Resources', () => {
       }
     });
 
+    it('should stream responses with tool calls', async () => {
+      const firstMockChunk = `0:"test "
+0:"response"
+9:{"toolCallId":"tool1","toolName":"testTool","args":{"arg1":"value1"}}
+e:{"finishReason":"tool-calls","usage":{"promptTokens":1,"completionTokens":1},"isContinued":false}
+d:{"finishReason":"tool-calls","usage":{"promptTokens":2,"completionTokens":2}}
+`;
+
+      const secondMockChunk = `0:"final response"
+e:{"finishReason":"stop","usage":{"promptTokens":2,"completionTokens":2},"isContinued":false}
+d:{"finishReason":"stop","usage":{"promptTokens":2,"completionTokens":2}}
+`;
+
+      const firstResponseBody = new ReadableStream({
+        start(controller) {
+          controller.enqueue(new TextEncoder().encode(firstMockChunk));
+          controller.close();
+        },
+      });
+
+      const secondResponseBody = new ReadableStream({
+        start(controller) {
+          controller.enqueue(new TextEncoder().encode(secondMockChunk));
+          controller.close();
+        },
+      });
+
+      (global.fetch as any)
+        .mockResolvedValueOnce(
+          new Response(firstResponseBody, {
+            status: 200,
+            headers: new Headers({ 'Content-Type': 'text/event-stream' }),
+          }),
+        )
+        .mockResolvedValueOnce(
+          new Response(secondResponseBody, {
+            status: 200,
+            headers: new Headers({ 'Content-Type': 'text/event-stream' }),
+          }),
+        );
+
+      const response = await agent.stream({
+        messages: [
+          {
+            role: 'user',
+            content: 'test',
+          },
+        ],
+        clientTools: {
+          testTool: {
+            id: 'testTool',
+            description: 'Test Tool',
+            inputSchema: {
+              type: 'object',
+              properties: {
+                arg1: { type: 'string' },
+              },
+            },
+            execute: async () => {
+              return 'test result';
+            },
+          },
+        },
+      });
+
+      expect(response.body).toBeInstanceOf(ReadableStream);
+      const reader = response?.body?.getReader();
+      expect(reader).toBeDefined();
+
+      let output = '';
+      if (reader) {
+        while (true) {
+          const { value, done } = await reader.read();
+          if (done) break;
+          output += new TextDecoder().decode(value);
+        }
+      }
+
+      expect(global.fetch).toHaveBeenCalledTimes(2);
+
+      const [secondUrl, secondConfig] = (global.fetch as any).mock.calls[1];
+      expect(secondUrl).toBe(`${clientOptions.baseUrl}/api/agents/test-agent/stream`);
+
+      const secondRequestBody = JSON.parse(secondConfig.body);
+      expect(secondRequestBody.messages).toHaveLength(2);
+      expect(secondRequestBody.messages[0].content).toBe('test');
+      expect(secondRequestBody.messages[1].content).toBe('test response');
+      expect(secondRequestBody.messages[1].parts).toEqual([
+        {
+          type: 'text',
+          text: 'test response',
+        },
+        {
+          type: 'tool-invocation',
+          toolInvocation: {
+            state: 'result',
+            step: 0,
+            toolCallId: 'tool1',
+            toolName: 'testTool',
+            args: {
+              arg1: 'value1',
+            },
+            result: 'test result',
+          },
+        },
+      ]);
+    });
+
     it('should get agent tool', async () => {
       const mockResponse = {
         id: 'tool1',

package/src/resources/agent.ts

@@ -632,7 +632,13 @@ export class Agent 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') {
@@ -711,7 +717,7 @@ export class Agent extends BaseResource {
                 this.processStreamResponse(
                   {
                     ...processedParams,
-                    messages: [...messageArray, ...messages, lastMessage],
+                    messages: [...messageArray, ...messages.filter(m => m.id !== lastMessage.id), lastMessage],
                   },
                   writable,
                 ).catch(error => {

package/src/types.ts

@@ -198,16 +198,16 @@ export interface GetVectorIndexResponse {
 }
 
 export interface SaveMessageToMemoryParams {
-  messages: MastraMessageV1[];
+  messages: (MastraMessageV1 | MastraMessageV2)[];
   agentId: string;
 }
 
 export interface SaveNetworkMessageToMemoryParams {
-  messages: MastraMessageV1[];
+  messages: (MastraMessageV1 | MastraMessageV2)[];
   networkId: string;
 }
 
-export type SaveMessageToMemoryResponse = MastraMessageV1[];
+export type SaveMessageToMemoryResponse = (MastraMessageV1 | MastraMessageV2)[];
 
 export interface CreateMemoryThreadParams {
   title?: string;

package/src/v2-messages.test.ts

@@ -0,0 +1,180 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import type { MastraMessageV1, MastraMessageV2 } from '@mastra/core';
+import { MastraClient } from './client';
+
+describe('V2 Message Format Support', () => {
+  let client: MastraClient;
+  const agentId = 'test-agent';
+
+  beforeEach(() => {
+    global.fetch = vi.fn();
+    client = new MastraClient({
+      baseUrl: 'http://localhost:3000',
+    });
+  });
+
+  it('should send v1 messages successfully', async () => {
+    const v1Messages: MastraMessageV1[] = [
+      {
+        id: 'msg-v1-1',
+        role: 'user',
+        content: 'Hello from v1!',
+        type: 'text',
+        createdAt: new Date(),
+        threadId: 'thread-123',
+        resourceId: 'resource-123',
+      },
+    ];
+
+    (global.fetch as any).mockResolvedValueOnce({
+      ok: true,
+      json: async () => v1Messages,
+    });
+
+    const result = await client.saveMessageToMemory({
+      agentId,
+      messages: v1Messages,
+    });
+
+    expect(result).toEqual(v1Messages);
+    expect(global.fetch).toHaveBeenCalledWith(
+      expect.stringContaining('/api/memory/save-messages'),
+      expect.objectContaining({
+        method: 'POST',
+        body: JSON.stringify({ agentId, messages: v1Messages }),
+      }),
+    );
+  });
+
+  it('should send v2 messages successfully', async () => {
+    const v2Messages: MastraMessageV2[] = [
+      {
+        id: 'msg-v2-1',
+        role: 'assistant',
+        createdAt: new Date(),
+        threadId: 'thread-123',
+        resourceId: 'resource-123',
+        content: {
+          format: 2,
+          parts: [{ type: 'text', text: 'Hello from v2!' }],
+          content: 'Hello from v2!',
+        },
+      },
+    ];
+
+    (global.fetch as any).mockResolvedValueOnce({
+      ok: true,
+      json: async () => v2Messages,
+    });
+
+    const result = await client.saveMessageToMemory({
+      agentId,
+      messages: v2Messages,
+    });
+
+    expect(result).toEqual(v2Messages);
+    expect(global.fetch).toHaveBeenCalledWith(
+      expect.stringContaining('/api/memory/save-messages'),
+      expect.objectContaining({
+        method: 'POST',
+        body: JSON.stringify({ agentId, messages: v2Messages }),
+      }),
+    );
+  });
+
+  it('should send mixed v1 and v2 messages successfully', async () => {
+    const mixedMessages: (MastraMessageV1 | MastraMessageV2)[] = [
+      {
+        id: 'msg-v1-1',
+        role: 'user',
+        content: 'Question in v1 format',
+        type: 'text',
+        createdAt: new Date(),
+        threadId: 'thread-123',
+        resourceId: 'resource-123',
+      },
+      {
+        id: 'msg-v2-1',
+        role: 'assistant',
+        createdAt: new Date(),
+        threadId: 'thread-123',
+        resourceId: 'resource-123',
+        content: {
+          format: 2,
+          parts: [
+            { type: 'text', text: 'Answer in v2 format' },
+            {
+              type: 'tool-invocation',
+              toolInvocation: {
+                state: 'result' as const,
+                toolCallId: 'call-123',
+                toolName: 'calculator',
+                args: { a: 1, b: 2 },
+                result: '3',
+              },
+            },
+          ],
+          toolInvocations: [
+            {
+              state: 'result' as const,
+              toolCallId: 'call-123',
+              toolName: 'calculator',
+              args: { a: 1, b: 2 },
+              result: '3',
+            },
+          ],
+        },
+      },
+    ];
+
+    (global.fetch as any).mockResolvedValueOnce({
+      ok: true,
+      json: async () => mixedMessages,
+    });
+
+    const result = await client.saveMessageToMemory({
+      agentId,
+      messages: mixedMessages,
+    });
+
+    expect(result).toEqual(mixedMessages);
+    expect(global.fetch).toHaveBeenCalledWith(
+      expect.stringContaining('/api/memory/save-messages'),
+      expect.objectContaining({
+        method: 'POST',
+        body: JSON.stringify({ agentId, messages: mixedMessages }),
+      }),
+    );
+  });
+
+  it('should handle v2 messages with attachments', async () => {
+    const v2MessageWithAttachments: MastraMessageV2 = {
+      id: 'msg-v2-att',
+      role: 'user',
+      createdAt: new Date(),
+      threadId: 'thread-123',
+      resourceId: 'resource-123',
+      content: {
+        format: 2,
+        parts: [
+          { type: 'text', text: 'Check out this image:' },
+          { type: 'file', data: 'data:image/png;base64,iVBORw0...', mimeType: 'image/png' },
+        ],
+        experimental_attachments: [{ url: 'data:image/png;base64,iVBORw0...', contentType: 'image/png' }],
+      },
+    };
+
+    (global.fetch as any).mockResolvedValueOnce({
+      ok: true,
+      json: async () => [v2MessageWithAttachments],
+    });
+
+    const result = await client.saveMessageToMemory({
+      agentId,
+      messages: [v2MessageWithAttachments],
+    });
+
+    expect(result).toHaveLength(1);
+    expect(result[0]).toEqual(v2MessageWithAttachments);
+  });
+});