@mastra/client-js 0.1.22-alpha.1 → 0.1.22-alpha.2

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @mastra/client-js@0.1.22-alpha.1 build /home/runner/work/mastra/mastra/client-sdks/client-js
+> @mastra/client-js@0.1.22-alpha.2 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
-DTS Build start
-CJS dist/index.cjs 38.24 KB
-CJS ⚡️ Build success in 1623ms
+CJS dist/index.cjs 38.29 KB
+CJS ⚡️ Build success in 1652ms
 ESM dist/index.js 38.02 KB
-ESM ⚡️ Build success in 1628ms
-DTS ⚡️ Build success in 14543ms
+ESM ⚡️ Build success in 1653ms
+DTS Build start
+DTS ⚡️ Build success in 14977ms
 DTS dist/index.d.ts  27.18 KB
 DTS dist/index.d.cts 27.18 KB

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @mastra/client-js
 
+## 0.1.22-alpha.2
+
+### Patch Changes
+
+- b4c6c87: fix: Specify $refStrategy: 'none' when calling zodToJsonSchema.
+- c2b980b: Fix multiple too-calls in AGUI
+- Updated dependencies [3171b5b]
+- Updated dependencies [973e5ac]
+- Updated dependencies [9e1eff5]
+  - @mastra/core@0.9.4-alpha.2
+
 ## 0.1.22-alpha.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -4,7 +4,11 @@ var client = require('@ag-ui/client');
 var rxjs = require('rxjs');
 var uiUtils = require('@ai-sdk/ui-utils');
 var zod = require('zod');
