@mastra/client-js 0.10.24-alpha.0 → 0.11.0-alpha.2

package/src/index.test.ts

@@ -1,8 +1,8 @@
+import type { ServerDetailInfo } from '@mastra/core/mcp';
+import type { ScoringEntityType, ScoringSource } from '@mastra/core/scores';
 import { describe, expect, beforeEach, it, vi } from 'vitest';
 import { MastraClient } from './client';
 import type { McpServerListResponse } from './types';
-import type { ServerDetailInfo } from '@mastra/core/mcp';
-import { ScoringEntityType, ScoringSource } from '@mastra/core/scores';
 
 // Mock fetch globally
 global.fetch = vi.fn();
@@ -384,6 +384,7 @@ d:{"finishReason":"stop","usage":{"promptTokens":2,"completionTokens":2}}
         while (true) {
           const { value, done } = await reader.read();
           if (done) break;
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
           output += new TextDecoder().decode(value);
         }
       }
@@ -869,11 +870,19 @@ d:{"finishReason":"stop","usage":{"promptTokens":2,"completionTokens":2}}
         backoffMs: 100,
         maxBackoffMs: 1000,
         headers: { 'Custom-Header': 'value' },
+        credentials: 'same-origin',
       });
 
       (global.fetch as any)
         .mockRejectedValueOnce(new Error('Network error'))
         .mockRejectedValueOnce(new Error('Network error'))
+        .mockResolvedValueOnce({
+          ok: true,
+          headers: {
+            get: () => 'application/json',
+          },
+          json: async () => ({ success: true }),
+        })
         .mockResolvedValueOnce({
           ok: true,
           headers: {
@@ -891,6 +900,24 @@ d:{"finishReason":"stop","usage":{"promptTokens":2,"completionTokens":2}}
           headers: expect.objectContaining({
             'Custom-Header': 'value',
           }),
+          credentials: 'same-origin',
+        }),
+      );
+
+      // ensure custom headers and credentials are overridable per request
+      const result2 = await customClient.request('/test', {
+        headers: { 'Custom-Header': 'new-value' },
+        credentials: 'include',
+      });
+      expect(result2).toEqual({ success: true });
+      expect(global.fetch).toHaveBeenCalledTimes(4);
+      expect(global.fetch).toHaveBeenCalledWith(
+        'http://localhost:4111/test',
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            'Custom-Header': 'new-value',
+          }),
+          credentials: 'include',
         }),
       );
     });

package/src/resources/agent.ts

