@mastra/core 0.1.25 → 0.1.26

package/dist/agents/openai/assistant.d.ts

@@ -52,13 +52,15 @@ export declare function getAssistantAgentHandler(logger?: Logger<{
     }) => Promise<OpenAI.Beta.Threads.Runs.Run & {
         _request_id?: string | null;
     }>;
-    handleRunStatus: ({ threadId, run, }: {
+    handleRunStatus: ({ threadId, run, callback, }: {
         run: OpenAI.Beta.Threads.Runs.Run;
         threadId: string;
+        callback?: (run: OpenAI.Beta.Threads.Run) => void;
     }) => Promise<any>;
-    handleRequiresAction: ({ threadId, run, }: {
+    handleRequiresAction: ({ threadId, run, callback, }: {
         threadId: string;
         run: OpenAI.Beta.Threads.Runs.Run;
+        callback?: (run: OpenAI.Beta.Threads.Run) => void;
     }) => Promise<any>;
     createUserMessage: ({ threadId, content, }: {
         threadId: string;
@@ -66,9 +68,10 @@ export declare function getAssistantAgentHandler(logger?: Logger<{
     }) => Promise<OpenAI.Beta.Threads.Messages.Message & {
         _request_id?: string | null;
     }>;
-    watchRun: ({ runId, threadId, }: {
+    watchRun: ({ runId, threadId, callback, }: {
         runId?: string;
         threadId: string;
+        callback?: (run: OpenAI.Beta.Threads.Run) => void;
     }) => Promise<any>;
 }>;
 //# sourceMappingURL=assistant.d.ts.map

package/dist/agents/openai/assistant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assistant.d.ts","sourceRoot":"","sources":["../../../src/agents/openai/assistant.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAOrD,wBAAgB,2BAA2B,CACzC,MAAM,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,gBAAgB,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,4DAQC;IACD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC;CACrE;;GA8BF;AAED,wBAAgB,2BAA2B,CACzC,MAAM,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,gBAAgB,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,yEASC;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC;CACrE,mBA6BF;AAED,wBAAgB,wBAAwB,CACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,gBAAgB,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,mCAMC;IACD,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CACnC;;;;kCA2Pe,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE;;;iCAOjB;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE;mCAlBtD;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;KACf;;;0CA7OE;QACD,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;QAClC,QAAQ,EAAE,MAAM,CAAC;KAClB,KAAG,OAAO,CAAC,GAAG,CAAC;+CAkCb;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;KACnC,KAAG,OAAO,CAAC,GAAG,CAAC;gDAiOX;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;KACjB;;;qCAUE;QACD,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;KAClB;GAkCN"}
+{"version":3,"file":"assistant.d.ts","sourceRoot":"","sources":["../../../src/agents/openai/assistant.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAOrD,wBAAgB,2BAA2B,CACzC,MAAM,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,gBAAgB,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,4DAQC;IACD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC;CACrE;;GA8BF;AAED,wBAAgB,2BAA2B,CACzC,MAAM,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,gBAAgB,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,yEASC;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC;CACrE,mBA+BF;AAED,wBAAgB,wBAAwB,CACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,gBAAgB,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC,mCAMC;IACD,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CACnC;;;;kCA8Pe,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE;;;iCAOjB;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE;mCAlBtD;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;KACf;;;oDA/OE;QACD,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;QAClC,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,IAAI,CAAC;KACnD,KAAG,OAAO,CAAC,GAAG,CAAC;yDAoCb;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;QAClC,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,IAAI,CAAC;KACnD,KAAG,OAAO,CAAC,GAAG,CAAC;gDA+NX;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;KACjB;;;+CAWE;QACD,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,IAAI,CAAC;KACnD;GAkCN"}

package/dist/agents/vector-sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vector-sync.d.ts","sourceRoot":"","sources":["../../src/agents/vector-sync.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,cAAc,EAAkB,MAAM,UAAU,CAAC;AAkM1D,wBAAsB,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,iBAY5D;AAGD,wBAAsB,wBAAwB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,iBASpE;AAGD,wBAAsB,iBAAiB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,iBAU7D;AAED,wBAAsB,iBAAiB,CAAC,EACtC,eAAe,EACf,IAAQ,EACR,SAAS,EACT,OAAO,EACP,UAAU,GACX,EAAE;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,kIAwBA;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,kBAAkB,8BA4B9B,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,GACP,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,cAAc,EAAE,CA2DnB;AAED,wBAAgB,oBAAoB;;;;EAOnC;AAED,wBAAgB,uBAAuB;;;;EAOtC;AAED,wBAAgB,eAAe;;;;EAM9B;AAED,wBAAsB,wCAAwC,CAAC,EAC7D,MAAM,GACP,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;CAChB,iBA6BA"}
+{"version":3,"file":"vector-sync.d.ts","sourceRoot":"","sources":["../../src/agents/vector-sync.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,cAAc,EAAkB,MAAM,UAAU,CAAC;AAkM1D,wBAAsB,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,iBAY5D;AAGD,wBAAsB,wBAAwB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,iBASpE;AAGD,wBAAsB,iBAAiB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,iBAU7D;AAED,wBAAsB,iBAAiB,CAAC,EACtC,eAAe,EACf,IAAQ,EACR,SAAS,EACT,OAAO,EACP,UAAU,GACX,EAAE;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,kIAwBA;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,kBAAkB,8BA4B9B,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,EACjC,MAAM,GACP,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,cAAc,EAAE,CA2DnB;AAED,wBAAgB,oBAAoB;;;;EAOnC;AAED,wBAAgB,uBAAuB;;;;EAOtC;AAED,wBAAgB,eAAe;;;;EAM9B;AAED,wBAAsB,wCAAwC,CAAC,EAC7D,MAAM,GACP,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;CAChB,iBA2BA"}

package/dist/core.cjs.development.js

@@ -1890,7 +1890,8 @@ var makeCallback = function makeCallback(framework) {
 var APP_ID = 'mastra';
 var client$1 = /*#__PURE__*/new inngest.Inngest({
   id: APP_ID,
-  eventKey: process.env.INNGEST_EVENT_KEY
+  eventKey: process.env.INNGEST_EVENT_KEY,
+  baseUrl: process.env.INNGEST_URL
 });
 
 function readBlueprintSync(filePath) {
@@ -4638,11 +4639,8 @@ function _blueprintRunner() {
           });
         case 19:
           ranSuccessfully = _context4.sent;
-          console.log('====Full context====', {
-            fullCtx: fullCtx
-          });
           if (!ranSuccessfully) {
-            _context4.next = 26;
+            _context4.next = 25;
             break;
           }
           logger.info({
@@ -4655,7 +4653,7 @@ function _blueprintRunner() {
           return _context4.abrupt("return", {
             fullCtx: fullCtx
           });
-        case 26:
+        case 25:
           logger.error({
             type: RegisteredLogger.WORKFLOW,
             destinationPath: "" + blueprint.id,
@@ -4666,7 +4664,7 @@ function _blueprintRunner() {
           return _context4.abrupt("return", {
             fullCtx: null
           });
-        case 28:
+        case 27:
         case "end":
           return _context4.stop();
       }
@@ -5746,7 +5744,6 @@ function _syncAndWriteVectorProviderIndexesToLocal() {
       while (1) switch (_context15.prev = _context15.next) {
         case 0:
           mastra = _ref14.mastra;
-          // TODO: Return in prod ? or do somethif different
           vectorProviders = mastra.config.agents.vectorProvider;
           pullVectorProviderIndexes = /*#__PURE__*/function () {
             var _ref16 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(_ref15) {
@@ -5885,9 +5882,9 @@ 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) {
+              _answer2 = run == null || (_run$content2 = run.content) == null || (_run$content2 = _run$content2.find(function (m) {
                 return m.toolName === 'answer';
-              }).args;
+              })) == null ? void 0 : _run$content2.args;
               return _context.abrupt("return", {
                 message: message,
                 answer: _answer2
@@ -5915,18 +5912,18 @@ if (process.env.OPENAI_API_KEY) {
 function createAssistantAgentHandler(logger) {
   return /*#__PURE__*/function () {
     var _createAssistantAgent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var name, instructions, model, tools, response_format, assistant;
+      var name, instructions, model, tools, assistant;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            name = _ref.name, instructions = _ref.instructions, model = _ref.model, tools = _ref.tools, response_format = _ref.response_format;
+            name = _ref.name, instructions = _ref.instructions, model = _ref.model, tools = _ref.tools;
             _context.next = 3;
             return client.beta.assistants.create({
               name: name,
               model: model,
               instructions: instructions,
-              tools: tools,
-              response_format: response_format
+              tools: tools
+              //response_format,
             });
           case 3:
             assistant = _context.sent;
@@ -5965,15 +5962,16 @@ function updateAssistantAgentHandler(logger) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             assistantId = _ref2.assistantId, name = _ref2.name, instructions = _ref2.instructions, model = _ref2.model, tools = _ref2.tools, response_format = _ref2.response_format;
-            _context2.next = 3;
+            console.log('response_format', response_format);
+            _context2.next = 4;
             return client.beta.assistants.update(assistantId, {
               name: name,
               model: model,
               instructions: instructions,
-              tools: tools,
-              response_format: response_format
+              tools: tools
+              //response_format,
             });
-          case 3:
+          case 4:
             assistant = _context2.sent;
             logger == null || logger.info({
               destinationPath: "" + assistant.id,
@@ -5990,7 +5988,7 @@ function updateAssistantAgentHandler(logger) {
                 }
               }, null, 2)
             });
-          case 5:
+          case 6:
           case "end":
             return _context2.stop();
         }
@@ -6016,11 +6014,11 @@ function getAssistantAgentHandler(logger) {
             agent = _context11.sent;
             handleRunStatus = /*#__PURE__*/function () {
               var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
-                var threadId, run, _messages$data, messages;
+                var threadId, run, callback, _messages$data, messages;
                 return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                   while (1) switch (_context3.prev = _context3.next) {
                     case 0:
-                      threadId = _ref4.threadId, run = _ref4.run;
+                      threadId = _ref4.threadId, run = _ref4.run, callback = _ref4.callback;
                       if (!(run.status === 'completed')) {
                         _context3.next = 8;
                         break;
@@ -6032,17 +6030,19 @@ function getAssistantAgentHandler(logger) {
                       return _context3.abrupt("return", (_messages$data = messages.data) == null ? void 0 : _messages$data[0]);
                     case 8:
                       if (!(run.status === 'requires_action')) {
-                        _context3.next = 14;
+                        _context3.next = 15;
                         break;
                       }
-                      _context3.next = 11;
+                      callback == null || callback(run);
+                      _context3.next = 12;
                       return handleRequiresAction({
                         run: run,
-                        threadId: threadId
+                        threadId: threadId,
+                        callback: callback
                       });
-                    case 11:
+                    case 12:
                       return _context3.abrupt("return", _context3.sent);
-                    case 14:
+                    case 15:
                       console.error('Run did not complete:', run);
                       logger == null || logger.error({
                         destinationPath: "" + id,
@@ -6057,7 +6057,7 @@ function getAssistantAgentHandler(logger) {
                         }, null, 2)
                       });
                       return _context3.abrupt("return", run == null ? void 0 : run.last_error);
-                    case 17:
+                    case 18:
                     case "end":
                       return _context3.stop();
                   }
@@ -6069,13 +6069,13 @@ function getAssistantAgentHandler(logger) {
             }();
             handleRequiresAction = /*#__PURE__*/function () {
               var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref6) {
-                var threadId, run, toolOutputs;
+                var threadId, run, callback, toolOutputs;
                 return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                   while (1) switch (_context5.prev = _context5.next) {
                     case 0:
-                      threadId = _ref6.threadId, run = _ref6.run;
+                      threadId = _ref6.threadId, run = _ref6.run, callback = _ref6.callback;
                       if (!(run.required_action && run.required_action.submit_tool_outputs && run.required_action.submit_tool_outputs.tool_calls)) {
-                        _context5.next = 23;
+                        _context5.next = 22;
                         break;
                       }
                       _context5.t0 = _.compact;
@@ -6192,19 +6192,19 @@ function getAssistantAgentHandler(logger) {
                       });
                       return _context5.abrupt("return", handleRunStatus({
                         threadId: threadId,
-                        run: run
+                        run: run,
+                        callback: callback
                       }));
                     case 11:
                       if (!(toolOutputs && (toolOutputs == null ? void 0 : toolOutputs.length) > 0)) {
-                        _context5.next = 20;
+                        _context5.next = 19;
                         break;
                       }
-                      console.log(toolOutputs, '###### YOOOOOO');
-                      _context5.next = 15;
+                      _context5.next = 14;
                       return client.beta.threads.runs.submitToolOutputsAndPoll(threadId, run.id, {
                         tool_outputs: toolOutputs
                       });
-                    case 15:
+                    case 14:
                       run = _context5.sent;
                       logger == null || logger.info({
                         destinationPath: "" + id,
@@ -6218,9 +6218,9 @@ function getAssistantAgentHandler(logger) {
                         }, null, 2)
                       });
                       console.log('Tool outputs submitted successfully.');
-                      _context5.next = 22;
+                      _context5.next = 21;
                       break;
-                    case 20:
+                    case 19:
                       logger == null || logger.info({
                         destinationPath: "" + id,
                         statusCode: 404,
@@ -6231,12 +6231,13 @@ function getAssistantAgentHandler(logger) {
                         }, null, 2)
                       });
                       console.log('No tool outputs to submit.');
-                    case 22:
+                    case 21:
                       return _context5.abrupt("return", handleRunStatus({
                         threadId: threadId,
-                        run: run
+                        run: run,
+                        callback: callback
                       }));
-                    case 23:
+                    case 22:
                     case "end":
                       return _context5.stop();
                   }
@@ -6346,11 +6347,11 @@ function getAssistantAgentHandler(logger) {
               }(),
               watchRun: function () {
                 var _watchRun = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_ref13) {
-                  var runId, threadId, run;
+                  var runId, threadId, callback, run;
                   return _regeneratorRuntime().wrap(function _callee10$(_context10) {
                     while (1) switch (_context10.prev = _context10.next) {
                       case 0:
-                        runId = _ref13.runId, threadId = _ref13.threadId;
+                        runId = _ref13.runId, threadId = _ref13.threadId, callback = _ref13.callback;
                         if (!runId) {
                           _context10.next = 7;
                           break;
@@ -6389,7 +6390,8 @@ function getAssistantAgentHandler(logger) {
                       case 11:
                         return _context10.abrupt("return", handleRunStatus({
                           threadId: threadId,
-                          run: run
+                          run: run,
+                          callback: callback
                         }));
                       case 12:
                       case "end":
@@ -7547,13 +7549,16 @@ var Mastra = /*#__PURE__*/function () {
             inngestApiToken = (_ref22 = (_this$config$runner$s = (_this$config$runner2 = this.config.runner) == null ? void 0 : _this$config$runner2.signingKey) != null ? _this$config$runner$s : process.env.INNGEST_SIGNING_KEY) != null ? _ref22 : '123';
             startTime = Date.now();
             _poll = /*#__PURE__*/function () {
-              var _ref23 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-                var response, obj, data, error, lastRun, elapsedTime;
+              var _ref23 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(lastRunId) {
+                var response, obj, data, error, lastRunning, defaultLastRun, lastRun, elapsedTime;
                 return _regeneratorRuntime().wrap(function _callee8$(_context8) {
                   while (1) switch (_context8.prev = _context8.next) {
                     case 0:
-                      _context8.prev = 0;
-                      _context8.next = 3;
+                      if (lastRunId === void 0) {
+                        lastRunId = '';
+                      }
+                      _context8.prev = 1;
+                      _context8.next = 4;
                       return fetch(inngestApiUrl + "/v1/events/" + id + "/runs", {
                         method: 'GET',
                         headers: {
@@ -7561,16 +7566,16 @@ var Mastra = /*#__PURE__*/function () {
                           Authorization: "Bearer " + inngestApiToken
                         }
                       });
-                    case 3:
+                    case 4:
                       response = _context8.sent;
                       console.log("Polling for event " + id + "...", response.ok);
                       if (!response.ok) {
                         _context8.next = 28;
                         break;
                       }
-                      _context8.next = 8;
+                      _context8.next = 9;
                       return response.json();
-                    case 8:
+                    case 9:
                       obj = _context8.sent;
                       console.log({
                         obj: obj
@@ -7578,42 +7583,45 @@ var Mastra = /*#__PURE__*/function () {
                       data = obj.data, error = obj.error;
                       console.log("Got data for event " + id + "...", data, error);
                       if (!error) {
-                        _context8.next = 15;
+                        _context8.next = 16;
                         break;
                       }
                       console.error(error);
                       return _context8.abrupt("return", null);
-                    case 15:
+                    case 16:
                       if (!((data == null ? void 0 : data.length) === 0)) {
-                        _context8.next = 19;
+                        _context8.next = 20;
                         break;
                       }
-                      _context8.next = 18;
+                      _context8.next = 19;
                       return new Promise(function (resolve) {
                         return setTimeout(resolve, interval);
                       });
-                    case 18:
-                      return _context8.abrupt("return", _poll());
                     case 19:
-                      lastRun = data == null ? void 0 : data[0];
-                      console.log(lastRun);
-                      if (lastRun) {
-                        _context8.next = 23;
-                        break;
-                      }
-                      return _context8.abrupt("return", null);
-                    case 23:
-                      if (!(lastRun.status === 'Running')) {
-                        _context8.next = 27;
+                      return _context8.abrupt("return", _poll());
+                    case 20:
+                      lastRunning = data == null ? void 0 : data.find(function (run) {
+                        return run.status === 'Running';
+                      });
+                      if (!lastRunning) {
+                        _context8.next = 25;
                         break;
                       }
-                      _context8.next = 26;
+                      _context8.next = 24;
                       return new Promise(function (resolve) {
                         return setTimeout(resolve, interval);
                       });
-                    case 26:
-                      return _context8.abrupt("return", _poll());
-                    case 27:
+                    case 24:
+                      return _context8.abrupt("return", _poll(lastRunning.run_id));
+                    case 25:
+                      defaultLastRun = data[0];
+                      if (lastRunId) {
+                        lastRun = data == null ? void 0 : data.find(function (run) {
+                          return run.run_id === lastRunId;
+                        });
+                      } else {
+                        lastRun = defaultLastRun;
+                      }
                       return _context8.abrupt("return", {
                         status: lastRun.status,
                         output: lastRun.output,
@@ -7625,7 +7633,7 @@ var Mastra = /*#__PURE__*/function () {
                       break;
                     case 30:
                       _context8.prev = 30;
-                      _context8.t0 = _context8["catch"](0);
+                      _context8.t0 = _context8["catch"](1);
                       console.error("Request failed: " + _context8.t0);
                     case 33:
                       // Check if timeout has been reached
@@ -7647,9 +7655,9 @@ var Mastra = /*#__PURE__*/function () {
                     case "end":
                       return _context8.stop();
                   }
-                }, _callee8, null, [[0, 30]]);
+                }, _callee8, null, [[1, 30]]);
               }));
-              return function poll() {
+              return function poll(_x8) {
                 return _ref23.apply(this, arguments);
               };
             }();
@@ -7725,7 +7733,7 @@ var Mastra = /*#__PURE__*/function () {
                     }
                   }, _callee10);
                 }));
-                function subscribe(_x9) {
+                function subscribe(_x10) {
                   return _subscribe.apply(this, arguments);
                 }
                 return subscribe;
@@ -7762,7 +7770,7 @@ var Mastra = /*#__PURE__*/function () {
                     }
                   }, _callee11);
                 }));
-                function subscribe(_x10) {
+                function subscribe(_x11) {
                   return _subscribe2.apply(this, arguments);
                 }
                 return subscribe;
@@ -7779,7 +7787,7 @@ var Mastra = /*#__PURE__*/function () {
         }
       }, _callee12, this, [[1, 20]]);
     }));
-    function triggerEvent(_x8) {
+    function triggerEvent(_x9) {
       return _triggerEvent.apply(this, arguments);
     }
     return triggerEvent;
@@ -7824,7 +7832,7 @@ var Mastra = /*#__PURE__*/function () {
         }
       }, _callee13, this);
     }));
-    function triggerSystemEvent(_x11) {
+    function triggerSystemEvent(_x12) {
       return _triggerSystemEvent.apply(this, arguments);
     }
     return triggerSystemEvent;
@@ -7883,9 +7891,7 @@ var Mastra = /*#__PURE__*/function () {
               var v = _ref30[1];
               return _extends({}, acc, v);
             }, {});
-            console.log('got finalApis===', {
-              finalApis: finalApis
-            });
+            console.log('got finalApis===');
             return _context14.abrupt("return", getAgent({
               connectionId: connectionId,
               agent: agentBlueprint,
@@ -7898,7 +7904,7 @@ var Mastra = /*#__PURE__*/function () {
         }
       }, _callee14, this);
     }));
-    function getAgent$1(_x12) {
+    function getAgent$1(_x13) {
       return _getAgent2.apply(this, arguments);
     }
     return getAgent$1;
@@ -7908,11 +7914,11 @@ var Mastra = /*#__PURE__*/function () {
       return _regeneratorRuntime().wrap(function _callee15$(_context15) {
         while (1) switch (_context15.prev = _context15.next) {
           case 0:
-            _context15.next = 2;
+            _context15.next = 3;
             return syncAndWriteVectorProviderIndexesToLocal({
               mastra: this
             });
-          case 2:
+          case 3:
           case "end":
             return _context15.stop();
         }