@mastra/inngest 1.0.0-beta.1 → 1.0.0-beta.3

package/CHANGELOG.md

@@ -1,5 +1,59 @@
 # @mastra/inngest
 
+## 1.0.0-beta.3
+
+### Patch Changes
+
+- - Fix tool suspension throwing error when `outputSchema` is passed to tool during creation ([#10444](https://github.com/mastra-ai/mastra/pull/10444))
+  - Pass `suspendSchema` and `resumeSchema` from tool into step created when creating step from tool
+- Updated dependencies [[`21a15de`](https://github.com/mastra-ai/mastra/commit/21a15de369fe82aac26bb642ed7be73505475e8b), [`feb7ee4`](https://github.com/mastra-ai/mastra/commit/feb7ee4d09a75edb46c6669a3beaceec78811747), [`b0e2ea5`](https://github.com/mastra-ai/mastra/commit/b0e2ea5b52c40fae438b9e2f7baee6f0f89c5442), [`c456e01`](https://github.com/mastra-ai/mastra/commit/c456e0149e3c176afcefdbd9bb1d2c5917723725), [`ab035c2`](https://github.com/mastra-ai/mastra/commit/ab035c2ef6d8cc7bb25f06f1a38508bd9e6f126b), [`1a46a56`](https://github.com/mastra-ai/mastra/commit/1a46a566f45a3fcbadc1cf36bf86d351f264bfa3), [`3cf540b`](https://github.com/mastra-ai/mastra/commit/3cf540b9fbfea8f4fc8d3a2319a4e6c0b0cbfd52), [`1c6ce51`](https://github.com/mastra-ai/mastra/commit/1c6ce51f875915ab57fd36873623013699a2a65d), [`898a972`](https://github.com/mastra-ai/mastra/commit/898a9727d286c2510d6b702dfd367e6aaf5c6b0f), [`a97003a`](https://github.com/mastra-ai/mastra/commit/a97003aa1cf2f4022a41912324a1e77263b326b8), [`ccc141e`](https://github.com/mastra-ai/mastra/commit/ccc141ed27da0abc3a3fc28e9e5128152e8e37f4), [`fe3b897`](https://github.com/mastra-ai/mastra/commit/fe3b897c2ccbcd2b10e81b099438c7337feddf89), [`00123ba`](https://github.com/mastra-ai/mastra/commit/00123ba96dc9e5cd0b110420ebdba56d8f237b25), [`29c4309`](https://github.com/mastra-ai/mastra/commit/29c4309f818b24304c041bcb4a8f19b5f13f6b62), [`16785ce`](https://github.com/mastra-ai/mastra/commit/16785ced928f6f22638f4488cf8a125d99211799), [`de8239b`](https://github.com/mastra-ai/mastra/commit/de8239bdcb1d8c0cfa06da21f1569912a66bbc8a), [`b5e6cd7`](https://github.com/mastra-ai/mastra/commit/b5e6cd77fc8c8e64e0494c1d06cee3d84e795d1e), [`3759cb0`](https://github.com/mastra-ai/mastra/commit/3759cb064935b5f74c65ac2f52a1145f7352899d), [`651e772`](https://github.com/mastra-ai/mastra/commit/651e772eb1475fb13e126d3fcc01751297a88214), [`b61b93f`](https://github.com/mastra-ai/mastra/commit/b61b93f9e058b11dd2eec169853175d31dbdd567), [`bae33d9`](https://github.com/mastra-ai/mastra/commit/bae33d91a63fbb64d1e80519e1fc1acaed1e9013), [`c0b731f`](https://github.com/mastra-ai/mastra/commit/c0b731fb27d712dc8582e846df5c0332a6a0c5ba), [`43ca8f2`](https://github.com/mastra-ai/mastra/commit/43ca8f2c7334851cc7b4d3d2f037d8784bfbdd5f), [`2ca67cc`](https://github.com/mastra-ai/mastra/commit/2ca67cc3bb1f6a617353fdcab197d9efebe60d6f), [`9e67002`](https://github.com/mastra-ai/mastra/commit/9e67002b52c9be19936c420a489dbee9c5fd6a78), [`35edc49`](https://github.com/mastra-ai/mastra/commit/35edc49ac0556db609189641d6341e76771b81fc)]:
+  - @mastra/core@1.0.0-beta.5
+
+## 1.0.0-beta.2
+
+### Patch Changes
+
+- dependencies updates: ([#10120](https://github.com/mastra-ai/mastra/pull/10120))
+  - Updated dependency [`@inngest/realtime@^0.4.5` ↗︎](https://www.npmjs.com/package/@inngest/realtime/v/0.4.5) (from `^0.4.4`, in `dependencies`)
+
+- fix resumeStream type to use resumeSchema ([#10202](https://github.com/mastra-ai/mastra/pull/10202))
+
+- Add restart method to workflow run that allows restarting an active workflow run ([#9750](https://github.com/mastra-ai/mastra/pull/9750))
+  Add status filter to `listWorkflowRuns`
+  Add automatic restart to restart active workflow runs when server starts
+
+- Validate schemas by default in workflow. Previously, if you want schemas in the workflow to be validated, you'd have to add `validateInputs` option, now, this will be done by default but can be disabled. ([#10186](https://github.com/mastra-ai/mastra/pull/10186))
+
+  For workflows whose schemas and step schemas you don't want validated, do this
+
+  ```diff
+  createWorkflow({
+  +  options: {
+  +    validateInputs: false
+  +  }
+  })
+  ```
+
+- Fix inngest parallel workflow ([#10169](https://github.com/mastra-ai/mastra/pull/10169))
+  Fix tool as step in inngest
+  Fix inngest nested workflow
+
+- Add timeTravel to workflows. This makes it possible to start a workflow run from a particular step in the workflow ([#9994](https://github.com/mastra-ai/mastra/pull/9994))
+
+  Example code:
+
+  ```ts
+  const result = await run.timeTravel({
+    step: 'step2',
+    inputData: {
+      value: 'input',
+    },
+  });
+  ```
+
+- Updated dependencies [[`2319326`](https://github.com/mastra-ai/mastra/commit/2319326f8c64e503a09bbcf14be2dd65405445e0), [`d629361`](https://github.com/mastra-ai/mastra/commit/d629361a60f6565b5bfb11976fdaf7308af858e2), [`08c31c1`](https://github.com/mastra-ai/mastra/commit/08c31c188ebccd598acaf55e888b6397d01f7eae), [`fd3d338`](https://github.com/mastra-ai/mastra/commit/fd3d338a2c362174ed5b383f1f011ad9fb0302aa), [`c30400a`](https://github.com/mastra-ai/mastra/commit/c30400a49b994b1b97256fe785eb6c906fc2b232), [`69e0a87`](https://github.com/mastra-ai/mastra/commit/69e0a878896a2da9494945d86e056a5f8f05b851), [`01f8878`](https://github.com/mastra-ai/mastra/commit/01f88783de25e4de048c1c8aace43e26373c6ea5), [`4c77209`](https://github.com/mastra-ai/mastra/commit/4c77209e6c11678808b365d545845918c40045c8), [`d827d08`](https://github.com/mastra-ai/mastra/commit/d827d0808ffe1f3553a84e975806cc989b9735dd), [`23c10a1`](https://github.com/mastra-ai/mastra/commit/23c10a1efdd9a693c405511ab2dc8a1236603162), [`676ccc7`](https://github.com/mastra-ai/mastra/commit/676ccc7fe92468d2d45d39c31a87825c89fd1ea0), [`c10398d`](https://github.com/mastra-ai/mastra/commit/c10398d5b88f1d4af556f4267ff06f1d11e89179), [`00c2387`](https://github.com/mastra-ai/mastra/commit/00c2387f5f04a365316f851e58666ac43f8c4edf), [`ad6250d`](https://github.com/mastra-ai/mastra/commit/ad6250dbdaad927e29f74a27b83f6c468b50a705), [`3a73998`](https://github.com/mastra-ai/mastra/commit/3a73998fa4ebeb7f3dc9301afe78095fc63e7999), [`e16d553`](https://github.com/mastra-ai/mastra/commit/e16d55338403c7553531cc568125c63d53653dff), [`4d59f58`](https://github.com/mastra-ai/mastra/commit/4d59f58de2d90d6e2810a19d4518e38ddddb9038), [`e1bb9c9`](https://github.com/mastra-ai/mastra/commit/e1bb9c94b4eb68b019ae275981be3feb769b5365), [`351a11f`](https://github.com/mastra-ai/mastra/commit/351a11fcaf2ed1008977fa9b9a489fc422e51cd4)]:
+  - @mastra/core@1.0.0-beta.3
+
 ## 1.0.0-beta.1
 
 ### Patch Changes

package/dist/index.cjs

@@ -101,7 +101,8 @@ var InngestRun = class extends workflows.Run {
         resourceId: this.resourceId,
         snapshot: {
           ...snapshot,
-          status: "canceled"
+          status: "canceled",
+          value: snapshot.value
         }
       });
     }
@@ -123,14 +124,15 @@ var InngestRun = class extends workflows.Run {
       snapshot: {
         runId: this.runId,
         serializedStepGraph: this.serializedStepGraph,
+        status: "running",
         value: {},
         context: {},
         activePaths: [],
         suspendedPaths: {},
+        activeStepsPath: {},
         resumeLabels: {},
         waitingPaths: {},
-        timestamp: Date.now(),
-        status: "running"
+        timestamp: Date.now()
       }
     });
     const inputDataToUse = await this._validateInput(inputData);
@@ -174,9 +176,14 @@ var InngestRun = class extends workflows.Run {
   }
   async _resume(params) {
     const storage = this.#mastra?.getStorage();
-    const steps = (Array.isArray(params.step) ? params.step : [params.step]).map(
-      (step) => typeof step === "string" ? step : step?.id
-    );
+    let steps = [];
+    if (typeof params.step === "string") {
+      steps = params.step.split(".");
+    } else {
+      steps = (Array.isArray(params.step) ? params.step : [params.step]).map(
+        (step) => typeof step === "string" ? step : step?.id
+      );
+    }
     const snapshot = await storage?.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
@@ -195,8 +202,7 @@ var InngestRun = class extends workflows.Run {
           steps,
           stepResults: snapshot?.context,
           resumePayload: resumeDataToUse,
-          // @ts-ignore
-          resumePath: snapshot?.suspendedPaths?.[steps?.[0]]
+          resumePath: steps?.[0] ? snapshot?.suspendedPaths?.[steps?.[0]] : void 0
         }
       }
     });
@@ -211,6 +217,97 @@ var InngestRun = class extends workflows.Run {
     }
     return result;
   }
+  async timeTravel(params) {
+    const p = this._timeTravel(params).then((result) => {
+      if (result.status !== "suspended") {
+        this.closeStreamAction?.().catch(() => {
+        });
+      }
+      return result;
+    });
+    this.executionResults = p;
+    return p;
+  }
+  async _timeTravel(params) {
+    if (!params.step || Array.isArray(params.step) && params.step?.length === 0) {
+      throw new Error("Step is required and must be a valid step or array of steps");
+    }
+    let steps = [];
+    if (typeof params.step === "string") {
+      steps = params.step.split(".");
+    } else {
+      steps = (Array.isArray(params.step) ? params.step : [params.step]).map(
+        (step) => typeof step === "string" ? step : step?.id
+      );
+    }
+    if (steps.length === 0) {
+      throw new Error("No steps provided to timeTravel");
+    }
+    const storage = this.#mastra?.getStorage();
+    const snapshot = await storage?.loadWorkflowSnapshot({
+      workflowName: this.workflowId,
+      runId: this.runId
+    });
+    if (!snapshot) {
+      await storage?.persistWorkflowSnapshot({
+        workflowName: this.workflowId,
+        runId: this.runId,
+        resourceId: this.resourceId,
+        snapshot: {
+          runId: this.runId,
+          serializedStepGraph: this.serializedStepGraph,
+          status: "pending",
+          value: {},
+          context: {},
+          activePaths: [],
+          suspendedPaths: {},
+          activeStepsPath: {},
+          resumeLabels: {},
+          waitingPaths: {},
+          timestamp: Date.now()
+        }
+      });
+    }
+    if (snapshot?.status === "running") {
+      throw new Error("This workflow run is still running, cannot time travel");
+    }
+    let inputDataToUse = params.inputData;
+    if (inputDataToUse && steps.length === 1) {
+      inputDataToUse = await this._validateTimetravelInputData(params.inputData, this.workflowSteps[steps[0]]);
+    }
+    const timeTravelData = workflows.createTimeTravelExecutionParams({
+      steps,
+      inputData: inputDataToUse,
+      resumeData: params.resumeData,
+      context: params.context,
+      nestedStepsContext: params.nestedStepsContext,
+      snapshot: snapshot ?? { context: {} },
+      graph: this.executionGraph,
+      initialState: params.initialState
+    });
+    const eventOutput = await this.inngest.send({
+      name: `workflow.${this.workflowId}`,
+      data: {
+        initialState: timeTravelData.state,
+        runId: this.runId,
+        workflowId: this.workflowId,
+        stepResults: timeTravelData.stepResults,
+        timeTravel: timeTravelData,
+        tracingOptions: params.tracingOptions,
+        outputOptions: params.outputOptions
+      }
+    });
+    const eventId = eventOutput.ids[0];
+    if (!eventId) {
+      throw new Error("Event ID is not set");
+    }
+    const runOutput = await this.getRunOutput(eventId);
+    const result = runOutput?.output?.result;
+    if (result.status === "failed") {
+      result.error = new Error(result.error);
+    }
+    return result;
+  }
   watch(cb) {
     let active = true;
     const streamPromise = realtime.subscribe(
@@ -360,6 +457,75 @@ var InngestRun = class extends workflows.Run {
   streamVNext(args = {}) {
     return this.stream(args);
   }
+  timeTravelStream({
+    inputData,
+    resumeData,
+    initialState,
+    step,
+    context,
+    nestedStepsContext,
+    requestContext,
+    tracingOptions,
+    outputOptions
+  }) {
+    this.closeStreamAction = async () => {
+    };
+    const self = this;
+    const stream$1 = new web.ReadableStream({
+      async start(controller) {
+        const unwatch = self.watch(async ({ type, from = stream.ChunkFrom.WORKFLOW, payload }) => {
+          controller.enqueue({
+            type,
+            runId: self.runId,
+            from,
+            payload: {
+              stepName: payload?.id,
+              ...payload
+            }
+          });
+        });
+        self.closeStreamAction = async () => {
+          unwatch();
+          try {
+            await controller.close();
+          } catch (err) {
+            console.error("Error closing stream:", err);
+          }
+        };
+        const executionResultsPromise = self._timeTravel({
+          inputData,
+          step,
+          context,
+          nestedStepsContext,
+          resumeData,
+          initialState,
+          requestContext,
+          tracingOptions,
+          outputOptions
+        });
+        self.executionResults = executionResultsPromise;
+        let executionResults;
+        try {
+          executionResults = await executionResultsPromise;
+          self.closeStreamAction?.().catch(() => {
+          });
+          if (self.streamOutput) {
+            self.streamOutput.updateResults(executionResults);
+          }
+        } catch (err) {
+          self.streamOutput?.rejectResults(err);
+          self.closeStreamAction?.().catch(() => {
+          });
+        }
+      }
+    });
+    this.streamOutput = new stream.WorkflowRunOutput({
+      runId: this.runId,
+      workflowId: this.workflowId,
+      stream: stream$1
+    });
+    return this.streamOutput;
+  }
 };
 var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
   #mastra;
@@ -369,6 +535,7 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
   constructor(params, inngest) {
     const { concurrency, rateLimit, throttle, debounce, priority, ...workflowParams } = params;
     super(workflowParams);
+    this.engineType = "inngest";
     const flowControlEntries = Object.entries({ concurrency, rateLimit, throttle, debounce, priority }).filter(
       ([_, value]) => value !== void 0
     );
@@ -424,7 +591,9 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
         mastra: this.#mastra,
         retryConfig: this.retryConfig,
         cleanup: () => this.runs.delete(runIdToUse),
-        workflowSteps: this.steps
+        workflowSteps: this.steps,
+        workflowEngineType: this.engineType,
+        validateInputs: this.options.validateInputs
       },
       this.inngest
     );
@@ -445,13 +614,13 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
           value: {},
           context: {},
           activePaths: [],
+          activeStepsPath: {},
           waitingPaths: {},
           serializedStepGraph: this.serializedStepGraph,
           suspendedPaths: {},
           resumeLabels: {},
           result: void 0,
           error: void 0,
-          // @ts-ignore
           timestamp: Date.now()
         }
       });
@@ -465,15 +634,14 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
     this.function = this.inngest.createFunction(
       {
         id: `workflow.${this.id}`,
-        // @ts-ignore
-        retries: this.retryConfig?.attempts ?? 0,
+        retries: Math.min(this.retryConfig?.attempts ?? 0, 20),
         cancelOn: [{ event: `cancel.workflow.${this.id}` }],
         // Spread flow control configuration
         ...this.flowControlConfig
       },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
-        let { inputData, initialState, runId, resourceId, resume, outputOptions, format } = event.data;
+        let { inputData, initialState, runId, resourceId, resume, outputOptions, format, timeTravel } = event.data;
         if (!runId) {
           runId = await step.run(`workflow.${this.id}.runIdGen`, async () => {
             return crypto.randomUUID();
@@ -515,11 +683,12 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
           requestContext: new di.RequestContext(),
           // TODO
           resume,
+          timeTravel,
           format,
           abortController: new AbortController(),
           // currentSpan: undefined, // TODO: Pass actual parent Span from workflow execution context
           outputOptions,
-          writableStream: new WritableStream({
+          writableStream: new web.WritableStream({
             write(chunk) {
               void emitter.emit("watch", chunk).catch(() => {
               });
@@ -567,13 +736,11 @@ function createStep(params, agentOptions) {
     return {
       id: params.name,
       description: params.getDescription(),
-      // @ts-ignore
       inputSchema: zod.z.object({
         prompt: zod.z.string()
         // resourceId: z.string().optional(),
         // threadId: z.string().optional(),
       }),
-      // @ts-ignore
       outputSchema: zod.z.object({
         text: zod.z.string()
       }),
@@ -663,20 +830,38 @@ function createStep(params, agentOptions) {
     }
     return {
       // TODO: tool probably should have strong id type
-      // @ts-ignore
       id: params.id,
       description: params.description,
       inputSchema: params.inputSchema,
       outputSchema: params.outputSchema,
-      execute: async ({ inputData, mastra, requestContext, tracingContext, suspend, resumeData }) => {
-        return params.execute({
-          context: inputData,
-          mastra: observability.wrapMastra(mastra, tracingContext),
+      suspendSchema: params.suspendSchema,
+      resumeSchema: params.resumeSchema,
+      execute: async ({
+        inputData,
+        mastra,
+        requestContext,
+        tracingContext,
+        suspend,
+        resumeData,
+        runId,
+        workflowId,
+        state,
+        setState
+      }) => {
+        const toolContext = {
+          mastra,
           requestContext,
           tracingContext,
-          suspend,
-          resumeData
-        });
+          workflow: {
+            runId,
+            resumeData,
+            suspend,
+            workflowId,
+            state,
+            setState
+          }
+        };
+        return params.execute(inputData, toolContext);
       },
       component: "TOOL"
     };
@@ -710,6 +895,8 @@ function init(inngest) {
         suspendSchema: step.suspendSchema,
         stateSchema: step.stateSchema,
         execute: step.execute,
+        retries: step.retries,
+        scorers: step.scorers,
         component: step.component
       };
     },
@@ -949,6 +1136,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     stepResults,
     executionContext,
     resume,
+    timeTravel,
     prevOutput,
     emitter,
     abortController,
@@ -969,7 +1157,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     const { inputData, validationError } = await workflows.validateStepInput({
       prevOutput,
       step,
-      validateInputs: this.options?.validateInputs ?? false
+      validateInputs: this.options?.validateInputs ?? true
     });
     const startedAt = await this.inngestStep.run(
       `workflow.${executionContext.workflowId}.run.${executionContext.runId}.step.${step.id}.running_ev`,
@@ -991,9 +1179,10 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
       const isResume = !!resume?.steps?.length;
       let result;
       let runId;
+      const isTimeTravel = !!(timeTravel && timeTravel.steps?.length > 1 && timeTravel.steps[0] === step.id);
       try {
         if (isResume) {
-          runId = stepResults[resume?.steps?.[0]]?.suspendPayload?.__workflow_meta?.runId ?? crypto.randomUUID();
+          runId = stepResults[resume?.steps?.[0] ?? ""]?.suspendPayload?.__workflow_meta?.runId ?? crypto.randomUUID();
           const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
             workflowName: step.id,
             runId
@@ -1009,8 +1198,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
                 steps: resume.steps.slice(1),
                 stepResults: snapshot?.context,
                 resumePayload: resume.resumePayload,
-                // @ts-ignore
-                resumePath: snapshot?.suspendedPaths?.[resume.steps?.[1]]
+                resumePath: resume.steps?.[1] ? snapshot?.suspendedPaths?.[resume.steps?.[1]] : void 0
               },
               outputOptions: { includeState: true }
             }
@@ -1018,6 +1206,32 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           result = invokeResp.result;
           runId = invokeResp.runId;
           executionContext.state = invokeResp.result.state;
+        } else if (isTimeTravel) {
+          const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
+            workflowName: step.id,
+            runId: executionContext.runId
+          }) ?? { context: {} };
+          const timeTravelParams = workflows.createTimeTravelExecutionParams({
+            steps: timeTravel.steps.slice(1),
+            inputData: timeTravel.inputData,
+            resumeData: timeTravel.resumeData,
+            context: timeTravel.nestedStepResults?.[step.id] ?? {},
+            nestedStepsContext: timeTravel.nestedStepResults ?? {},
+            snapshot,
+            graph: step.buildExecutionGraph()
+          });
+          const invokeResp = await this.inngestStep.invoke(`workflow.${executionContext.workflowId}.step.${step.id}`, {
+            function: step.getFunction(),
+            data: {
+              timeTravel: timeTravelParams,
+              initialState: executionContext.state ?? {},
+              runId: executionContext.runId,
+              outputOptions: { includeState: true }
+            }
+          });
+          result = invokeResp.result;
+          runId = invokeResp.runId;
+          executionContext.state = invokeResp.result.state;
         } else {
           const invokeResp = await this.inngestStep.invoke(`workflow.${executionContext.workflowId}.step.${step.id}`, {
             function: step.getFunction(),
@@ -1130,14 +1344,32 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
         let execResults;
         let suspended;
         let bailed;
+        const { resumeData: timeTravelResumeData, validationError: timeTravelResumeValidationError } = await workflows.validateStepResumeData({
+          resumeData: timeTravel?.stepResults[step.id]?.status === "suspended" ? timeTravel?.resumeData : void 0,
+          step
+        });
+        let resumeDataToUse;
+        if (timeTravelResumeData && !timeTravelResumeValidationError) {
+          resumeDataToUse = timeTravelResumeData;
+        } else if (timeTravelResumeData && timeTravelResumeValidationError) {
+          this.logger.warn("Time travel resume data validation failed", {
+            stepId: step.id,
+            error: timeTravelResumeValidationError.message
+          });
+        } else if (resume?.steps[0] === step.id) {
+          resumeDataToUse = resume?.resumePayload;
+        }
         try {
           if (validationError) {
             throw validationError;
           }
+          const retryCount = this.getOrGenerateRetryCount(step.id);
           const result = await step.execute({
             runId: executionContext.runId,
+            workflowId: executionContext.workflowId,
             mastra: this.mastra,
             requestContext,
+            retryCount,
             writer: new tools.ToolStream(
               {
                 prefix: "workflow-step",
@@ -1152,13 +1384,20 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               executionContext.state = state;
             },
             inputData,
-            resumeData: resume?.steps[0] === step.id ? resume?.resumePayload : void 0,
+            resumeData: resumeDataToUse,
             tracingContext: {
               currentSpan: stepSpan
             },
             getInitData: () => stepResults?.input,
             getStepResult: workflows.getStepResult.bind(this, stepResults),
             suspend: async (suspendPayload, suspendOptions) => {
+              const { suspendData, validationError: validationError2 } = await workflows.validateStepSuspendData({
+                suspendData: suspendPayload,
+                step
+              });
+              if (validationError2) {
+                throw validationError2;
+              }
               executionContext.suspendedPaths[step.id] = executionContext.executionPath;
               if (suspendOptions?.resumeLabel) {
                 const resumeLabel = Array.isArray(suspendOptions.resumeLabel) ? suspendOptions.resumeLabel : [suspendOptions.resumeLabel];
@@ -1169,16 +1408,13 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
                   };
                 }
               }
-              suspended = { payload: suspendPayload };
+              suspended = { payload: suspendData };
             },
             bail: (result2) => {
               bailed = { payload: result2 };
             },
-            resume: {
-              steps: resume?.steps?.slice(1) || [],
-              resumePayload: resume?.resumePayload,
-              // @ts-ignore
-              runId: stepResults[step.id]?.suspendPayload?.__workflow_meta?.runId
+            abort: () => {
+              abortController?.abort();
             },
             [_constants.EMITTER_SYMBOL]: emitter,
             [_constants.STREAM_FORMAT_SYMBOL]: executionContext.format,
@@ -1194,8 +1430,8 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             startedAt,
             endedAt,
             payload: inputData,
-            resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
-            resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
+            resumedAt: resumeDataToUse ? startedAt : void 0,
+            resumePayload: resumeDataToUse
           };
         } catch (e) {
           const stepFailure = {
@@ -1204,8 +1440,8 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             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
+            resumedAt: resumeDataToUse ? startedAt : void 0,
+            resumePayload: resumeDataToUse
           };
           execResults = stepFailure;
           const fallbackErrorMessage = `Step ${step.id} failed`;
@@ -1222,8 +1458,8 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             payload: inputData,
             suspendedAt: Date.now(),
             startedAt,
-            resumedAt: resume?.steps[0] === step.id ? startedAt : void 0,
-            resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
+            resumedAt: resumeDataToUse ? startedAt : void 0,
+            resumePayload: resumeDataToUse
           };
         } else if (bailed) {
           execResults = {
@@ -1296,7 +1532,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
       });
     }
     Object.assign(executionContext.suspendedPaths, stepRes.executionContext.suspendedPaths);
-    Object.assign(stepResults, stepRes.stepResults);
     executionContext.state = stepRes.executionContext.state;
     return stepRes.result;
   }
@@ -1324,17 +1559,17 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           resourceId,
           snapshot: {
             runId,
+            status: workflowStatus,
             value: executionContext.state,
             context: stepResults,
-            activePaths: [],
+            activePaths: executionContext.executionPath,
+            activeStepsPath: executionContext.activeStepsPath,
             suspendedPaths: executionContext.suspendedPaths,
             resumeLabels: executionContext.resumeLabels,
             waitingPaths: {},
             serializedStepGraph,
-            status: workflowStatus,
             result,
             error,
-            // @ts-ignore
             timestamp: Date.now()
           }
         });
@@ -1347,6 +1582,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     entry,
     prevOutput,
     stepResults,
+    timeTravel,
     resume,
     executionContext,
     emitter,
@@ -1465,10 +1701,12 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           prevOutput,
           stepResults,
           resume,
+          timeTravel,
           executionContext: {
             workflowId,
             runId,
             executionPath: [...executionContext.executionPath, index],
+            activeStepsPath: executionContext.activeStepsPath,
             suspendedPaths: executionContext.suspendedPaths,
             resumeLabels: executionContext.resumeLabels,
             retryConfig: executionContext.retryConfig,
@@ -1502,7 +1740,9 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
         status: "success",
         output: results.reduce((acc, result, index) => {
           if (result.status === "success") {
-            acc[stepsToRun[index].step.id] = result.output;
+            if ("step" in stepsToRun[index]) {
+              acc[stepsToRun[index].step.id] = result.output;
+            }
           }
           return acc;
         }, {})