@mastra/inngest 0.10.5 → 0.10.6-alpha.1

package/dist/index.js

@@ -1,7 +1,7 @@
 import { randomUUID } from 'crypto';
 import { subscribe } from '@inngest/realtime';
-import { Agent, Tool } from '@mastra/core';
 import { RuntimeContext } from '@mastra/core/di';
+import { Tool } from '@mastra/core/tools';
 import { Run, Workflow, DefaultExecutionEngine } from '@mastra/core/workflows';
 import { EMITTER_SYMBOL } from '@mastra/core/workflows/_constants';
 import { serve as serve$1 } from 'inngest/hono';
@@ -43,7 +43,7 @@ var InngestRun = class extends Run {
   }
   async getRunOutput(eventId) {
     let runs = await this.getRuns(eventId);
-    while (runs?.[0]?.status !== "Completed") {
+    while (runs?.[0]?.status !== "Completed" || runs?.[0]?.event_id !== eventId) {
       await new Promise((resolve) => setTimeout(resolve, 1e3));
       runs = await this.getRuns(eventId);
       if (runs?.[0]?.status === "Failed" || runs?.[0]?.status === "Cancelled") {
@@ -52,6 +52,12 @@ var InngestRun = class extends Run {
     }
     return runs?.[0];
   }
+  async sendEvent(event, data) {
+    await this.inngest.send({
+      name: `user-event-${event}`,
+      data
+    });
+  }
   async start({
     inputData
   }) {
@@ -89,6 +95,17 @@ var InngestRun = class extends Run {
     return result;
   }
   async resume(params) {
+    const p = this._resume(params).then((result) => {
+      if (result.status !== "suspended") {
+        this.closeStreamAction?.().catch(() => {
+        });
+      }
+      return result;
+    });
+    this.executionResults = p;
+    return p;
+  }
+  async _resume(params) {
     const steps = (Array.isArray(params.step) ? params.step : [params.step]).map(
       (step) => typeof step === "string" ? step : step?.id
     );
@@ -122,25 +139,60 @@ var InngestRun = class extends Run {
     }
     return result;
   }
-  watch(cb) {
+  watch(cb, type = "watch") {
+    let active = true;
     const streamPromise = subscribe(
       {
         channel: `workflow:${this.workflowId}:${this.runId}`,
-        topics: ["watch"],
+        topics: [type],
         app: this.inngest
       },
       (message) => {
-        cb(message.data);
+        if (active) {
+          cb(message.data);
+        }
       }
     );
     return () => {
-      streamPromise.then((stream) => {
-        stream.cancel();
+      active = false;
+      streamPromise.then(async (stream) => {
+        return stream.cancel();
       }).catch((err) => {
         console.error(err);
       });
     };
   }
+  stream({ inputData, runtimeContext } = {}) {
+    const { readable, writable } = new TransformStream();
+    const writer = writable.getWriter();
+    const unwatch = this.watch(async (event) => {
+      try {
+        await writer.write(event);
+      } catch {
+      }
+    }, "watch-v2");
+    this.closeStreamAction = async () => {
+      unwatch();
+      try {
+        await writer.close();
+      } catch (err) {
+        console.error("Error closing stream:", err);
+      } finally {
+        writer.releaseLock();
+      }
+    };
+    this.executionResults = this.start({ inputData, runtimeContext }).then((result) => {
+      if (result.status !== "suspended") {
+        this.closeStreamAction?.().catch(() => {
+        });
+      }
+      return result;
+    });
+    return {
+      stream: readable,
+      getWorkflowState: () => this.executionResults
+    };
+  }
 };
 var InngestWorkflow = class _InngestWorkflow extends Workflow {
   #mastra;
@@ -248,12 +300,18 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
             try {
               await publish({
                 channel: `workflow:${this.id}:${runId}`,
-                topic: "watch",
+                topic: event2,
                 data
               });
             } catch (err) {
               this.logger.error("Error emitting event: " + (err?.stack ?? err?.message ?? err));
             }
+          },
+          on: (_event, _callback) => {
+          },
+          off: (_event, _callback) => {
+          },
+          once: (_event, _callback) => {
           }
         };
         const engine = new InngestExecutionEngine(this.#mastra, step, attempt);
@@ -291,8 +349,14 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
     return [this.getFunction(), ...this.getNestedFunctions(this.executionGraph.steps)];
   }
 };
+function isAgent(params) {
+  return params?.component === "AGENT";
+}
+function isTool(params) {
+  return params instanceof Tool;
+}
 function createStep(params) {
-  if (params instanceof Agent) {
+  if (isAgent(params)) {
     return {
       id: params.name,
       // @ts-ignore
@@ -357,7 +421,7 @@ function createStep(params) {
       }
     };
   }
-  if (params instanceof Tool) {
+  if (isTool(params)) {
     if (!params.inputSchema || !params.outputSchema) {
       throw new Error("Tool must have input and output schemas defined");
     }
@@ -423,6 +487,18 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     this.inngestStep = inngestStep;
     this.inngestAttempts = inngestAttempts;
   }
+  async execute(params) {
+    await params.emitter.emit("watch-v2", {
+      type: "start",
+      payload: { runId: params.runId }
+    });
+    const result = await super.execute(params);
+    await params.emitter.emit("watch-v2", {
+      type: "finish",
+      payload: { runId: params.runId }
+    });
+    return result;
+  }
   async fmtReturnValue(executionSpan, emitter, stepResults, lastOutput, error) {
     const base = {
       status: lastOutput.status,
@@ -506,6 +582,16 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
   async executeSleep({ id, duration }) {
     await this.inngestStep.sleep(id, duration);
   }
+  async executeWaitForEvent({ event, timeout }) {
+    const eventData = await this.inngestStep.waitForEvent(`user-event-${event}`, {
+      event: `user-event-${event}`,
+      timeout: timeout ?? 5e3
+    });
+    if (eventData === null) {
+      throw "Timeout waiting for event";
+    }
+    return eventData?.data;
+  }
   async executeStep({
     step,
     stepResults,
@@ -515,9 +601,10 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     emitter,
     runtimeContext
   }) {
-    await this.inngestStep.run(
+    const startedAt = await this.inngestStep.run(
       `workflow.${executionContext.workflowId}.run.${executionContext.runId}.step.${step.id}.running_ev`,
       async () => {
+        const startedAt2 = Date.now();
         await emitter.emit("watch", {
           type: "watch",
           payload: {
@@ -539,6 +626,13 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           },
           eventTimestamp: Date.now()
         });
+        await emitter.emit("watch-v2", {
+          type: "step-start",
+          payload: {
+            id: step.id
+          }
+        });
+        return startedAt2;
       }
     );
     if (step instanceof InngestWorkflow) {
@@ -599,6 +693,13 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               },
               eventTimestamp: Date.now()
             });
+            await emitter.emit("watch-v2", {
+              type: "step-result",
+              payload: {
+                id: step.id,
+                status: "failed"
+              }
+            });
             return { executionContext, result: { status: "failed", error: result?.error } };
           } else if (result.status === "suspended") {
             const suspendedSteps = Object.entries(result.steps).filter(([_stepName, stepResult]) => {
@@ -625,6 +726,12 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
                 },
                 eventTimestamp: Date.now()
               });
+              await emitter.emit("watch-v2", {
+                type: "step-suspended",
+                payload: {
+                  id: step.id
+                }
+              });
               return {
                 executionContext,
                 result: {
@@ -675,6 +782,13 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             },
             eventTimestamp: Date.now()
           });
+          await emitter.emit("watch-v2", {
+            type: "step-finish",
+            payload: {
+              id: step.id,
+              metadata: {}
+            }
+          });
           return { executionContext, result: { status: "success", output: result?.result } };
         }
       );
@@ -714,12 +828,37 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             step: this.inngestStep
           }
         });
-        execResults = { status: "success", output: result };
+        const endedAt = Date.now();
+        execResults = {
+          status: "success",
+          output: result,
+          startedAt,
+          endedAt,
+          payload: prevOutput,
+          resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
+          resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
+        };
       } catch (e) {
-        execResults = { status: "failed", error: e instanceof Error ? e.message : String(e) };
+        execResults = {
+          status: "failed",
+          payload: prevOutput,
+          error: e instanceof Error ? e.message : String(e),
+          endedAt: Date.now(),
+          startedAt,
+          resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
+          resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
+        };
       }
       if (suspended) {
-        execResults = { status: "suspended", payload: suspended.payload };
+        execResults = {
+          status: "suspended",
+          suspendedPayload: suspended.payload,
+          payload: prevOutput,
+          suspendedAt: Date.now(),
+          startedAt,
+          resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
+          resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
+        };
       }
       if (execResults.status === "failed") {
         if (executionContext.retryConfig.attempts > 0 && this.inngestAttempts < executionContext.retryConfig.attempts) {
@@ -731,18 +870,43 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         payload: {
           currentStep: {
             id: step.id,
-            status: execResults.status,
-            output: execResults.output
+            ...execResults
           },
           workflowState: {
             status: "running",
-            steps: stepResults,
+            steps: { ...stepResults, [step.id]: execResults },
             result: null,
             error: null
           }
         },
         eventTimestamp: Date.now()
       });
+      if (execResults.status === "suspended") {
+        await emitter.emit("watch-v2", {
+          type: "step-suspended",
+          payload: {
+            id: step.id,
+            status: execResults.status,
+            output: execResults.status === "success" ? execResults?.output : void 0
+          }
+        });
+      } else {
+        await emitter.emit("watch-v2", {
+          type: "step-result",
+          payload: {
+            id: step.id,
+            status: execResults.status,
+            output: execResults.status === "success" ? execResults?.output : void 0
+          }
+        });
+        await emitter.emit("watch-v2", {
+          type: "step-finish",
+          payload: {
+            id: step.id,
+            metadata: {}
+          }
+        });
+      }
       return { result: execResults, executionContext, stepResults };
     });
     Object.assign(executionContext.suspendedPaths, stepRes.executionContext.suspendedPaths);
@@ -860,7 +1024,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     if (hasFailed) {
       execResults = { status: "failed", error: hasFailed.result.error };
     } else if (hasSuspended) {
-      execResults = { status: "suspended", payload: hasSuspended.result.payload };
+      execResults = { status: "suspended", payload: hasSuspended.result.suspendPayload };
     } else {
       execResults = {
         status: "success",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/inngest",
-  "version": "0.10.5",
+  "version": "0.10.6-alpha.1",
   "description": "Mastra Inngest integration",
   "type": "module",
   "main": "dist/index.js",
@@ -38,9 +38,9 @@
     "typescript": "^5.8.3",
     "vitest": "^2.1.9",
     "@internal/lint": "0.0.13",
-    "@mastra/core": "0.10.6",
-    "@mastra/libsql": "0.10.3",
-    "@mastra/deployer": "0.10.6"
+    "@mastra/core": "0.10.7-alpha.1",
+    "@mastra/deployer": "0.10.7-alpha.1",
+    "@mastra/libsql": "0.10.4-alpha.1"
   },
   "peerDependencies": {
     "@mastra/core": "^0.10.2-alpha.0"