@mastra/inngest 0.0.0-redis-cloud-transporter-20250508194049 → 0.0.0-taofeeqInngest-20250603090617

package/src/index.ts

@@ -1,27 +1,28 @@
 import { randomUUID } from 'crypto';
 import { subscribe } from '@inngest/realtime';
-import type { Mastra, WorkflowRun } from '@mastra/core';
+import type { Mastra, WorkflowRun, WorkflowRuns } from '@mastra/core';
 import { RuntimeContext } from '@mastra/core/di';
-import { NewWorkflow, createStep, Run, DefaultExecutionEngine, cloneStep } from '@mastra/core/workflows/vNext';
+import { Workflow, createStep, Run, DefaultExecutionEngine, cloneStep } from '@mastra/core/workflows';
 import type {
   ExecuteFunction,
   ExecutionContext,
   ExecutionEngine,
   ExecutionGraph,
-  NewStep,
-  NewStep as Step,
-  NewWorkflowConfig,
+  Step,
+  WorkflowConfig,
   StepFlowEntry,
   StepResult,
   WorkflowResult,
-} from '@mastra/core/workflows/vNext';
+  SerializedStepFlowEntry,
+} from '@mastra/core/workflows';
+import { EMITTER_SYMBOL } from '@mastra/core/workflows/_constants';
 import type { Span } from '@opentelemetry/api';
 import type { Inngest, BaseContext } from 'inngest';
 import { serve as inngestServe } from 'inngest/hono';
 import type { z } from 'zod';
 
 export function serve({ mastra, inngest }: { mastra: Mastra; inngest: Inngest }): ReturnType<typeof inngestServe> {
-  const wfs = mastra.vnext_getWorkflows();
+  const wfs = mastra.getWorkflows();
   const functions = Object.values(wfs).flatMap(wf => {
     if (wf instanceof InngestWorkflow) {
       wf.__registerMastra(mastra);
@@ -36,11 +37,12 @@ export function serve({ mastra, inngest }: { mastra: Mastra; inngest: Inngest })
 }
 
 export class InngestRun<
-  TSteps extends NewStep<string, any, any>[] = NewStep<string, any, any>[],
+  TSteps extends Step<string, any, any>[] = Step<string, any, any>[],
   TInput extends z.ZodType<any> = z.ZodType<any>,
   TOutput extends z.ZodType<any> = z.ZodType<any>,
 > extends Run<TSteps, TInput, TOutput> {
   private inngest: Inngest;
+  serializedStepGraph: SerializedStepFlowEntry[];
   #mastra: Mastra;
 
   constructor(
@@ -49,6 +51,7 @@ export class InngestRun<
       runId: string;
       executionEngine: ExecutionEngine;
       executionGraph: ExecutionGraph;
+      serializedStepGraph: SerializedStepFlowEntry[];
       mastra?: Mastra;
       retryConfig?: {
         attempts?: number;
@@ -60,11 +63,12 @@ export class InngestRun<
   ) {
     super(params);
     this.inngest = inngest;
+    this.serializedStepGraph = params.serializedStepGraph;
     this.#mastra = params.mastra!;
   }
 
   async getRuns(eventId: string) {
-    const response = await fetch(`${this.inngest.apiBaseUrl}/v1/events/${eventId}/runs`, {
+    const response = await fetch(`${this.inngest.apiBaseUrl ?? 'https://api.inngest.com'}/v1/events/${eventId}/runs`, {
       headers: {
         Authorization: `Bearer ${process.env.INNGEST_SIGNING_KEY}`,
       },
@@ -96,6 +100,7 @@ export class InngestRun<
       runId: this.runId,
       snapshot: {
         runId: this.runId,
+        serializedStepGraph: this.serializedStepGraph,
         value: {},
         context: {} as any,
         activePaths: [],
@@ -196,18 +201,18 @@ export class InngestRun<
 }
 
 export class InngestWorkflow<
-  TSteps extends NewStep<string, any, any>[] = NewStep<string, any, any>[],
+  TSteps extends Step<string, any, any>[] = Step<string, any, any>[],
   TWorkflowId extends string = string,
   TInput extends z.ZodType<any> = z.ZodType<any>,
   TOutput extends z.ZodType<any> = z.ZodType<any>,
   TPrevSchema extends z.ZodType<any> = TInput,
-> extends NewWorkflow<TSteps, TWorkflowId, TInput, TOutput, TPrevSchema> {
+> extends Workflow<TSteps, TWorkflowId, TInput, TOutput, TPrevSchema> {
   #mastra: Mastra;
   public inngest: Inngest;
 
   private function: ReturnType<Inngest['createFunction']> | undefined;
 
-  constructor(params: NewWorkflowConfig<TWorkflowId, TInput, TOutput, TSteps>, inngest: Inngest) {
+  constructor(params: WorkflowConfig<TWorkflowId, TInput, TOutput, TSteps>, inngest: Inngest) {
     super(params);
     this.#mastra = params.mastra!;
     this.inngest = inngest;
@@ -226,7 +231,7 @@ export class InngestWorkflow<
       return { runs: [], total: 0 };
     }
 
-    return storage.getWorkflowRuns({ workflowName: this.id, ...(args ?? {}) });
+    return storage.getWorkflowRuns({ workflowName: this.id, ...(args ?? {}) }) as unknown as WorkflowRuns;
   }
 
   async getWorkflowRunById(runId: string): Promise<WorkflowRun | null> {
@@ -235,7 +240,7 @@ export class InngestWorkflow<
       this.logger.debug('Cannot get workflow runs. Mastra engine is not initialized');
       return null;
     }
-    const run = await storage.getWorkflowRunById({ runId, workflowName: this.id });
+    const run = (await storage.getWorkflowRunById({ runId, workflowName: this.id })) as unknown as WorkflowRun;
 
     return (
       run ??
@@ -278,6 +283,7 @@ export class InngestWorkflow<
           runId: runIdToUse,
           executionEngine: this.executionEngine,
           executionGraph: this.executionGraph,
+          serializedStepGraph: this.serializedStepGraph,
           mastra: this.#mastra,
           retryConfig: this.retryConfig,
           cleanup: () => this.runs.delete(runIdToUse),
@@ -329,6 +335,7 @@ export class InngestWorkflow<
           workflowId: this.id,
           runId,
           graph: this.executionGraph,
+          serializedStepGraph: this.serializedStepGraph,
           input: inputData,
           emitter,
           retryConfig: this.retryConfig,
@@ -394,7 +401,7 @@ export function init(inngest: Inngest) {
       TInput extends z.ZodType<any> = z.ZodType<any>,
       TOutput extends z.ZodType<any> = z.ZodType<any>,
       TSteps extends Step<string, any, any>[] = Step<string, any, any>[],
-    >(params: NewWorkflowConfig<TWorkflowId, TInput, TOutput, TSteps>) {
+    >(params: WorkflowConfig<TWorkflowId, TInput, TOutput, TSteps>) {
       return new InngestWorkflow(params, inngest);
     },
     createStep,
@@ -416,8 +423,8 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
   protected async fmtReturnValue<TOutput>(
     executionSpan: Span | undefined,
     emitter: { emit: (event: string, data: any) => Promise<void> },
-    stepResults: Record<string, StepResult<any>>,
-    lastOutput: StepResult<any>,
+    stepResults: Record<string, StepResult<any, any, any, any>>,
+    lastOutput: StepResult<any, any, any, any>,
     error?: Error | string,
   ): Promise<TOutput> {
     const base: any = {
@@ -501,7 +508,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     workflowId: string;
     runId: string;
     step: Step<string, any, any>;
-    stepResults: Record<string, StepResult<any>>;
+    stepResults: Record<string, StepResult<any, any, any, any>>;
     executionContext: ExecutionContext;
     resume?: {
       steps: string[];
@@ -510,7 +517,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     prevOutput: any;
     emitter: { emit: (event: string, data: any) => Promise<void> };
     runtimeContext: RuntimeContext;
-  }): Promise<StepResult<any>> {
+  }): Promise<StepResult<any, any, any, any>> {
     return super.executeStep({
       workflowId,
       runId,
@@ -534,7 +541,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     runtimeContext,
   }: {
     step: Step<string, any, any>;
-    stepResults: Record<string, StepResult<any>>;
+    stepResults: Record<string, StepResult<any, any, any, any>>;
     executionContext: {
       workflowId: string;
       runId: string;
@@ -550,7 +557,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     prevOutput: any;
     emitter: { emit: (event: string, data: any) => Promise<void> };
     runtimeContext: RuntimeContext;
-  }): Promise<StepResult<any>> {
+  }): Promise<StepResult<any, any, any, any>> {
     await this.inngestStep.run(
       `workflow.${executionContext.workflowId}.run.${executionContext.runId}.step.${step.id}.running_ev`,
       async () => {
@@ -644,7 +651,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
             return { executionContext, result: { status: 'failed', error: result?.error } };
           } else if (result.status === 'suspended') {
             const suspendedSteps = Object.entries(result.steps).filter(([_stepName, stepResult]) => {
-              const stepRes: StepResult<any> = stepResult as StepResult<any>;
+              const stepRes: StepResult<any, any, any, any> = stepResult as StepResult<any, any, any, any>;
               return stepRes?.status === 'suspended';
             });
 
@@ -732,7 +739,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
       );
 
       Object.assign(executionContext, res.executionContext);
-      return res.result as StepResult<any>;
+      return res.result as StepResult<any, any, any, any>;
     }
 
     const stepRes = await this.inngestStep.run(`workflow.${executionContext.workflowId}.step.${step.id}`, async () => {
@@ -740,6 +747,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
       let suspended: { payload: any } | undefined;
       try {
         const result = await step.execute({
+          runId: executionContext.runId,
           mastra: this.mastra!,
           runtimeContext,
           inputData: prevOutput,
@@ -816,10 +824,12 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     runId,
     stepResults,
     executionContext,
+    serializedStepGraph,
   }: {
     workflowId: string;
     runId: string;
-    stepResults: Record<string, StepResult<any>>;
+    stepResults: Record<string, StepResult<any, any, any, any>>;
+    serializedStepGraph: SerializedStepFlowEntry[];
     executionContext: ExecutionContext;
   }) {
     await this.inngestStep.run(
@@ -834,6 +844,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
             context: stepResults as any,
             activePaths: [],
             suspendedPaths: executionContext.suspendedPaths,
+            serializedStepGraph,
             // @ts-ignore
             timestamp: Date.now(),
           },
@@ -849,6 +860,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     prevOutput,
     prevStep,
     stepResults,
+    serializedStepGraph,
     resume,
     executionContext,
     emitter,
@@ -858,18 +870,19 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     runId: string;
     entry: { type: 'conditional'; steps: StepFlowEntry[]; conditions: ExecuteFunction<any, any, any, any>[] };
     prevStep: StepFlowEntry;
+    serializedStepGraph: SerializedStepFlowEntry[];
     prevOutput: any;
-    stepResults: Record<string, StepResult<any>>;
+    stepResults: Record<string, StepResult<any, any, any, any>>;
     resume?: {
       steps: string[];
-      stepResults: Record<string, StepResult<any>>;
+      stepResults: Record<string, StepResult<any, any, any, any>>;
       resumePayload: any;
       resumePath: number[];
     };
     executionContext: ExecutionContext;
     emitter: { emit: (event: string, data: any) => Promise<void> };
     runtimeContext: RuntimeContext;
-  }): Promise<StepResult<any>> {
+  }): Promise<StepResult<any, any, any, any>> {
     let execResults: any;
     const truthyIndexes = (
       await Promise.all(
@@ -877,6 +890,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
           this.inngestStep.run(`workflow.${workflowId}.conditional.${index}`, async () => {
             try {
               const result = await cond({
+                runId,
                 mastra: this.mastra!,
                 runtimeContext,
                 inputData: prevOutput,
@@ -896,7 +910,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
 
                 // TODO: this function shouldn't have suspend probably?
                 suspend: async (_suspendPayload: any) => {},
-                emitter,
+                [EMITTER_SYMBOL]: emitter,
               });
               return result ? index : null;
               // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -909,7 +923,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
     ).filter((index: any): index is number => index !== null);
 
     const stepsToRun = entry.steps.filter((_, index) => truthyIndexes.includes(index));
-    const results: StepResult<any>[] = await Promise.all(
+    const results: StepResult<any, any, any, any>[] = await Promise.all(
       stepsToRun.map((step, index) =>
         this.executeEntry({
           workflowId,
@@ -918,6 +932,7 @@ export class InngestExecutionEngine extends DefaultExecutionEngine {
           prevStep,
           stepResults,
           resume,
+          serializedStepGraph,
           executionContext: {
             workflowId,
             runId,