-var zodToJsonSchema = require('zod-to-json-schema');
+var originalZodToJsonSchema = require('zod-to-json-schema');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var originalZodToJsonSchema__default = /*#__PURE__*/_interopDefault(originalZodToJsonSchema);
 
 // src/adapters/agui.ts
 var AGUIAdapter = class extends client.AbstractAgent {
@@ -159,6 +163,17 @@ function convertMessagesToMastraMessages(messages) {
         role: "assistant",
         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)
+          }))
+        });
+      }
     } else if (message.role === "user") {
       result.push({
         role: "user",
@@ -180,6 +195,12 @@ function convertMessagesToMastraMessages(messages) {
   }
   return result;
 }
+function zodToJsonSchema(zodSchema) {
+  if (!(zodSchema instanceof zod.ZodSchema)) {
+    return zodSchema;
+  }
+  return originalZodToJsonSchema__default.default(zodSchema, { $refStrategy: "none" });
+}
 
 // src/resources/base.ts
 var BaseResource = class {
@@ -310,8 +331,8 @@ var Agent = class extends BaseResource {
   generate(params) {
     const processedParams = {
       ...params,
-      output: params.output instanceof zod.ZodSchema ? zodToJsonSchema.zodToJsonSchema(params.output) : params.output,
-      experimental_output: params.experimental_output instanceof zod.ZodSchema ? zodToJsonSchema.zodToJsonSchema(params.experimental_output) : params.experimental_output,
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output),
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0
     };
     return this.request(`/api/agents/${this.agentId}/generate`, {
@@ -327,8 +348,8 @@ var Agent = class extends BaseResource {
   async stream(params) {
     const processedParams = {
       ...params,
-      output: params.output instanceof zod.ZodSchema ? zodToJsonSchema.zodToJsonSchema(params.output) : params.output,
-      experimental_output: params.experimental_output instanceof zod.ZodSchema ? zodToJsonSchema.zodToJsonSchema(params.experimental_output) : params.experimental_output,
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output),
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0
     };
     const response = await this.request(`/api/agents/${this.agentId}/stream`, {
@@ -406,8 +427,8 @@ var Network = class extends BaseResource {
   generate(params) {
     const processedParams = {
       ...params,
-      output: params.output instanceof zod.ZodSchema ? zodToJsonSchema.zodToJsonSchema(params.output) : params.output,
-      experimental_output: params.experimental_output instanceof zod.ZodSchema ? zodToJsonSchema.zodToJsonSchema(params.experimental_output) : params.experimental_output
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output)
     };
     return this.request(`/api/networks/${this.networkId}/generate`, {
       method: "POST",
@@ -422,8 +443,8 @@ var Network = class extends BaseResource {
   async stream(params) {
     const processedParams = {
       ...params,
-      output: params.output instanceof zod.ZodSchema ? zodToJsonSchema.zodToJsonSchema(params.output) : params.output,
-      experimental_output: params.experimental_output instanceof zod.ZodSchema ? zodToJsonSchema.zodToJsonSchema(params.experimental_output) : params.experimental_output
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output)
     };
     const response = await this.request(`/api/networks/${this.networkId}/stream`, {
       method: "POST",

package/dist/index.js

@@ -2,7 +2,7 @@ import { AbstractAgent, EventType } from '@ag-ui/client';
 import { Observable } from 'rxjs';
 import { processDataStream } from '@ai-sdk/ui-utils';
 import { ZodSchema } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
+import originalZodToJsonSchema from 'zod-to-json-schema';
 
 // src/adapters/agui.ts
 var AGUIAdapter = class extends AbstractAgent {
@@ -157,6 +157,17 @@ function convertMessagesToMastraMessages(messages) {
         role: "assistant",
         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)
+          }))
+        });
+      }
     } else if (message.role === "user") {
       result.push({
         role: "user",
@@ -178,6 +189,12 @@ function convertMessagesToMastraMessages(messages) {
   }
   return result;
 }
+function zodToJsonSchema(zodSchema) {
+  if (!(zodSchema instanceof ZodSchema)) {
+    return zodSchema;
+  }
+  return originalZodToJsonSchema(zodSchema, { $refStrategy: "none" });
+}
 
 // src/resources/base.ts
 var BaseResource = class {
@@ -308,8 +325,8 @@ var Agent = class extends BaseResource {
   generate(params) {
     const processedParams = {
       ...params,
-      output: params.output instanceof ZodSchema ? zodToJsonSchema(params.output) : params.output,
-      experimental_output: params.experimental_output instanceof ZodSchema ? zodToJsonSchema(params.experimental_output) : params.experimental_output,
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output),
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0
     };
     return this.request(`/api/agents/${this.agentId}/generate`, {
@@ -325,8 +342,8 @@ var Agent = class extends BaseResource {
   async stream(params) {
     const processedParams = {
       ...params,
-      output: params.output instanceof ZodSchema ? zodToJsonSchema(params.output) : params.output,
-      experimental_output: params.experimental_output instanceof ZodSchema ? zodToJsonSchema(params.experimental_output) : params.experimental_output,
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output),
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : void 0
     };
     const response = await this.request(`/api/agents/${this.agentId}/stream`, {
@@ -404,8 +421,8 @@ var Network = class extends BaseResource {
   generate(params) {
     const processedParams = {
       ...params,
-      output: params.output instanceof ZodSchema ? zodToJsonSchema(params.output) : params.output,
-      experimental_output: params.experimental_output instanceof ZodSchema ? zodToJsonSchema(params.experimental_output) : params.experimental_output
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output)
     };
     return this.request(`/api/networks/${this.networkId}/generate`, {
       method: "POST",
@@ -420,8 +437,8 @@ var Network = class extends BaseResource {
   async stream(params) {
     const processedParams = {
       ...params,
-      output: params.output instanceof ZodSchema ? zodToJsonSchema(params.output) : params.output,
-      experimental_output: params.experimental_output instanceof ZodSchema ? zodToJsonSchema(params.experimental_output) : params.experimental_output
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output)
     };
     const response = await this.request(`/api/networks/${this.networkId}/stream`, {
       method: "POST",

package/package.json

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

package/src/adapters/agui.test.ts

@@ -91,6 +91,17 @@ describe('convertMessagesToMastraMessages', () => {
           },
         ],
       },
+      {
+        role: 'tool',
+        content: [
+          {
+            type: 'tool-result',
+            toolCallId: 'tool-call-1',
+            toolName: 'getWeather',
+            result: { location: 'San Francisco' },
+          },
+        ],
+      },
     ]);
   });
 
@@ -143,12 +154,6 @@ describe('convertMessagesToMastraMessages', () => {
           },
         ],
       },
-      {
-        id: '3',
-        role: 'tool',
-        toolCallId: 'tool-call-1',
-        content: '{"temperature":72,"unit":"F"}',
-      },
       {
         id: '4',
         role: 'assistant',
@@ -162,6 +167,14 @@ describe('convertMessagesToMastraMessages', () => {
     expect(result[0].role).toBe('user');
     expect(result[1].role).toBe('assistant');
     expect(result[2].role).toBe('tool');
+    expect(result[2].content).toEqual([
+      {
+        type: 'tool-result',
+        toolCallId: 'tool-call-1',
+        toolName: 'getWeather',
+        result: { location: 'San Francisco' },
+      },
+    ]);
     expect(result[3].role).toBe('assistant');
   });
 });

package/src/adapters/agui.ts

@@ -1,19 +1,19 @@
 // Cross-platform UUID generation function
-import { AbstractAgent, EventType } from '@ag-ui/client';
 import type {
+  AgentConfig,
   BaseEvent,
+  Message,
   RunAgentInput,
-  AgentConfig,
-  RunStartedEvent,
   RunFinishedEvent,
-  TextMessageStartEvent,
+  RunStartedEvent,
   TextMessageContentEvent,
   TextMessageEndEvent,
-  Message,
-  ToolCallStartEvent,
+  TextMessageStartEvent,
   ToolCallArgsEvent,
   ToolCallEndEvent,
+  ToolCallStartEvent,
 } from '@ag-ui/client';
+import { AbstractAgent, EventType } from '@ag-ui/client';
 import type { CoreMessage } from '@mastra/core';
 import { Observable } from 'rxjs';
 import type { Agent } from '../resources/agent';
@@ -39,7 +39,6 @@ export class AGUIAdapter extends AbstractAgent {
   protected run(input: RunAgentInput): Observable<BaseEvent> {
     return new Observable<BaseEvent>(subscriber => {
       const convertedMessages = convertMessagesToMastraMessages(input.messages);
-
       subscriber.next({
         type: EventType.RUN_STARTED,
         threadId: input.threadId,
@@ -205,6 +204,17 @@ export function convertMessagesToMastraMessages(messages: Message[]): CoreMessag
         role: 'assistant',
         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),
+          })),
+        });
+      }
     } else if (message.role === 'user') {
       result.push({
         role: 'user',

package/src/resources/agent.ts

@@ -2,7 +2,7 @@ import { processDataStream } from '@ai-sdk/ui-utils';
 import type { GenerateReturn } from '@mastra/core';
 import type { JSONSchema7 } from 'json-schema';
 import { ZodSchema } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
+import { zodToJsonSchema } from '../utils/zod-to-json-schema';
 
 import type {
   GenerateParams,
@@ -100,11 +100,8 @@ export class Agent extends BaseResource {
   ): Promise<GenerateReturn<T>> {
     const processedParams = {
       ...params,
-      output: params.output instanceof ZodSchema ? zodToJsonSchema(params.output) : params.output,
-      experimental_output:
-        params.experimental_output instanceof ZodSchema
-          ? zodToJsonSchema(params.experimental_output)
-          : params.experimental_output,
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output),
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : undefined,
     };
 
@@ -128,11 +125,8 @@ export class Agent extends BaseResource {
   > {
     const processedParams = {
       ...params,
-      output: params.output instanceof ZodSchema ? zodToJsonSchema(params.output) : params.output,
-      experimental_output:
-        params.experimental_output instanceof ZodSchema
-          ? zodToJsonSchema(params.experimental_output)
-          : params.experimental_output,
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output),
       runtimeContext: params.runtimeContext ? Object.fromEntries(params.runtimeContext.entries()) : undefined,
     };
 

package/src/resources/network.ts

@@ -2,7 +2,7 @@ import { processDataStream } from '@ai-sdk/ui-utils';
 import type { GenerateReturn } from '@mastra/core';
 import type { JSONSchema7 } from 'json-schema';
 import { ZodSchema } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
+import { zodToJsonSchema } from '../utils/zod-to-json-schema';
 
 import type { GenerateParams, ClientOptions, StreamParams, GetNetworkResponse } from '../types';
 
@@ -34,11 +34,8 @@ export class Network extends BaseResource {
   ): Promise<GenerateReturn<T>> {
     const processedParams = {
       ...params,
-      output: params.output instanceof ZodSchema ? zodToJsonSchema(params.output) : params.output,
-      experimental_output:
-        params.experimental_output instanceof ZodSchema
-          ? zodToJsonSchema(params.experimental_output)
-          : params.experimental_output,
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output),
     };
 
     return this.request(`/api/networks/${this.networkId}/generate`, {
@@ -61,11 +58,8 @@ export class Network extends BaseResource {
   > {
     const processedParams = {
       ...params,
-      output: params.output instanceof ZodSchema ? zodToJsonSchema(params.output) : params.output,
-      experimental_output:
-        params.experimental_output instanceof ZodSchema
-          ? zodToJsonSchema(params.experimental_output)
-          : params.experimental_output,
+      output: zodToJsonSchema(params.output),
+      experimental_output: zodToJsonSchema(params.experimental_output),
     };
 
     const response: Response & {

package/src/utils/zod-to-json-schema.ts

@@ -0,0 +1,10 @@
+import { ZodSchema } from 'zod';
+import originalZodToJsonSchema from 'zod-to-json-schema';
+
+export function zodToJsonSchema<T extends ZodSchema | any>(zodSchema: T) {
+  if (!(zodSchema instanceof ZodSchema)) {
+    return zodSchema;
+  }
+
+  return originalZodToJsonSchema(zodSchema, { $refStrategy: 'none' });
+}