@mastra/client-js 1.32.1-alpha.2 → 1.33.0-alpha.3

package/dist/index.d.ts

@@ -4,7 +4,7 @@ export * from './tools.js';
 export type { ChannelPlatformInfo, ChannelInstallationInfo, ChannelConnectOAuth, ChannelConnectDeepLink, ChannelConnectImmediate, ChannelConnectResult, } from './resources/channels.js';
 export type { AgentCardSignatureKeyProviderInput, AgentCardVerificationKey, GetAgentCardOptions, VerifyAgentCardSignatureOptions, } from './resources/a2a.js';
 export { agentControllerMessageText } from './resources/agent-controller.js';
-export type { AgentControllerInfo, AgentControllerMessage, AgentControllerMessageContent, AgentControllerEvent, KnownAgentControllerEvent, OtherAgentControllerEvent, CreateAgentControllerSessionResponse, SubscribeAgentControllerSessionOptions, AgentControllerSubscription, AgentControllerSessionState, AgentControllerSessionSettings, AgentControllerOMProgress, AgentControllerModeInfo, AgentControllerThreadInfo, AgentControllerTaskSnapshot, AgentControllerAvailableModel, AgentControllerWorkspaceStatus, AgentControllerGoalRecord, SendNotificationInput, SendNotificationResult, PlanResume, PermissionPolicy, PermissionRules, ToolCategory, } from './resources/agent-controller.js';
+export type { AgentControllerInfo, MastraDBMessage, MastraMessageContentV2, MastraMessagePart, AgentControllerEvent, KnownAgentControllerEvent, OtherAgentControllerEvent, CreateAgentControllerSessionResponse, AgentControllerRequestOptions, SubscribeAgentControllerSessionOptions, AgentControllerSubscription, AgentControllerSessionState, AgentControllerSessionSettings, AgentControllerOMProgress, AgentControllerModeInfo, AgentControllerThreadInfo, AgentControllerTaskSnapshot, AgentControllerAvailableModel, AgentControllerWorkspaceStatus, AgentControllerGoalRecord, SendNotificationInput, SendNotificationResult, PlanResume, PermissionPolicy, PermissionRules, ToolCategory, } from './resources/agent-controller.js';
 export { RequestContext } from '@mastra/core/request-context';
 export type { ObservabilityCollector } from './observability/types.js';
 export type { UIMessageWithMetadata } from '@mastra/core/agent';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,YAAY,EACV,mBAAmB,EACnB,uBAAuB,EACvB,mBAAmB,EACnB,sBAAsB,EACtB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EACV,kCAAkC,EAClC,wBAAwB,EACxB,mBAAmB,EACnB,+BAA+B,GAChC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,YAAY,EACV,mBAAmB,EACnB,sBAAsB,EACtB,6BAA6B,EAC7B,oBAAoB,EACpB,yBAAyB,EACzB,yBAAyB,EACzB,oCAAoC,EACpC,sCAAsC,EACtC,2BAA2B,EAC3B,2BAA2B,EAC3B,8BAA8B,EAC9B,yBAAyB,EACzB,uBAAuB,EACvB,yBAAyB,EACzB,2BAA2B,EAC3B,6BAA6B,EAC7B,8BAA8B,EAC9B,yBAAyB,EACzB,qBAAqB,EACrB,sBAAsB,EACtB,UAAU,EACV,gBAAgB,EAChB,eAAe,EACf,YAAY,GACb,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG9D,YAAY,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,YAAY,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,YAAY,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,YAAY,EACV,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,UAAU,EACV,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,iBAAiB,EACjB,UAAU,GACX,MAAM,4BAA4B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,YAAY,EACV,mBAAmB,EACnB,uBAAuB,EACvB,mBAAmB,EACnB,sBAAsB,EACtB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EACV,kCAAkC,EAClC,wBAAwB,EACxB,mBAAmB,EACnB,+BAA+B,GAChC,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,YAAY,EACV,mBAAmB,EACnB,eAAe,EACf,sBAAsB,EACtB,iBAAiB,EACjB,oBAAoB,EACpB,yBAAyB,EACzB,yBAAyB,EACzB,oCAAoC,EACpC,6BAA6B,EAC7B,sCAAsC,EACtC,2BAA2B,EAC3B,2BAA2B,EAC3B,8BAA8B,EAC9B,yBAAyB,EACzB,uBAAuB,EACvB,yBAAyB,EACzB,2BAA2B,EAC3B,6BAA6B,EAC7B,8BAA8B,EAC9B,yBAAyB,EACzB,qBAAqB,EACrB,sBAAsB,EACtB,UAAU,EACV,gBAAgB,EAChB,eAAe,EACf,YAAY,GACb,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG9D,YAAY,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,YAAY,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,YAAY,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,YAAY,EACV,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,UAAU,EACV,aAAa,EACb,cAAc,EACd,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,iBAAiB,EACjB,UAAU,GACX,MAAM,4BAA4B,CAAC"}