@@ -1,21 +1,21 @@
-import {
-  parsePartialJson,
-  processDataStream,
-  type JSONValue,
-  type ReasoningUIPart,
-  type TextUIPart,
-  type ToolInvocation,
-  type ToolInvocationUIPart,
-  type UIMessage,
-  type UseChatOptions,
+import { parsePartialJson, processDataStream } from '@ai-sdk/ui-utils';
+import type {
+  JSONValue,
+  ReasoningUIPart,
+  TextUIPart,
+  ToolInvocation,
+  ToolInvocationUIPart,
+  UIMessage,
+  UseChatOptions,
 } from '@ai-sdk/ui-utils';
-import { Tool, type CoreMessage, type OutputSchema } from '@mastra/core';
-import { type GenerateReturn } from '@mastra/core/llm';
-import type { JSONSchema7 } from 'json-schema';
-import { ZodSchema } from 'zod';
-import { zodToJsonSchema } from '../utils/zod-to-json-schema';
-import { processClientTools } from '../utils/process-client-tools';
 import { v4 as uuid } from '@lukeed/uuid';
+import type { MessageListInput } from '@mastra/core/agent/message-list';
+import type { GenerateReturn, CoreMessage } from '@mastra/core/llm';
+import type { RuntimeContext } from '@mastra/core/runtime-context';
+import type { OutputSchema, MastraModelOutput } from '@mastra/core/stream';
+import type { Tool } from '@mastra/core/tools';
+import type { JSONSchema7 } from 'json-schema';
+import type { ZodType } from 'zod';
 
 import type {
   GenerateParams,
@@ -28,12 +28,11 @@ import type {
   StreamVNextParams,
 } from '../types';
 
-import { BaseResource } from './base';
-import type { RuntimeContext } from '@mastra/core/runtime-context';
 import { parseClientRuntimeContext } from '../utils';
+import { processClientTools } from '../utils/process-client-tools';
 import { processMastraStream } from '../utils/process-mastra-stream';
-import type { MastraModelOutput } from '@mastra/core/stream';
-import type { MessageListInput } from '@mastra/core/agent/message-list';
+import { zodToJsonSchema } from '../utils/zod-to-json-schema';
+import { BaseResource } from './base';
 
 async function executeToolCallAndRespond({
   response,
@@ -195,15 +194,15 @@ export class Agent extends BaseResource {
   async generate(
     params: GenerateParams<undefined> & { output?: never; experimental_output?: never },
   ): Promise<GenerateReturn<any, undefined, undefined>>;
-  async generate<Output extends JSONSchema7 | ZodSchema>(
+  async generate<Output extends JSONSchema7 | ZodType>(
     params: GenerateParams<Output> & { output: Output; experimental_output?: never },
   ): Promise<GenerateReturn<any, Output, undefined>>;
-  async generate<StructuredOutput extends JSONSchema7 | ZodSchema>(
+  async generate<StructuredOutput extends JSONSchema7 | ZodType>(
     params: GenerateParams<StructuredOutput> & { output?: never; experimental_output: StructuredOutput },
   ): Promise<GenerateReturn<any, undefined, StructuredOutput>>;
   async generate<
-    Output extends JSONSchema7 | ZodSchema | undefined = undefined,
-    StructuredOutput extends JSONSchema7 | ZodSchema | undefined = undefined,
+    Output extends JSONSchema7 | ZodType | undefined = undefined,
+    StructuredOutput extends JSONSchema7 | ZodType | undefined = undefined,
   >(params: GenerateParams<Output>): Promise<GenerateReturn<any, Output, StructuredOutput>> {
     const processedParams = {
       ...params,
@@ -277,8 +276,8 @@ export class Agent extends BaseResource {
     return response;
   }
 
-  async generateVNext<OUTPUT extends OutputSchema | undefined = undefined>(
-    params: StreamVNextParams<OUTPUT>,
+  async generateVNext<T extends OutputSchema | undefined = undefined>(
+    params: StreamVNextParams<T>,
   ): Promise<ReturnType<MastraModelOutput['getFullOutput']>> {
     const processedParams = {
       ...params,
@@ -662,7 +661,7 @@ export class Agent extends BaseResource {
    * @param params - Stream parameters including prompt
    * @returns Promise containing the enhanced Response object with processDataStream method
    */
-  async stream<T extends JSONSchema7 | ZodSchema | undefined = undefined>(
+  async stream<T extends JSONSchema7 | ZodType | undefined = undefined>(
     params: StreamParams<T>,
   ): Promise<
     Response & {
@@ -1188,8 +1187,8 @@ export class Agent extends BaseResource {
     return response;
   }
 
-  async streamVNext<OUTPUT extends OutputSchema | undefined = undefined>(
-    params: StreamVNextParams<OUTPUT>,
+  async streamVNext<T extends OutputSchema | undefined = undefined>(
+    params: StreamVNextParams<T>,
   ): Promise<
     Response & {
       processDataStream: ({
@@ -1258,9 +1257,7 @@ export class Agent extends BaseResource {
 
     try {
       let toolCalls: ToolInvocation[] = [];
-      let finishReasonToolCalls = false;
       let messages: UIMessage[] = [];
-      let hasProcessedToolCalls = false;
 
       // Use tee() to split the stream into two branches
       const [streamForWritable, streamForProcessing] = response.body.tee();
@@ -1373,6 +1370,8 @@ export class Agent extends BaseResource {
             }
           } else {
             setTimeout(() => {
+              // We can't close the stream in this function, we have to wait until it's done
+              // eslint-disable-next-line @typescript-eslint/no-floating-promises
               writable.close();
             }, 0);
           }

package/src/resources/base.ts

@@ -15,7 +15,7 @@ export class BaseResource {
    */
   public async request<T>(path: string, options: RequestOptions = {}): Promise<T> {
     let lastError: Error | null = null;
-    const { baseUrl, retries = 3, backoffMs = 100, maxBackoffMs = 1000, headers = {} } = this.options;
+    const { baseUrl, retries = 3, backoffMs = 100, maxBackoffMs = 1000, headers = {}, credentials } = this.options;
 
     let delay = backoffMs;
 
@@ -35,6 +35,7 @@ export class BaseResource {
             // '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) : undefined,
         });

package/src/resources/index.ts

@@ -8,3 +8,4 @@ export * from './base';
 export * from './workflow';
 export * from './a2a';
 export * from './mcp-tool';
+export * from './observability';

package/src/resources/memory-thread.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, beforeEach, it, vi } from 'vitest';
-import { MemoryThread } from './memory-thread';
 import type { ClientOptions } from '../types';
+import { MemoryThread } from './memory-thread';
 
 // Mock fetch globally
 global.fetch = vi.fn();

package/src/resources/memory-thread.ts

@@ -1,4 +1,4 @@
-import type { StorageThreadType } from '@mastra/core';
+import type { StorageThreadType } from '@mastra/core/memory';
 
 import type {
   GetMemoryThreadMessagesResponse,

package/src/resources/network-memory-thread.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, beforeEach, it, vi } from 'vitest';
-import { NetworkMemoryThread } from './network-memory-thread';
 import type { ClientOptions } from '../types';
+import { NetworkMemoryThread } from './network-memory-thread';
 
 // Mock fetch globally
 global.fetch = vi.fn();

package/src/resources/network-memory-thread.ts

@@ -1,4 +1,4 @@
-import type { StorageThreadType } from '@mastra/core';
+import type { StorageThreadType } from '@mastra/core/memory';
 
 import type {
   GetMemoryThreadMessagesResponse,

package/src/resources/network.ts

@@ -1,5 +1,5 @@
 import { processDataStream } from '@ai-sdk/ui-utils';
-import type { GenerateReturn } from '@mastra/core';
+import type { GenerateReturn } from '@mastra/core/llm';
 import type { JSONSchema7 } from 'json-schema';
 import type { ZodSchema } from 'zod';
 import type { GenerateParams, ClientOptions, StreamParams, GetNetworkResponse } from '../types';

package/src/resources/observability.ts

@@ -0,0 +1,53 @@
+import type { AITraceRecord, AITracesPaginatedArg } from '@mastra/core/storage';
+import type { ClientOptions, GetAITracesResponse } from '../types';
+import { BaseResource } from './base';
+
+export class Observability extends BaseResource {
+  constructor(options: ClientOptions) {
+    super(options);
+  }
+
+  /**
+   * 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
+   */
+  getTrace(traceId: string): Promise<AITraceRecord> {
+    return this.request(`/api/observability/traces/${traceId}`);
+  }
+
+  /**
+   * Retrieves paginated list of AI traces with optional filtering
+   * @param params - Parameters for pagination and filtering
+   * @returns Promise containing paginated traces and pagination info
+   */
+  getTraces(params: AITracesPaginatedArg): Promise<GetAITracesResponse> {
+    const { pagination, filters } = params;
+    const { page, perPage, dateRange } = pagination || {};
+    const { name, spanType } = filters || {};
+    const searchParams = new URLSearchParams();
+
+    if (page !== undefined) {
+      searchParams.set('page', String(page));
+    }
+    if (perPage !== undefined) {
+      searchParams.set('perPage', String(perPage));
+    }
+    if (name) {
+      searchParams.set('name', name);
+    }
+    if (spanType !== undefined) {
+      searchParams.set('spanType', String(spanType));
+    }
+    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}` : ''}`);
+  }
+}

package/src/resources/tool.ts

@@ -1,8 +1,8 @@
 import type { RuntimeContext } from '@mastra/core/runtime-context';
 import type { GetToolResponse, ClientOptions } from '../types';
 
-import { BaseResource } from './base';
 import { parseClientRuntimeContext } from '../utils';
+import { BaseResource } from './base';
 
 export class Tool extends BaseResource {
   constructor(

package/src/resources/vNextNetwork.ts

@@ -1,3 +1,4 @@
+import type { RuntimeContext } from '@mastra/core/runtime-context';
 import type { WatchEvent } from '@mastra/core/workflows';
 
 import type {
@@ -9,9 +10,8 @@ import type {
   LoopStreamVNextNetworkParams,
 } from '../types';
 
-import { BaseResource } from './base';
 import { parseClientRuntimeContext } from '../utils';
-import type { RuntimeContext } from '@mastra/core/runtime-context';
+import { BaseResource } from './base';
 
 const RECORD_SEPARATOR = '\x1E';
 

package/src/resources/workflow.ts

@@ -320,7 +320,7 @@ export class Workflow extends BaseResource {
                 const parsedChunk = JSON.parse(newChunk);
                 controller.enqueue(parsedChunk);
                 failedChunk = undefined;
-              } catch (error) {
+              } catch {
                 failedChunk = newChunk;
               }
             }

package/src/types.ts

@@ -1,17 +1,3 @@
-import type {
-  MastraMessageV1,
-  AiMessageType,
-  CoreMessage,
-  QueryResult,
-  StorageThreadType,
-  WorkflowRuns,
-  WorkflowRun,
-  LegacyWorkflowRuns,
-  StorageGetMessagesArg,
-  PaginationInfo,
-  MastraMessageV2,
-  OutputSchema,
-} from '@mastra/core';
 import type {
   AgentExecutionOptions,
   AgentGenerateOptions,
@@ -20,11 +6,23 @@ import type {
   UIMessageWithMetadata,
 } from '@mastra/core/agent';
 import type { MessageListInput } from '@mastra/core/agent/message-list';
+import type { CoreMessage } from '@mastra/core/llm';
 import type { BaseLogMessage, LogLevel } from '@mastra/core/logger';
-
 import type { MCPToolType, ServerInfo } from '@mastra/core/mcp';
+import type { AiMessageType, MastraMessageV1, MastraMessageV2, StorageThreadType } from '@mastra/core/memory';
 import type { RuntimeContext } from '@mastra/core/runtime-context';
-import type { MastraScorer, MastraScorerEntry, ScoreRowData } from '@mastra/core/scores';
+import type { MastraScorerEntry, ScoreRowData } from '@mastra/core/scores';
+import type {
+  AITraceRecord,
+  AISpanRecord,
+  LegacyWorkflowRuns,
+  StorageGetMessagesArg,
+  PaginationInfo,
+  WorkflowRun,
+  WorkflowRuns,
+} from '@mastra/core/storage';
+import type { OutputSchema } from '@mastra/core/stream';
+import type { QueryResult } from '@mastra/core/vector';
 import type { Workflow, WatchEvent, WorkflowResult } from '@mastra/core/workflows';
 import type {
   StepAction,
@@ -47,6 +45,8 @@ export interface ClientOptions {
   headers?: Record<string, string>;
   /** Abort signal for request */
   abortSignal?: AbortSignal;
+  /** Credentials mode for requests. See https://developer.mozilla.org/en-US/docs/Web/API/Request/credentials for more info. */
+  credentials?: 'omit' | 'same-origin' | 'include';
 }
 
 export interface RequestOptions {
@@ -54,6 +54,8 @@ export interface RequestOptions {
   headers?: Record<string, string>;
   body?: any;
   stream?: boolean;
+  /** Credentials mode for requests. See https://developer.mozilla.org/en-US/docs/Web/API/Request/credentials for more info. */
+  credentials?: 'omit' | 'same-origin' | 'include';
 }
 
 type WithoutMethods<T> = {
@@ -521,3 +523,12 @@ export type GetScorerResponse = MastraScorerEntry & {
 export interface GetScorersResponse {
   scorers: Array<GetScorerResponse>;
 }
+
+export interface GetAITraceResponse {
+  trace: AITraceRecord;
+}
+
+export interface GetAITracesResponse {
+  spans: AISpanRecord[];
+  pagination: PaginationInfo;
+}

package/src/utils/process-client-tools.ts

@@ -1,6 +1,6 @@
+import type { ToolsInput } from '@mastra/core/agent';
 import { isVercelTool } from '@mastra/core/tools/is-vercel-tool';
 import { zodToJsonSchema } from './zod-to-json-schema';
-import type { ToolsInput } from '@mastra/core/agent';
 
 export function processClientTools(clientTools: ToolsInput | undefined): ToolsInput | undefined {
   if (!clientTools) {

package/src/utils/process-mastra-stream.test.ts

@@ -1,7 +1,7 @@
+import { ReadableStream } from 'stream/web';
+import type { ChunkType } from '@mastra/core/stream';
 import { describe, expect, it, vi, beforeEach } from 'vitest';
 import { processMastraStream } from './process-mastra-stream';
-import type { ChunkType } from '@mastra/core/stream';
-import { ReadableStream } from 'stream/web';
 
 describe('processMastraStream', () => {
   let mockOnChunk: ReturnType<typeof vi.fn>;

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

@@ -1,10 +1,29 @@
-import { ZodSchema } from 'zod';
+import { z } from 'zod';
+import type { ZodType } from 'zod';
 import originalZodToJsonSchema from 'zod-to-json-schema';
 
-export function zodToJsonSchema<T extends ZodSchema | any>(zodSchema: T) {
-  if (!(zodSchema instanceof ZodSchema)) {
+function isZodType(value: unknown): value is ZodType {
+  // Check if it's a Zod schema by looking for common Zod properties and methods
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    '_def' in value &&
+    'parse' in value &&
+    typeof (value as any).parse === 'function' &&
+    'safeParse' in value &&
+    typeof (value as any).safeParse === 'function'
+  );
+}
+
+export function zodToJsonSchema<T extends ZodType | any>(zodSchema: T) {
+  if (!isZodType(zodSchema)) {
     return zodSchema;
   }
 
+  if ('toJSONSchema' in z) {
+    // @ts-expect-error - zod v4 type
+    return z.toJSONSchema(zodSchema);
+  }
+
   return originalZodToJsonSchema(zodSchema, { $refStrategy: 'none' });
 }

package/src/v2-messages.test.ts

@@ -1,5 +1,5 @@
+import type { MastraMessageV1, MastraMessageV2 } from '@mastra/core/memory';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
-import type { MastraMessageV1, MastraMessageV2 } from '@mastra/core';
 import { MastraClient } from './client';
 
 describe('V2 Message Format Support', () => {

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "../../tsconfig.node.json",
-  "include": ["src/**/*", "tsup.config.ts"],
-  "exclude": ["node_modules", "**/*.test.ts"]
+  "include": ["src/**/*", "tsup.config.ts", "integration-tests/**/*"],
+  "exclude": ["node_modules", "integration-tests/node_modules", "src/example.ts", "**/*.test.ts"]
 }

package/tsup.config.ts

@@ -1,5 +1,5 @@
-import { defineConfig } from 'tsup';
 import { generateTypes } from '@internal/types-builder';
+import { defineConfig } from 'tsup';
 
 export default defineConfig({
   entry: ['src/index.ts'],