@mastra/core 0.6.4 → 0.6.5-alpha.0

package/dist/agent/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var chunkYLLXAKL2_cjs = require('../chunk-YLLXAKL2.cjs');
+var chunkMHS4VFX4_cjs = require('../chunk-MHS4VFX4.cjs');
 
 
 
 Object.defineProperty(exports, "Agent", {
   enumerable: true,
-  get: function () { return chunkYLLXAKL2_cjs.Agent; }
+  get: function () { return chunkMHS4VFX4_cjs.Agent; }
 });

package/dist/agent/index.js

@@ -1 +1 @@
-export { Agent } from '../chunk-PRNJCD6I.js';
+export { Agent } from '../chunk-FVWRLDKM.js';

package/dist/{chunk-B7OACOMS.js → chunk-7ST47THC.js}

@@ -1,4 +1,4 @@
-import { Agent } from './chunk-PRNJCD6I.js';
+import { Agent } from './chunk-FVWRLDKM.js';
 import { CohereClient } from 'cohere-ai';
 
 var CohereRelevanceScorer = class {

package/dist/{chunk-YTP2MMIM.cjs → chunk-BYBMTU6U.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkYLLXAKL2_cjs = require('./chunk-YLLXAKL2.cjs');
+var chunkMHS4VFX4_cjs = require('./chunk-MHS4VFX4.cjs');
 var cohereAi = require('cohere-ai');
 
 var CohereRelevanceScorer = class {
@@ -38,7 +38,7 @@ Relevance score (0-1):`;
 var MastraAgentRelevanceScorer = class {
   agent;
   constructor(name, model) {
-    this.agent = new chunkYLLXAKL2_cjs.Agent({
+    this.agent = new chunkMHS4VFX4_cjs.Agent({
       name: `Relevance Scorer ${name}`,
       instructions: `You are a specialized agent for evaluating the relevance of text to queries.
 Your task is to rate how well a text passage answers a given query.

package/dist/{chunk-PRNJCD6I.js → chunk-FVWRLDKM.js}

@@ -248,7 +248,7 @@ var MastraLLM = class extends MastraLLMBase {
       }
     }
     return await generateText({
-      messages,
+      messages: this.convertToUIMessages(messages),
       ...argsForExecute,
       experimental_telemetry: {
         ...this.experimental_telemetry,
@@ -325,7 +325,7 @@ var MastraLLM = class extends MastraLLMBase {
       schema = jsonSchema(structuredOutput);
     }
     return await generateObject({
-      messages,
+      messages: this.convertToUIMessages(messages),
       ...argsForExecute,
       output,
       schema,
@@ -423,7 +423,7 @@ var MastraLLM = class extends MastraLLMBase {
       }
     }
     return await streamText({
-      messages,
+      messages: this.convertToUIMessages(messages),
       ...argsForExecute,
       experimental_telemetry: {
         ...this.experimental_telemetry,
@@ -519,7 +519,7 @@ var MastraLLM = class extends MastraLLMBase {
       schema = jsonSchema(structuredOutput);
     }
     return streamObject({
-      messages,
+      messages: this.convertToUIMessages(messages),
       ...argsForExecute,
       output,
       schema,
@@ -609,6 +609,82 @@ var MastraLLM = class extends MastraLLMBase {
       ...rest
     });
   }
+  convertToUIMessages(messages) {
+    function addToolMessageToChat({
+      toolMessage,
+      messages: messages2,
+      toolResultContents
+    }) {
+      const chatMessages2 = messages2.map(message => {
+        if (message.toolInvocations) {
+          return {
+            ...message,
+            toolInvocations: message.toolInvocations.map(toolInvocation => {
+              const toolResult = toolMessage.content.find(tool => tool.toolCallId === toolInvocation.toolCallId);
+              if (toolResult) {
+                return {
+                  ...toolInvocation,
+                  state: "result",
+                  result: toolResult.result
+                };
+              }
+              return toolInvocation;
+            })
+          };
+        }
+        return message;
+      });
+      const resultContents = [...toolResultContents, ...toolMessage.content];
+      return {
+        chatMessages: chatMessages2,
+        toolResultContents: resultContents
+      };
+    }
+    const {
+      chatMessages
+    } = messages.reduce((obj, message) => {
+      if (message.role === "tool") {
+        return addToolMessageToChat({
+          toolMessage: message,
+          messages: obj.chatMessages,
+          toolResultContents: obj.toolResultContents
+        });
+      }
+      let textContent = "";
+      let toolInvocations = [];
+      if (typeof message.content === "string") {
+        textContent = message.content;
+      } else if (typeof message.content === "number") {
+        textContent = String(message.content);
+      } else if (Array.isArray(message.content)) {
+        for (const content of message.content) {
+          if (content.type === "text") {
+            textContent += content.text;
+          } else if (content.type === "tool-call") {
+            const toolResult = obj.toolResultContents.find(tool => tool.toolCallId === content.toolCallId);
+            toolInvocations.push({
+              state: toolResult ? "result" : "call",
+              toolCallId: content.toolCallId,
+              toolName: content.toolName,
+              args: content.args,
+              result: toolResult?.result
+            });
+          }
+        }
+      }
+      obj.chatMessages.push({
+        id: message.id,
+        role: message.role,
+        content: textContent,
+        toolInvocations
+      });
+      return obj;
+    }, {
+      chatMessages: [],
+      toolResultContents: []
+    });
+    return chatMessages;
+  }
 };
 
 // src/agent/index.ts

package/dist/{chunk-YLLXAKL2.cjs → chunk-MHS4VFX4.cjs}

@@ -250,7 +250,7 @@ var MastraLLM = class extends MastraLLMBase {
       }
     }
     return await ai.generateText({
-      messages,
+      messages: this.convertToUIMessages(messages),
       ...argsForExecute,
       experimental_telemetry: {
         ...this.experimental_telemetry,
@@ -327,7 +327,7 @@ var MastraLLM = class extends MastraLLMBase {
       schema = ai.jsonSchema(structuredOutput);
     }
     return await ai.generateObject({
-      messages,
+      messages: this.convertToUIMessages(messages),
       ...argsForExecute,
       output,
       schema,
@@ -425,7 +425,7 @@ var MastraLLM = class extends MastraLLMBase {
       }
     }
     return await ai.streamText({
-      messages,
+      messages: this.convertToUIMessages(messages),
       ...argsForExecute,
       experimental_telemetry: {
         ...this.experimental_telemetry,
@@ -521,7 +521,7 @@ var MastraLLM = class extends MastraLLMBase {
       schema = ai.jsonSchema(structuredOutput);
     }
     return ai.streamObject({
-      messages,
+      messages: this.convertToUIMessages(messages),
       ...argsForExecute,
       output,
       schema,
@@ -611,6 +611,82 @@ var MastraLLM = class extends MastraLLMBase {
       ...rest
     });
   }
+  convertToUIMessages(messages) {
+    function addToolMessageToChat({
+      toolMessage,
+      messages: messages2,
+      toolResultContents
+    }) {
+      const chatMessages2 = messages2.map(message => {
+        if (message.toolInvocations) {
+          return {
+            ...message,
+            toolInvocations: message.toolInvocations.map(toolInvocation => {
+              const toolResult = toolMessage.content.find(tool => tool.toolCallId === toolInvocation.toolCallId);
+              if (toolResult) {
+                return {
+                  ...toolInvocation,
+                  state: "result",
+                  result: toolResult.result
+                };
+              }
+              return toolInvocation;
+            })
+          };
+        }
+        return message;
+      });
+      const resultContents = [...toolResultContents, ...toolMessage.content];
+      return {
+        chatMessages: chatMessages2,
+        toolResultContents: resultContents
+      };
+    }
+    const {
+      chatMessages
+    } = messages.reduce((obj, message) => {
+      if (message.role === "tool") {
+        return addToolMessageToChat({
+          toolMessage: message,
+          messages: obj.chatMessages,
+          toolResultContents: obj.toolResultContents
+        });
+      }
+      let textContent = "";
+      let toolInvocations = [];
+      if (typeof message.content === "string") {
+        textContent = message.content;
+      } else if (typeof message.content === "number") {
+        textContent = String(message.content);
+      } else if (Array.isArray(message.content)) {
+        for (const content of message.content) {
+          if (content.type === "text") {
+            textContent += content.text;
+          } else if (content.type === "tool-call") {
+            const toolResult = obj.toolResultContents.find(tool => tool.toolCallId === content.toolCallId);
+            toolInvocations.push({
+              state: toolResult ? "result" : "call",
+              toolCallId: content.toolCallId,
+              toolName: content.toolName,
+              args: content.args,
+              result: toolResult?.result
+            });
+          }
+        }
+      }
+      obj.chatMessages.push({
+        id: message.id,
+        role: message.role,
+        content: textContent,
+        toolInvocations
+      });
+      return obj;
+    }, {
+      chatMessages: [],
+      toolResultContents: []
+    });
+    return chatMessages;
+  }
 };
 
 // src/agent/index.ts

package/dist/index.cjs

@@ -6,9 +6,9 @@ var chunkXLSROQ26_cjs = require('./chunk-XLSROQ26.cjs');
 var chunkYXJQFZOW_cjs = require('./chunk-YXJQFZOW.cjs');
 var chunk2DKUBXLZ_cjs = require('./chunk-2DKUBXLZ.cjs');
 var chunkRUA6BSB6_cjs = require('./chunk-RUA6BSB6.cjs');
-var chunkYTP2MMIM_cjs = require('./chunk-YTP2MMIM.cjs');
+var chunkBYBMTU6U_cjs = require('./chunk-BYBMTU6U.cjs');
 var chunkWVVKLIUW_cjs = require('./chunk-WVVKLIUW.cjs');
-var chunkYLLXAKL2_cjs = require('./chunk-YLLXAKL2.cjs');
+var chunkMHS4VFX4_cjs = require('./chunk-MHS4VFX4.cjs');
 var chunkXB2TJ7LX_cjs = require('./chunk-XB2TJ7LX.cjs');
 var chunk4OM3F6KZ_cjs = require('./chunk-4OM3F6KZ.cjs');
 var chunk2W2GYEYQ_cjs = require('./chunk-2W2GYEYQ.cjs');
@@ -19,7 +19,7 @@ var chunkV5ORZPFW_cjs = require('./chunk-V5ORZPFW.cjs');
 var chunkST5RMVLG_cjs = require('./chunk-ST5RMVLG.cjs');
 
 // src/agent/index.warning.ts
-var Agent2 = class extends chunkYLLXAKL2_cjs.Agent {
+var Agent2 = class extends chunkMHS4VFX4_cjs.Agent {
   constructor(config) {
     super(config);
     this.logger.warn('Please import "Agent from "@mastra/core/agent" instead of "@mastra/core"');
@@ -180,15 +180,15 @@ Object.defineProperty(exports, "Mastra", {
 });
 Object.defineProperty(exports, "CohereRelevanceScorer", {
   enumerable: true,
-  get: function () { return chunkYTP2MMIM_cjs.CohereRelevanceScorer; }
+  get: function () { return chunkBYBMTU6U_cjs.CohereRelevanceScorer; }
 });
 Object.defineProperty(exports, "MastraAgentRelevanceScorer", {
   enumerable: true,
-  get: function () { return chunkYTP2MMIM_cjs.MastraAgentRelevanceScorer; }
+  get: function () { return chunkBYBMTU6U_cjs.MastraAgentRelevanceScorer; }
 });
 Object.defineProperty(exports, "createSimilarityPrompt", {
   enumerable: true,
-  get: function () { return chunkYTP2MMIM_cjs.createSimilarityPrompt; }
+  get: function () { return chunkBYBMTU6U_cjs.createSimilarityPrompt; }
 });
 Object.defineProperty(exports, "InstrumentClass", {
   enumerable: true,

package/dist/index.js

@@ -5,9 +5,9 @@ import { Integration, OpenAPIToolset } from './chunk-PNZK456O.js';
 export { Mastra } from './chunk-ZBKJDQPM.js';
 import { MastraMemory } from './chunk-34GSMLRD.js';
 import { MastraVector } from './chunk-ZABXT2MN.js';
-export { CohereRelevanceScorer, MastraAgentRelevanceScorer, createSimilarityPrompt } from './chunk-B7OACOMS.js';
+export { CohereRelevanceScorer, MastraAgentRelevanceScorer, createSimilarityPrompt } from './chunk-7ST47THC.js';
 import { MastraStorage } from './chunk-RU7CSPAV.js';
-import { Agent } from './chunk-PRNJCD6I.js';
+import { Agent } from './chunk-FVWRLDKM.js';
 export { InstrumentClass, OTLPTraceExporter as OTLPStorageExporter, Telemetry, hasActiveTelemetry, withSpan } from './chunk-W5HVJX45.js';
 export { checkEvalStorageFields, createMastraProxy, deepMerge, delay, ensureToolProperties, isVercelTool, jsonSchemaPropertiesToTSTypes, jsonSchemaToModel, makeCoreTool, maskStreamTags, resolveSerializedZodOutput } from './chunk-3OXCRLRW.js';
 import { Tool } from './chunk-ZINPRHAN.js';

package/dist/network/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkYLLXAKL2_cjs = require('../chunk-YLLXAKL2.cjs');
+var chunkMHS4VFX4_cjs = require('../chunk-MHS4VFX4.cjs');
 var chunk2W2GYEYQ_cjs = require('../chunk-2W2GYEYQ.cjs');
 var chunkPL7PVTGF_cjs = require('../chunk-PL7PVTGF.cjs');
 var chunkNPOKIPWC_cjs = require('../chunk-NPOKIPWC.cjs');
@@ -17,7 +17,7 @@ var AgentNetwork = class extends chunkPL7PVTGF_cjs.MastraBase {
     this.#instructions = config.instructions;
     this.#agents = config.agents;
     this.#model = config.model;
-    this.#routingAgent = new chunkYLLXAKL2_cjs.Agent({
+    this.#routingAgent = new chunkMHS4VFX4_cjs.Agent({
       name: config.name,
       instructions: this.getInstructions(),
       model: this.#model,

package/dist/network/index.js

@@ -1,4 +1,4 @@
-import { Agent } from '../chunk-PRNJCD6I.js';
+import { Agent } from '../chunk-FVWRLDKM.js';
 import { createTool } from '../chunk-ZINPRHAN.js';
 import { MastraBase } from '../chunk-VN4M67DA.js';
 import { RegisteredLogger } from '../chunk-L7CR75HA.js';

package/dist/relevance/index.cjs

@@ -1,18 +1,18 @@
 'use strict';
 
-var chunkYTP2MMIM_cjs = require('../chunk-YTP2MMIM.cjs');
+var chunkBYBMTU6U_cjs = require('../chunk-BYBMTU6U.cjs');
 
 
 
 Object.defineProperty(exports, "CohereRelevanceScorer", {
   enumerable: true,
-  get: function () { return chunkYTP2MMIM_cjs.CohereRelevanceScorer; }
+  get: function () { return chunkBYBMTU6U_cjs.CohereRelevanceScorer; }
 });
 Object.defineProperty(exports, "MastraAgentRelevanceScorer", {
   enumerable: true,
-  get: function () { return chunkYTP2MMIM_cjs.MastraAgentRelevanceScorer; }
+  get: function () { return chunkBYBMTU6U_cjs.MastraAgentRelevanceScorer; }
 });
 Object.defineProperty(exports, "createSimilarityPrompt", {
   enumerable: true,
-  get: function () { return chunkYTP2MMIM_cjs.createSimilarityPrompt; }
+  get: function () { return chunkBYBMTU6U_cjs.createSimilarityPrompt; }
 });

package/dist/relevance/index.js

@@ -1 +1 @@
-export { CohereRelevanceScorer, MastraAgentRelevanceScorer, createSimilarityPrompt } from '../chunk-B7OACOMS.js';
+export { CohereRelevanceScorer, MastraAgentRelevanceScorer, createSimilarityPrompt } from '../chunk-7ST47THC.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/core",
-  "version": "0.6.4",
+  "version": "0.6.5-alpha.0",
   "license": "ISC",
   "type": "module",
   "main": "dist/index.js",