@mastra/core 0.1.19 → 0.1.21

package/dist/core.esm.js

@@ -5790,7 +5790,7 @@ function getAgentSystemApis(_ref) {
     }),
     executor: function () {
       var _executor = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
-        var data, ctx, executor, result, _run$content, thread, run;
+        var data, ctx, executor, _answer, result, answer, _result$toolCalls, _run$content, _run$content2, thread, run, message, _answer2;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -5802,27 +5802,31 @@ function getAgentSystemApis(_ref) {
               });
             case 3:
               executor = _context.sent;
-              console.log('executor====', {
-                executor: executor
-              });
               if (executor) {
-                _context.next = 7;
+                _context.next = 6;
                 break;
               }
               throw new Error('Could not create agent executor');
-            case 7:
+            case 6:
               if (!(typeof executor === 'function')) {
                 _context.next = 14;
                 break;
               }
-              _context.next = 10;
+              _context.next = 9;
               return executor({
                 prompt: data == null ? void 0 : data.message
               });
-            case 10:
+            case 9:
               result = _context.sent;
+              if (Array.isArray(result.toolCalls)) {
+                answer = (_result$toolCalls = result.toolCalls) == null ? void 0 : _result$toolCalls.find(function (_ref3) {
+                  var toolName = _ref3.toolName;
+                  return toolName === 'answer';
+                });
+              }
               return _context.abrupt("return", {
-                message: result == null ? void 0 : result.text
+                message: result == null ? void 0 : result.text,
+                answer: (_answer = answer) == null ? void 0 : _answer.args
               });
             case 14:
               _context.next = 16;
@@ -5838,10 +5842,15 @@ function getAgentSystemApis(_ref) {
               });
             case 19:
               run = _context.sent;
+              message = run == null || (_run$content = run.content) == null || (_run$content = _run$content[0]) == null || (_run$content = _run$content.text) == null ? void 0 : _run$content.value;
+              _answer2 = run == null || (_run$content2 = run.content) == null ? void 0 : _run$content2.find(function (m) {
+                return m.toolName === 'answer';
+              }).args;
               return _context.abrupt("return", {
-                message: run == null || (_run$content = run.content) == null || (_run$content = _run$content[0]) == null || (_run$content = _run$content.text) == null ? void 0 : _run$content.value
+                message: message,
+                answer: _answer2
               });
-            case 21:
+            case 23:
             case "end":
               return _context.stop();
           }
@@ -6516,7 +6525,7 @@ function createAgent(_ref6) {
   });
   return /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref7) {
-      var prompt, argsForExecute;
+      var prompt, argsForExecute, messages;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -6553,19 +6562,20 @@ function createAgent(_ref6) {
                 return onStepFinish;
               }()
             };
-            _context4.next = 4;
+            messages = [].concat(context, [{
+              role: 'user',
+              content: prompt
+            }, {
+              role: 'system',
+              content: agent_instructions
+            }]);
+            _context4.next = 5;
             return generateText(_extends({
-              messages: [].concat(context, [{
-                role: 'user',
-                content: prompt
-              }, {
-                role: 'system',
-                content: agent_instructions
-              }])
+              messages: messages
             }, argsForExecute));
-          case 4:
-            return _context4.abrupt("return", _context4.sent);
           case 5:
+            return _context4.abrupt("return", _context4.sent);
+          case 6:
           case "end":
             return _context4.stop();
         }
@@ -6590,7 +6600,7 @@ function getAgent(_x) {
 function _getAgent() {
   _getAgent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
     var _agent$model$provider, _agent$model$provider2;
-    var connectionId, agent, apis, logger, tools, toolMap, getAssistantAgent, assistant, _agent$model2, keyToModel, _tools, _toolMap, resultTool, schema, _agent$model;
+    var connectionId, agent, apis, logger, tools, toolMap, getAssistantAgent, assistant, _agent$model2, keyToModel, _tools, _toolMap, resultTool, _agent$outputs, schema, _agent$model;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -6691,7 +6701,7 @@ function _getAgent() {
           }, {});
           resultTool = undefined;
           if (agent.outputs.structured) {
-            schema = Object.entries(agent.outputs.structured.schema).reduce(function (memo, _ref5) {
+            schema = Object.entries(agent.outputs.structured).reduce(function (memo, _ref5) {
               var k = _ref5[0],
                 v = _ref5[1];
               if (v.type === 'string') {
@@ -6707,7 +6717,7 @@ function _getAgent() {
               return memo;
             }, {});
             resultTool = {
-              description: agent.outputs.structured.description,
+              description: ((_agent$outputs = agent.outputs) == null ? void 0 : _agent$outputs.description) || 'Structured Output',
               parameters: z.object(schema)
             };
           }