@mastra/client-js 1.28.0-alpha.5 → 1.28.0

package/dist/index.cjs

@@ -1969,7 +1969,6 @@ var Agent = class extends BaseResource {
       throw new Error("No response body");
     }
     try {
-      let toolCalls = [];
       let messages = [];
       let streamRunId = processedParams.runId;
       const [streamForController, streamForProcessing] = response.body.tee();
@@ -2009,23 +2008,39 @@ var Agent = class extends BaseResource {
         },
         onFinish: async ({ finishReason, message }) => {
           if (finishReason === "tool-calls") {
-            const toolCall = [...message?.parts ?? []].reverse().find((part) => part.type === "tool-invocation")?.toolInvocation;
-            if (toolCall) {
+            const toolInvocationsById = /* @__PURE__ */ new Map();
+            for (const part of message?.parts ?? []) {
+              if (part.type !== "tool-invocation" || !part.toolInvocation?.toolCallId) {
+                continue;
+              }
               const toolInvocationWithMetadata = message?.toolInvocations?.find(
-                (invocation) => invocation.toolCallId === toolCall.toolCallId
+                (invocation) => invocation.toolCallId === part.toolInvocation.toolCallId
               );
-              toolCalls.push({
+              toolInvocationsById.set(part.toolInvocation.toolCallId, {
                 ...toolInvocationWithMetadata,
-                ...toolCall,
-                ...!getClientToolObservabilityContext(toolCall) && toolInvocationWithMetadata ? { observability: getClientToolObservabilityContext(toolInvocationWithMetadata) } : {}
+                ...part.toolInvocation,
+                ...!getClientToolObservabilityContext(part.toolInvocation) && toolInvocationWithMetadata ? { observability: getClientToolObservabilityContext(toolInvocationWithMetadata) } : {}
               });
             }
-            let shouldExecuteClientTool = false;
-            for (const toolCall2 of toolCalls) {
-              const clientTool = processedParams.clientTools?.[toolCall2.toolName];
-              if (clientTool && clientTool.execute) {
-                shouldExecuteClientTool = true;
-                const runId = streamRunId ?? toolCall2.toolCallId;
+            for (const toolInvocation of message?.toolInvocations ?? []) {
+              if (!toolInvocation.toolCallId) {
+                continue;
+              }
+              toolInvocationsById.set(toolInvocation.toolCallId, {
+                ...toolInvocationsById.get(toolInvocation.toolCallId),
+                ...toolInvocation
+              });
+            }
+            const executableToolCalls = [...toolInvocationsById.values()].filter((toolCall) => {
+              const clientTool = processedParams.clientTools?.[toolCall.toolName];
+              return Boolean(clientTool?.execute);
+            });
+            if (executableToolCalls.length > 0) {
+              const syntheticChunks = [];
+              const toolResultContents = [];
+              for (const toolCall of executableToolCalls) {
+                const clientTool = processedParams.clientTools?.[toolCall.toolName];
+                const runId = streamRunId ?? toolCall.toolCallId;
                 let result;
                 let modelOutput;
                 let observability;
@@ -2033,16 +2048,16 @@ var Agent = class extends BaseResource {
                 try {
                   ({ result, observability } = await executeClientToolWithObservability({
                     clientTool,
-                    args: toolCall2?.args,
-                    toolName: toolCall2.toolName,
-                    parentContext: getClientToolObservabilityContext(toolCall2),
+                    args: toolCall?.args,
+                    toolName: toolCall.toolName,
+                    parentContext: getClientToolObservabilityContext(toolCall),
                     executeContext: {
                       requestContext: processedParams.requestContext,
                       tracingContext: { currentSpan: void 0 },
                       agent: {
                         agentId: this.agentId,
                         messages: response.messages,
-                        toolCallId: toolCall2?.toolCallId,
+                        toolCallId: toolCall?.toolCallId,
                         suspend: async () => {
                         },
                         threadId,
@@ -2056,8 +2071,8 @@ var Agent = class extends BaseResource {
                     runId,
                     from: "AGENT",
                     payload: {
-                      toolCallId: toolCall2.toolCallId,
-                      toolName: toolCall2.toolName,
+                      toolCallId: toolCall.toolCallId,
+                      toolName: toolCall.toolName,
                       result,
                       isError: false,
                       providerExecuted: false
@@ -2069,19 +2084,31 @@ var Agent = class extends BaseResource {
                     runId,
                     from: "AGENT",
                     payload: {
-                      toolCallId: toolCall2.toolCallId,
-                      toolName: toolCall2.toolName,
+                      toolCallId: toolCall.toolCallId,
+                      toolName: toolCall.toolName,
                       error,
-                      args: toolCall2?.args,
+                      args: toolCall?.args,
                       providerExecuted: false
                     }
                   };
                   result = { error: error instanceof Error ? error.message : String(error) };
                 }
-                try {
-                  await pipePromise;
-                } catch {
-                }
+                syntheticChunks.push(synthetic);
+                toolResultContents.push({
+                  type: "tool-result",
+                  toolCallId: toolCall.toolCallId,
+                  toolName: toolCall.toolName,
+                  input: toolCall.args,
+                  result,
+                  ...modelOutput != null ? { providerOptions: { mastra: { modelOutput } } } : {},
+                  ...observability ? { __mastraObservability: observability } : {}
+                });
+              }
+              try {
+                await pipePromise;
+              } catch {
+              }
+              for (const synthetic of syntheticChunks) {
                 try {
                   const errorForSerialization = synthetic.type === "tool-error" ? synthetic.payload.error : void 0;
                   const serializedError = errorForSerialization instanceof Error ? {
@@ -2097,55 +2124,30 @@ var Agent = class extends BaseResource {
                 } catch (enqueueErr) {
                   console.error("Failed to enqueue synthetic tool-result chunk:", enqueueErr);
                 }
-                const lastMessageRaw = messages[messages.length - 1];
-                const lastMessage = lastMessageRaw != null ? JSON.parse(JSON.stringify(lastMessageRaw)) : void 0;
-                const toolInvocationPart = lastMessage?.parts?.find(
-                  (part) => part.type === "tool-invocation" && part.toolInvocation?.toolCallId === toolCall2.toolCallId
-                );
-                if (toolInvocationPart) {
-                  toolInvocationPart.toolInvocation = {
-                    ...toolInvocationPart.toolInvocation,
-                    state: "result",
-                    result,
-                    ...observability ? { __mastraObservability: observability } : {}
-                  };
-                  if (modelOutput != null) {
-                    const partWithMetadata = toolInvocationPart;
-                    const existingMastra = partWithMetadata.providerMetadata?.mastra != null && typeof partWithMetadata.providerMetadata.mastra === "object" ? partWithMetadata.providerMetadata.mastra : {};
-                    partWithMetadata.providerMetadata = {
-                      ...partWithMetadata.providerMetadata,
-                      mastra: { ...existingMastra, modelOutput }
-                    };
-                  }
-                }
-                const toolInvocation = lastMessage?.toolInvocations?.find(
-                  (toolInvocation2) => toolInvocation2.toolCallId === toolCall2.toolCallId
+              }
+              const toolResultMessage = {
+                role: "tool",
+                content: toolResultContents
+              };
+              const updatedMessages = threadId ? [toolResultMessage] : [
+                ...Array.isArray(processedParams.messages) ? processedParams.messages : [],
+                ...messages,
+                toolResultMessage
+              ];
+              const recursionRoute = route === "resume-stream" ? "stream" : route === "resume-stream-until-idle" ? "stream-until-idle" : route;
+              try {
+                await this.processStreamResponse(
+                  {
+                    ...processedParams,
+                    messages: updatedMessages
+                  },
+                  controller,
+                  recursionRoute
                 );
-                if (toolInvocation) {
-                  toolInvocation.state = "result";
-                  toolInvocation.result = result;
-                  if (observability) {
-                    toolInvocation.__mastraObservability = observability;
-                  }
-                }
-                const newMessages = lastMessage != null ? [...messages.filter((m) => m.id !== lastMessage.id), lastMessage] : [...messages];
-                const updatedMessages = threadId ? newMessages : [...Array.isArray(processedParams.messages) ? processedParams.messages : [], ...newMessages];
-                const recursionRoute = route === "resume-stream" ? "stream" : route === "resume-stream-until-idle" ? "stream-until-idle" : route;
-                try {
-                  await this.processStreamResponse(
-                    {
-                      ...processedParams,
-                      messages: updatedMessages
-                    },
-                    controller,
-                    recursionRoute
-                  );
-                } catch (error) {
-                  console.error("Error processing recursive stream response:", error);
-                }
+              } catch (error) {
+                console.error("Error processing recursive stream response:", error);
               }
-            }
-            if (!shouldExecuteClientTool) {
+            } else {
               await pipePromise;
               controller.close();
             }
@@ -2609,28 +2611,6 @@ var Agent = class extends BaseResource {
                     }
                   }
                 });
-                const lastMessage = JSON.parse(JSON.stringify(messages[messages.length - 1]));
-                const toolInvocationPart = lastMessage?.parts?.find(
-                  (part) => part.type === "tool-invocation" && part.toolInvocation?.toolCallId === toolCall2.toolCallId
-                );
-                if (toolInvocationPart) {
-                  toolInvocationPart.toolInvocation = {
-                    ...toolInvocationPart.toolInvocation,
-                    state: "result",
-                    result,
-                    ...observability ? { __mastraObservability: observability } : {}
-                  };
-                }
-                const toolInvocation = lastMessage?.toolInvocations?.find(
-                  (toolInvocation2) => toolInvocation2.toolCallId === toolCall2.toolCallId
-                );
-                if (toolInvocation) {
-                  toolInvocation.state = "result";
-                  toolInvocation.result = result;
-                  if (observability) {
-                    toolInvocation.__mastraObservability = observability;
-                  }
-                }
                 const writer = writable.getWriter();
                 try {
                   await writer.write(
@@ -2644,8 +2624,24 @@ var Agent = class extends BaseResource {
                 } finally {
                   writer.releaseLock();
                 }
-                const newMessages = [...messages.filter((m) => m.id !== lastMessage.id), lastMessage];
-                const updatedMessages = threadId ? newMessages : [...Array.isArray(processedParams.messages) ? processedParams.messages : [], ...newMessages];
+                const toolResultMessage = {
+                  role: "tool",
+                  content: [
+                    {
+                      type: "tool-result",
+                      toolCallId: toolCall2.toolCallId,
+                      toolName: toolCall2.toolName,
+                      input: toolCall2.args,
+                      result,
+                      ...observability ? { __mastraObservability: observability } : {}
+                    }
+                  ]
+                };
+                const updatedMessages = threadId ? [toolResultMessage] : [
+                  ...Array.isArray(processedParams.messages) ? processedParams.messages : [],
+                  ...messages,
+                  toolResultMessage
+                ];
                 this.processStreamResponseLegacy(
                   {
                     ...processedParams,
@@ -6087,17 +6083,17 @@ var Channels = class extends BaseResource {
   }
 };
 
-// src/resources/harness.ts
-var HarnessSession = class extends BaseResource {
-  constructor(options, harnessId, resourceId) {
+// src/resources/agent-controller.ts
+var AgentControllerSession = class extends BaseResource {
+  constructor(options, controllerId, resourceId) {
     super(options);
-    this.harnessId = harnessId;
+    this.controllerId = controllerId;
     this.resourceId = resourceId;
   }
-  harnessId;
+  controllerId;
   resourceId;
   base() {
-    return `/harness/${encodeURIComponent(this.harnessId)}/sessions/${encodeURIComponent(this.resourceId)}`;
+    return `/agent-controller/${encodeURIComponent(this.controllerId)}/sessions/${encodeURIComponent(this.resourceId)}`;
   }
   /**
    * Create or resume this session. Pass `tags` to scope initial thread
@@ -6107,7 +6103,7 @@ var HarnessSession = class extends BaseResource {
    * most recent thread across the whole resource.
    */
   create(options) {
-    return this.request(`/harness/${encodeURIComponent(this.harnessId)}/sessions`, {
+    return this.request(`/agent-controller/${encodeURIComponent(this.controllerId)}/sessions`, {
       method: "POST",
       body: { resourceId: this.resourceId, tags: options?.tags }
     });
@@ -6119,7 +6115,7 @@ var HarnessSession = class extends BaseResource {
   async subscribe(options) {
     const response = await this.request(`${this.base()}/stream`, { stream: true });
     if (!response.body) {
-      throw new Error("No response body for harness session stream");
+      throw new Error("No response body for agent controller session stream");
     }
     const reader = response.body.getReader();
     const decoder = new TextDecoder();
@@ -6346,35 +6342,35 @@ var HarnessSession = class extends BaseResource {
     });
   }
 };
-var Harness = class extends BaseResource {
-  constructor(options, harnessId) {
+var AgentController = class extends BaseResource {
+  constructor(options, controllerId) {
     super(options);
-    this.harnessId = harnessId;
+    this.controllerId = controllerId;
   }
-  harnessId;
+  controllerId;
   basePath() {
-    return `/harness/${encodeURIComponent(this.harnessId)}`;
+    return `/agent-controller/${encodeURIComponent(this.controllerId)}`;
   }
-  /** List the modes configured on this harness (e.g. build, plan). */
+  /** List the modes configured on this agent controller (e.g. build, plan). */
   async listModes() {
     const body = await this.request(`${this.basePath()}/modes`);
     return body.modes;
   }
-  /** List available models on this harness (with auth status and use counts). */
+  /** List available models on this agent controller (with auth status and use counts). */
   async listModels() {
     const body = await this.request(`${this.basePath()}/models`);
     return body.models;
   }
-  /** Get workspace status for this harness. */
+  /** Get workspace status for this agent controller. */
   async workspaceStatus() {
     return this.request(`${this.basePath()}/workspace`);
   }
   /** Scope to a session bound to `resourceId` (e.g. a user or conversation id). */
   session(resourceId) {
-    return new HarnessSession(this.options, this.harnessId, resourceId);
+    return new AgentControllerSession(this.options, this.controllerId, resourceId);
   }
 };
-function harnessMessageText(message) {
+function agentControllerMessageText(message) {
   return message.content.filter((c) => c.type === "text" && typeof c.text === "string").map((c) => c.text).join("");
 }
 
@@ -6421,21 +6417,21 @@ var MastraClient = class extends BaseResource {
     return new Agent(this.options, agentId, version);
   }
   /**
-   * Lists the harnesses hosted on the connected Mastra instance.
-   * @returns Promise containing an array of harness identifiers
+   * Lists the agent controllers hosted on the connected Mastra instance.
+   * @returns Promise containing an array of agent controller identifiers
    */
-  async listHarnesses() {
-    const body = await this.request("/harness");
-    return body.harnesses;
+  async listAgentControllers() {
+    const body = await this.request("/agent-controller");
+    return body.agentControllers;
   }
   /**
-   * Scopes to a harness hosted on the connected Mastra instance. Use
-   * `getHarness(id).session(resourceId)` to create/resume a session, stream its
-   * events, and send messages.
-   * @param harnessId - The id the harness is registered under on Mastra
+   * Scopes to an agent controller hosted on the connected Mastra instance. Use
+   * `getAgentController(id).session(resourceId)` to create/resume a session,
+   * stream its events, and send messages.
+   * @param controllerId - The id the agent controller is registered under on Mastra
    */
-  getHarness(harnessId) {
-    return new Harness(this.options, harnessId);
+  getAgentController(controllerId) {
+    return new AgentController(this.options, controllerId);
   }
   /**
    * Lists memory threads with optional filtering by resourceId and/or metadata
@@ -8073,7 +8069,7 @@ Object.defineProperty(exports, "RequestContext", {
 exports.ClientTool = ClientTool;
 exports.MastraClient = MastraClient;
 exports.MastraClientError = MastraClientError;
+exports.agentControllerMessageText = agentControllerMessageText;
 exports.createTool = createTool;
-exports.harnessMessageText = harnessMessageText;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map