@mastra/inngest 0.0.0-cloudflare-deployer-dont-install-deps-20250714111754 → 0.0.0-consolidate-changesets-20250904042643

package/dist/index.js

@@ -1,7 +1,8 @@
 import { randomUUID } from 'crypto';
 import { subscribe } from '@inngest/realtime';
+import { wrapMastra, AISpanType } from '@mastra/core/ai-tracing';
 import { RuntimeContext } from '@mastra/core/di';
-import { Tool } from '@mastra/core/tools';
+import { ToolStream, 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';
@@ -104,6 +105,7 @@ var InngestRun = class extends Run {
         context: {},
         activePaths: [],
         suspendedPaths: {},
+        waitingPaths: {},
         timestamp: Date.now(),
         status: "running"
       }
@@ -153,6 +155,7 @@ var InngestRun = class extends Run {
       data: {
         inputData: params.resumeData,
         runId: this.runId,
+        workflowId: this.workflowId,
         stepResults: snapshot?.context,
         resume: {
           steps,
@@ -199,10 +202,38 @@ var InngestRun = class extends Run {
   }
   stream({ inputData, runtimeContext } = {}) {
     const { readable, writable } = new TransformStream();
+    let currentToolData = void 0;
     const writer = writable.getWriter();
     const unwatch = this.watch(async (event) => {
+      if (event.type === "workflow-agent-call-start") {
+        currentToolData = {
+          name: event.payload.name,
+          args: event.payload.args
+        };
+        await writer.write({
+          ...event.payload,
+          type: "tool-call-streaming-start"
+        });
+        return;
+      }
       try {
-        await writer.write(event);
+        if (event.type === "workflow-agent-call-finish") {
+          return;
+        } else if (!event.type.startsWith("workflow-")) {
+          if (event.type === "text-delta") {
+            await writer.write({
+              type: "tool-call-delta",
+              ...currentToolData ?? {},
+              argsTextDelta: event.textDelta
+            });
+          }
+          return;
+        }
+        const e = {
+          ...event,
+          type: event.type.replace("workflow-", "")
+        };
+        await writer.write(e);
       } catch {
       }
     }, "watch-v2");
@@ -233,8 +264,14 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
   #mastra;
   inngest;
   function;
+  flowControlConfig;
   constructor(params, inngest) {
-    super(params);
+    const { concurrency, rateLimit, throttle, debounce, priority, ...workflowParams } = params;
+    super(workflowParams);
+    const flowControlEntries = Object.entries({ concurrency, rateLimit, throttle, debounce, priority }).filter(
+      ([_, value]) => value !== void 0
+    );
+    this.flowControlConfig = flowControlEntries.length > 0 ? Object.fromEntries(flowControlEntries) : void 0;
     this.#mastra = params.mastra;
     this.inngest = inngest;
   }
@@ -255,27 +292,6 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
     const run = await storage.getWorkflowRunById({ runId, workflowName: this.id });
     return run ?? (this.runs.get(runId) ? { ...this.runs.get(runId), workflowName: this.id } : null);
   }
-  async getWorkflowRunExecutionResult(runId) {
-    const storage = this.#mastra?.getStorage();
-    if (!storage) {
-      this.logger.debug("Cannot get workflow run execution result. Mastra storage is not initialized");
-      return null;
-    }
-    const run = await storage.getWorkflowRunById({ runId, workflowName: this.id });
-    if (!run?.snapshot) {
-      return null;
-    }
-    if (typeof run.snapshot === "string") {
-      return null;
-    }
-    return {
-      status: run.snapshot.status,
-      result: run.snapshot.result,
-      error: run.snapshot.error,
-      payload: run.snapshot.context?.input,
-      steps: run.snapshot.context
-    };
-  }
   __registerMastra(mastra) {
     this.#mastra = mastra;
     this.executionEngine.__registerMastra(mastra);
@@ -328,7 +344,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       this.inngest
     );
     this.runs.set(runIdToUse, run);
-    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse);
+    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse, false);
     if (!workflowSnapshotInStorage) {
       await this.mastra?.getStorage()?.persistWorkflowSnapshot({
         workflowName: this.id,
@@ -339,6 +355,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
           value: {},
           context: {},
           activePaths: [],
+          waitingPaths: {},
           serializedStepGraph: this.serializedStepGraph,
           suspendedPaths: {},
           result: void 0,
@@ -359,7 +376,9 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
         id: `workflow.${this.id}`,
         // @ts-ignore
         retries: this.retryConfig?.attempts ?? 0,
-        cancelOn: [{ event: `cancel.workflow.${this.id}` }]
+        cancelOn: [{ event: `cancel.workflow.${this.id}` }],
+        // Spread flow control configuration
+        ...this.flowControlConfig
       },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
@@ -403,7 +422,9 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
           runtimeContext: new RuntimeContext(),
           // TODO
           resume,
-          abortController: new AbortController()
+          abortController: new AbortController(),
+          currentSpan: void 0
+          // TODO: Pass actual parent AI span from workflow execution context
         });
         return { result, runId };
       }
@@ -447,7 +468,7 @@ function createStep(params) {
       outputSchema: z.object({
         text: z.string()
       }),
-      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort }) => {
+      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort, tracingContext }) => {
         let streamPromise = {};
         streamPromise.promise = new Promise((resolve, reject) => {
           streamPromise.resolve = resolve;
@@ -458,13 +479,14 @@ function createStep(params) {
           args: inputData
         };
         await emitter.emit("watch-v2", {
-          type: "tool-call-streaming-start",
-          ...toolData
+          type: "workflow-agent-call-start",
+          payload: toolData
         });
         const { fullStream } = await params.stream(inputData.prompt, {
           // resourceId: inputData.resourceId,
           // threadId: inputData.threadId,
           runtimeContext,
+          tracingContext,
           onFinish: (result) => {
             streamPromise.resolve(result.text);
           },
@@ -474,29 +496,12 @@ function createStep(params) {
           return abort();
         }
         for await (const chunk of fullStream) {
-          switch (chunk.type) {
-            case "text-delta":
-              await emitter.emit("watch-v2", {
-                type: "tool-call-delta",
-                ...toolData,
-                argsTextDelta: chunk.textDelta
-              });
-              break;
-            case "step-start":
-            case "step-finish":
-            case "finish":
-              break;
-            case "tool-call":
-            case "tool-result":
-            case "tool-call-streaming-start":
-            case "tool-call-delta":
-            case "source":
-            case "file":
-            default:
-              await emitter.emit("watch-v2", chunk);
-              break;
-          }
+          await emitter.emit("watch-v2", chunk);
         }
+        await emitter.emit("watch-v2", {
+          type: "workflow-agent-call-finish",
+          payload: toolData
+        });
         return {
           text: await streamPromise.promise
         };
@@ -513,11 +518,12 @@ function createStep(params) {
       id: params.id,
       inputSchema: params.inputSchema,
       outputSchema: params.outputSchema,
-      execute: async ({ inputData, mastra, runtimeContext }) => {
+      execute: async ({ inputData, mastra, runtimeContext, tracingContext }) => {
         return params.execute({
           context: inputData,
-          mastra,
-          runtimeContext
+          mastra: wrapMastra(mastra, tracingContext),
+          runtimeContext,
+          tracingContext
         });
       }
     };
@@ -571,12 +577,12 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
   }
   async execute(params) {
     await params.emitter.emit("watch-v2", {
-      type: "start",
+      type: "workflow-start",
       payload: { runId: params.runId }
     });
     const result = await super.execute(params);
     await params.emitter.emit("watch-v2", {
-      type: "finish",
+      type: "workflow-finish",
       payload: { runId: params.runId }
     });
     return result;
@@ -638,31 +644,6 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     executionSpan?.end();
     return base;
   }
-  async superExecuteStep({
-    workflowId,
-    runId,
-    step,
-    stepResults,
-    executionContext,
-    resume,
-    prevOutput,
-    emitter,
-    abortController,
-    runtimeContext
-  }) {
-    return super.executeStep({
-      workflowId,
-      runId,
-      step,
-      stepResults,
-      executionContext,
-      resume,
-      prevOutput,
-      emitter,
-      abortController,
-      runtimeContext
-    });
-  }
   // async executeSleep({ id, duration }: { id: string; duration: number }): Promise<void> {
   //   await this.inngestStep.sleep(id, duration);
   // }
@@ -674,17 +655,32 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     stepResults,
     emitter,
     abortController,
-    runtimeContext
+    runtimeContext,
+    writableStream,
+    tracingContext
   }) {
     let { duration, fn } = entry;
+    const sleepSpan = tracingContext?.currentSpan?.createChildSpan({
+      type: AISpanType.WORKFLOW_SLEEP,
+      name: `sleep: ${duration ? `${duration}ms` : "dynamic"}`,
+      attributes: {
+        durationMs: duration,
+        sleepType: fn ? "dynamic" : "fixed"
+      }
+    });
     if (fn) {
+      const stepCallId = randomUUID();
       duration = await this.inngestStep.run(`workflow.${workflowId}.sleep.${entry.id}`, async () => {
         return await fn({
           runId,
+          workflowId,
           mastra: this.mastra,
           runtimeContext,
           inputData: prevOutput,
           runCount: -1,
+          tracingContext: {
+            currentSpan: sleepSpan
+          },
           getInitData: () => stepResults?.input,
           getStepResult: (step) => {
             if (!step?.id) {
@@ -706,11 +702,31 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           },
           [EMITTER_SYMBOL]: emitter,
           engine: { step: this.inngestStep },
-          abortSignal: abortController?.signal
+          abortSignal: abortController?.signal,
+          writer: new ToolStream(
+            {
+              prefix: "workflow-step",
+              callId: stepCallId,
+              name: "sleep",
+              runId
+            },
+            writableStream
+          )
         });
       });
+      sleepSpan?.update({
+        attributes: {
+          durationMs: duration
+        }
+      });
+    }
+    try {
+      await this.inngestStep.sleep(entry.id, !duration || duration < 0 ? 0 : duration);
+      sleepSpan?.end();
+    } catch (e) {
+      sleepSpan?.error({ error: e });
+      throw e;
     }
-    await this.inngestStep.sleep(entry.id, !duration || duration < 0 ? 0 : duration);
   }
   async executeSleepUntil({
     workflowId,
@@ -720,17 +736,33 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     stepResults,
     emitter,
     abortController,
-    runtimeContext
+    runtimeContext,
+    writableStream,
+    tracingContext
   }) {
     let { date, fn } = entry;
+    const sleepUntilSpan = tracingContext?.currentSpan?.createChildSpan({
+      type: AISpanType.WORKFLOW_SLEEP,
+      name: `sleepUntil: ${date ? date.toISOString() : "dynamic"}`,
+      attributes: {
+        untilDate: date,
+        durationMs: date ? Math.max(0, date.getTime() - Date.now()) : void 0,
+        sleepType: fn ? "dynamic" : "fixed"
+      }
+    });
     if (fn) {
       date = await this.inngestStep.run(`workflow.${workflowId}.sleepUntil.${entry.id}`, async () => {
+        const stepCallId = randomUUID();
         return await fn({
           runId,
+          workflowId,
           mastra: this.mastra,
           runtimeContext,
           inputData: prevOutput,
           runCount: -1,
+          tracingContext: {
+            currentSpan: sleepUntilSpan
+          },
           getInitData: () => stepResults?.input,
           getStepResult: (step) => {
             if (!step?.id) {
@@ -752,14 +784,36 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           },
           [EMITTER_SYMBOL]: emitter,
           engine: { step: this.inngestStep },
-          abortSignal: abortController?.signal
+          abortSignal: abortController?.signal,
+          writer: new ToolStream(
+            {
+              prefix: "workflow-step",
+              callId: stepCallId,
+              name: "sleep",
+              runId
+            },
+            writableStream
+          )
         });
       });
+      const time = !date ? 0 : date.getTime() - Date.now();
+      sleepUntilSpan?.update({
+        attributes: {
+          durationMs: Math.max(0, time)
+        }
+      });
     }
     if (!(date instanceof Date)) {
+      sleepUntilSpan?.end();
       return;
     }
-    await this.inngestStep.sleepUntil(entry.id, date);
+    try {
+      await this.inngestStep.sleepUntil(entry.id, date);
+      sleepUntilSpan?.end();
+    } catch (e) {
+      sleepUntilSpan?.error({ error: e });
+      throw e;
+    }
   }
   async executeWaitForEvent({ event, timeout }) {
     const eventData = await this.inngestStep.waitForEvent(`user-event-${event}`, {
@@ -779,8 +833,19 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     prevOutput,
     emitter,
     abortController,
-    runtimeContext
+    runtimeContext,
+    tracingContext,
+    writableStream,
+    disableScorers
   }) {
+    const stepAISpan = tracingContext?.currentSpan?.createChildSpan({
+      name: `workflow step: '${step.id}'`,
+      type: AISpanType.WORKFLOW_STEP,
+      input: prevOutput,
+      attributes: {
+        stepId: step.id
+      }
+    });
     const startedAt = await this.inngestStep.run(
       `workflow.${executionContext.workflowId}.run.${executionContext.runId}.step.${step.id}.running_ev`,
       async () => {
@@ -807,7 +872,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           eventTimestamp: Date.now()
         });
         await emitter.emit("watch-v2", {
-          type: "step-start",
+          type: "workflow-step-start",
           payload: {
             id: step.id,
             status: "running",
@@ -877,7 +942,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               eventTimestamp: Date.now()
             });
             await emitter.emit("watch-v2", {
-              type: "step-result",
+              type: "workflow-step-result",
               payload: {
                 id: step.id,
                 status: "failed",
@@ -912,7 +977,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
                 eventTimestamp: Date.now()
               });
               await emitter.emit("watch-v2", {
-                type: "step-suspended",
+                type: "workflow-step-suspended",
                 payload: {
                   id: step.id,
                   status: "suspended"
@@ -969,7 +1034,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             eventTimestamp: Date.now()
           });
           await emitter.emit("watch-v2", {
-            type: "step-result",
+            type: "workflow-step-result",
             payload: {
               id: step.id,
               status: "success",
@@ -977,7 +1042,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             }
           });
           await emitter.emit("watch-v2", {
-            type: "step-finish",
+            type: "workflow-step-finish",
             payload: {
               id: step.id,
               metadata: {}
@@ -998,8 +1063,12 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           runId: executionContext.runId,
           mastra: this.mastra,
           runtimeContext,
+          writableStream,
           inputData: prevOutput,
           resumeData: resume?.steps[0] === step.id ? resume?.resumePayload : void 0,
+          tracingContext: {
+            currentSpan: stepAISpan
+          },
           getInitData: () => stepResults?.input,
           getStepResult: (step2) => {
             const result2 = stepResults[step2.id];
@@ -1063,7 +1132,9 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       }
       if (execResults.status === "failed") {
         if (executionContext.retryConfig.attempts > 0 && this.inngestAttempts < executionContext.retryConfig.attempts) {
-          throw execResults.error;
+          const error = new Error(execResults.error);
+          stepAISpan?.error({ error });
+          throw error;
         }
       }
       await emitter.emit("watch", {
@@ -1084,7 +1155,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       });
       if (execResults.status === "suspended") {
         await emitter.emit("watch-v2", {
-          type: "step-suspended",
+          type: "workflow-step-suspended",
           payload: {
             id: step.id,
             ...execResults
@@ -1092,22 +1163,39 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         });
       } else {
         await emitter.emit("watch-v2", {
-          type: "step-result",
+          type: "workflow-step-result",
           payload: {
             id: step.id,
             ...execResults
           }
         });
         await emitter.emit("watch-v2", {
-          type: "step-finish",
+          type: "workflow-step-finish",
           payload: {
             id: step.id,
             metadata: {}
           }
         });
       }
+      stepAISpan?.end({ output: execResults });
       return { result: execResults, executionContext, stepResults };
     });
+    if (disableScorers !== false) {
+      await this.inngestStep.run(`workflow.${executionContext.workflowId}.step.${step.id}.score`, async () => {
+        if (step.scorers) {
+          await this.runScorers({
+            scorers: step.scorers,
+            runId: executionContext.runId,
+            input: prevOutput,
+            output: stepRes.result,
+            workflowId: executionContext.workflowId,
+            stepId: step.id,
+            runtimeContext,
+            disableScorers
+          });
+        }
+      });
+    }
     Object.assign(executionContext.suspendedPaths, stepRes.executionContext.suspendedPaths);
     Object.assign(stepResults, stepRes.stepResults);
     return stepRes.result;
@@ -1134,6 +1222,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             context: stepResults,
             activePaths: [],
             suspendedPaths: executionContext.suspendedPaths,
+            waitingPaths: {},
             serializedStepGraph,
             status: workflowStatus,
             result,
@@ -1157,19 +1246,42 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     executionContext,
     emitter,
     abortController,
-    runtimeContext
+    runtimeContext,
+    writableStream,
+    disableScorers,
+    tracingContext
   }) {
+    const conditionalSpan = tracingContext?.currentSpan?.createChildSpan({
+      type: AISpanType.WORKFLOW_CONDITIONAL,
+      name: `conditional: ${entry.conditions.length} conditions`,
+      input: prevOutput,
+      attributes: {
+        conditionCount: entry.conditions.length
+      }
+    });
     let execResults;
     const truthyIndexes = (await Promise.all(
       entry.conditions.map(
         (cond, index) => this.inngestStep.run(`workflow.${workflowId}.conditional.${index}`, async () => {
+          const evalSpan = conditionalSpan?.createChildSpan({
+            type: AISpanType.WORKFLOW_CONDITIONAL_EVAL,
+            name: `condition ${index}`,
+            input: prevOutput,
+            attributes: {
+              conditionIndex: index
+            }
+          });
           try {
             const result = await cond({
               runId,
+              workflowId,
               mastra: this.mastra,
               runtimeContext,
               runCount: -1,
               inputData: prevOutput,
+              tracingContext: {
+                currentSpan: evalSpan
+              },
               getInitData: () => stepResults?.input,
               getStepResult: (step) => {
                 if (!step?.id) {
@@ -1193,26 +1305,53 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               engine: {
                 step: this.inngestStep
               },
-              abortSignal: abortController.signal
+              abortSignal: abortController.signal,
+              writer: new ToolStream(
+                {
+                  prefix: "workflow-step",
+                  callId: randomUUID(),
+                  name: "conditional",
+                  runId
+                },
+                writableStream
+              )
+            });
+            evalSpan?.end({
+              output: result,
+              attributes: {
+                result: !!result
+              }
             });
             return result ? index : null;
           } catch (e) {
+            evalSpan?.error({
+              error: e instanceof Error ? e : new Error(String(e)),
+              attributes: {
+                result: false
+              }
+            });
             return null;
           }
         })
       )
     )).filter((index) => index !== null);
     const stepsToRun = entry.steps.filter((_, index) => truthyIndexes.includes(index));
+    conditionalSpan?.update({
+      attributes: {
+        truthyIndexes,
+        selectedSteps: stepsToRun.map((s) => s.type === "step" ? s.step.id : `control-${s.type}`)
+      }
+    });
     const results = await Promise.all(
       stepsToRun.map(
         (step, index) => this.executeEntry({
           workflowId,
           runId,
           entry: step,
+          serializedStepGraph,
           prevStep,
           stepResults,
           resume,
-          serializedStepGraph,
           executionContext: {
             workflowId,
             runId,
@@ -1223,7 +1362,12 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           },
           emitter,
           abortController,
-          runtimeContext
+          runtimeContext,
+          writableStream,
+          disableScorers,
+          tracingContext: {
+            currentSpan: conditionalSpan
+          }
         })
       )
     );
@@ -1244,8 +1388,19 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         }, {})
       };
     }
+    if (execResults.status === "failed") {
+      conditionalSpan?.error({
+        error: new Error(execResults.error)
+      });
+    } else {
+      conditionalSpan?.end({
+        output: execResults.output || execResults
+      });
+    }
     return execResults;
   }
 };
 
 export { InngestExecutionEngine, InngestRun, InngestWorkflow, createStep, init, serve };
+//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map