package/dist/index.js

@@ -6139,6 +6139,19 @@ var Channels = class extends BaseResource {
 };
 
 // src/resources/agent-controller.ts
+function hydrateMessage(message) {
+  return {
+    ...message,
+    createdAt: message.createdAt instanceof Date ? message.createdAt : new Date(message.createdAt)
+  };
+}
+function hydrateEventMessage(event) {
+  if (event.type !== "message_start" && event.type !== "message_update" && event.type !== "message_end") return event;
+  return {
+    ...event,
+    message: hydrateMessage(event.message)
+  };
+}
 var AgentControllerSession = class extends BaseResource {
   constructor(options, controllerId, resourceId, scope) {
     super(options);
@@ -6174,46 +6187,158 @@ var AgentControllerSession = class extends BaseResource {
   /**
    * Subscribe to this session's event stream (SSE). The assistant's reply to a
    * message arrives here as `message_*` events, not on the sendMessage call.
+   *
+   * The returned promise resolves once the stream is actually established and
+   * rejects when it cannot be. A rejected subscribe leaves nothing running —
+   * `reconnect` governs only re-establishment after an established stream
+   * drops, so callers that want connect-time retry can loop around
+   * `subscribe()` themselves and keep cancellation control.
    */
   async subscribe(options) {
-    const response = await this.request(this.url(`${this.base()}/stream`), { stream: true });
-    if (!response.body) {
-      throw new Error("No response body for agent controller session stream");
-    }
-    const reader = response.body.getReader();
-    const decoder = new TextDecoder();
+    const finiteOr = (value, fallback) => typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : fallback;
+    const retriesOr = (value, fallback) => value === Infinity || typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : fallback;
+    const reconnectOptions = options.reconnect === true ? { maxRetries: Infinity, delayMs: 1e3, maxDelayMs: 3e4 } : options.reconnect ? {
+      maxRetries: retriesOr(options.reconnect.maxRetries, Infinity),
+      delayMs: finiteOr(options.reconnect.delayMs, 1e3),
+      maxDelayMs: finiteOr(options.reconnect.maxDelayMs, 3e4)
+    } : null;
+    const backoffDelay = (attempt) => reconnectOptions ? Math.min(reconnectOptions.delayMs * 2 ** (attempt - 1), reconnectOptions.maxDelayMs) : 0;
     let cancelled = false;
-    let buffer = "";
-    const pump = async () => {
+    let currentReader = null;
+    let reconnectTimer;
+    let delayResolve;
+    const settleDelay = () => {
+      if (reconnectTimer) {
+        clearTimeout(reconnectTimer);
+        reconnectTimer = void 0;
+      }
+      const resolve = delayResolve;
+      delayResolve = void 0;
+      resolve?.();
+    };
+    const delay = (ms) => new Promise((resolve) => {
+      delayResolve = resolve;
+      reconnectTimer = setTimeout(settleDelay, ms);
+    });
+    const requestStream = async () => {
+      const response = await this.request(this.url(`${this.base()}/stream`), { stream: true });
+      if (!response.body) {
+        throw new Error("No response body for agent controller session stream");
+      }
+      return response;
+    };
+    const streamEndedError = () => new Error("Agent controller session stream ended unexpectedly");
+    const findFrameSeparator = (text) => {
+      const candidates = [
+        { index: text.indexOf("\r\n\r\n"), length: 4 },
+        { index: text.indexOf("\n\n"), length: 2 },
+        { index: text.indexOf("\r\r"), length: 2 }
+      ].filter((candidate) => candidate.index !== -1);
+      if (candidates.length === 0) return null;
+      return candidates.reduce((earliest, candidate) => candidate.index < earliest.index ? candidate : earliest);
+    };
+    const pump = async (response) => {
+      const reader = response.body.getReader();
+      currentReader = reader;
+      const decoder = new TextDecoder();
+      let buffer = "";
       try {
         while (!cancelled) {
           const { done, value } = await reader.read();
-          if (done) break;
+          if (done) return cancelled ? { kind: "cancelled" } : { kind: "done" };
           buffer += decoder.decode(value, { stream: true });
-          let sep;
-          while ((sep = buffer.indexOf("\n\n")) !== -1) {
-            const frame = buffer.slice(0, sep);
-            buffer = buffer.slice(sep + 2);
-            for (const line of frame.split("\n")) {
+          let separator;
+          while ((separator = findFrameSeparator(buffer)) !== null) {
+            const frame = buffer.slice(0, separator.index);
+            buffer = buffer.slice(separator.index + separator.length);
+            for (const line of frame.split(/\r\n|\n|\r/)) {
               if (!line.startsWith("data:")) continue;
               const data = line.slice(5).trim();
               if (!data) continue;
+              let event;
               try {
-                options.onEvent(JSON.parse(data));
+                event = hydrateEventMessage(JSON.parse(data));
               } catch {
+                continue;
+              }
+              try {
+                options.onEvent(event);
+              } catch (cause) {
+                if (!cancelled) safeOnError(cause);
+                return { kind: "consumer_error" };
               }
             }
           }
         }
+        return { kind: "cancelled" };
+      } catch (error) {
+        return cancelled ? { kind: "cancelled" } : { kind: "transport_error", error };
+      } finally {
+        if (currentReader === reader) currentReader = null;
+        void reader.cancel().catch(() => {
+        });
+      }
+    };
+    const safeOnError = (error) => {
+      try {
+        options.onError?.(error);
+      } catch {
+      }
+    };
+    const reportTerminalError = (result) => {
+      safeOnError(result.kind === "transport_error" ? result.error : streamEndedError());
+    };
+    const pumpSafe = async (response) => {
+      try {
+        return await pump(response);
       } catch (error) {
-        if (!cancelled) options.onError?.(error);
+        return cancelled ? { kind: "cancelled" } : { kind: "transport_error", error };
+      }
+    };
+    const firstResponse = await requestStream();
+    const run = async (initial) => {
+      let response = initial;
+      while (!cancelled) {
+        let result = await pumpSafe(response);
+        if (cancelled || result.kind === "cancelled" || result.kind === "consumer_error") return;
+        if (!reconnectOptions) {
+          reportTerminalError(result);
+          return;
+        }
+        let attempts = 0;
+        let reconnectedResponse;
+        while (!reconnectedResponse) {
+          if (attempts >= reconnectOptions.maxRetries) {
+            reportTerminalError(result);
+            return;
+          }
+          attempts++;
+          await delay(backoffDelay(attempts));
+          if (cancelled) return;
+          try {
+            reconnectedResponse = await requestStream();
+          } catch (error) {
+            result = { kind: "transport_error", error };
+          }
+        }
+        if (cancelled) {
+          void reconnectedResponse.body?.cancel().catch(() => {
+          });
+          return;
+        }
+        response = reconnectedResponse;
+        try {
+          options.onReconnect?.();
+        } catch {
+        }
       }
     };
-    void pump();
+    void run(firstResponse);
     return {
       unsubscribe: () => {
         cancelled = true;
-        void reader.cancel().catch(() => {
+        settleDelay();
+        void currentReader?.cancel().catch(() => {
         });
       }
     };
@@ -6222,12 +6347,18 @@ var AgentControllerSession = class extends BaseResource {
    * Send a user message. The reply streams over `subscribe()`.
    * Pass a structured message to attach files (e.g. pasted images) as base64-encoded data:
    * `sendMessage({ content: 'What is in this image?', files })`.
+   * Pass `options.requestContext` to merge custom context into the run's request context.
    */
-  async sendMessage(message) {
+  async sendMessage(message, options) {
     const { content, files } = typeof message === "string" ? { content: message, files: void 0 } : message;
+    const requestContext = parseClientRequestContext(options?.requestContext);
     await this.request(this.url(`${this.base()}/messages`), {
       method: "POST",
-      body: { message: content, ...files?.length ? { files } : {} }
+      body: {
+        message: content,
+        ...files?.length ? { files } : {},
+        ...requestContext ? { requestContext } : {}
+      }
     });
   }
   /** Abort the in-flight run for this session. */
@@ -6235,10 +6366,11 @@ var AgentControllerSession = class extends BaseResource {
     await this.request(this.url(`${this.base()}/abort`), { method: "POST" });
   }
   /** Approve or decline a pending tool call (`tool_approval_required`). */
-  async approveTool(toolCallId, approved) {
+  async approveTool(toolCallId, approved, options) {
+    const requestContext = parseClientRequestContext(options?.requestContext);
     await this.request(this.url(`${this.base()}/tool-approval`), {
       method: "POST",
-      body: { toolCallId, approved }
+      body: { toolCallId, approved, ...requestContext ? { requestContext } : {} }
     });
   }
   /**
@@ -6246,15 +6378,20 @@ var AgentControllerSession = class extends BaseResource {
    * depends on the tool: a string (or string[]) for `ask_user`, "Yes"/"No" for
    * `request_access`, and a {@link PlanResume} for `submit_plan`.
    */
-  async respondToToolSuspension(toolCallId, resumeData) {
+  async respondToToolSuspension(toolCallId, resumeData, options) {
+    const requestContext = parseClientRequestContext(options?.requestContext);
     await this.request(this.url(`${this.base()}/tool-suspension`), {
       method: "POST",
-      body: { toolCallId, resumeData }
+      body: { toolCallId, resumeData, ...requestContext ? { requestContext } : {} }
     });
   }
   /** Inject a message into the in-flight run without starting a new turn. */
-  async steer(message) {
-    await this.request(this.url(`${this.base()}/steer`), { method: "POST", body: { message } });
+  async steer(message, options) {
+    const requestContext = parseClientRequestContext(options?.requestContext);
+    await this.request(this.url(`${this.base()}/steer`), {
+      method: "POST",
+      body: { message, ...requestContext ? { requestContext } : {} }
+    });
   }
   /** Get the current mode, model, and thread (for initial UI hydration). */
   state() {
@@ -6330,14 +6467,18 @@ var AgentControllerSession = class extends BaseResource {
     const body = await this.request(
       this.url(`${this.base()}/threads/${encodeURIComponent(threadId)}/messages${params}`)
     );
-    return body.messages;
+    return body.messages.map(hydrateMessage);
   }
   /**
    * Queue a follow-up message. If the session is idle it sends immediately;
    * if a run is active it queues for after completion.
    */
-  async followUp(message) {
-    await this.request(this.url(`${this.base()}/follow-up`), { method: "POST", body: { message } });
+  async followUp(message, options) {
+    const requestContext = parseClientRequestContext(options?.requestContext);
+    await this.request(this.url(`${this.base()}/follow-up`), {
+      method: "POST",
+      body: { message, ...requestContext ? { requestContext } : {} }
+    });
   }
   /** Get the observational memory record for this session's thread. */
   async getOMRecord() {
@@ -6447,7 +6588,7 @@ var AgentController = class extends BaseResource {
   }
 };
 function agentControllerMessageText(message) {
-  return message.content.filter((c) => c.type === "text" && typeof c.text === "string").map((c) => c.text).join("");
+  return message.content.parts.filter((p) => p.type === "text" && typeof p.text === "string").map((p) => p.text).join("");
 }
 
 // src/client.ts