@mastra/inngest 0.0.0-fix-tool-call-history-3-20250806004225 → 0.0.0-fix-zod-to-json-schema-ref-strategy-20250910193441

package/dist/index.cjs

@@ -2,6 +2,7 @@
 
 var crypto = require('crypto');
 var realtime = require('@inngest/realtime');
+var aiTracing = require('@mastra/core/ai-tracing');
 var di = require('@mastra/core/di');
 var tools = require('@mastra/core/tools');
 var workflows = require('@mastra/core/workflows');
@@ -106,6 +107,7 @@ var InngestRun = class extends workflows.Run {
         context: {},
         activePaths: [],
         suspendedPaths: {},
+        waitingPaths: {},
         timestamp: Date.now(),
         status: "running"
       }
@@ -202,10 +204,38 @@ var InngestRun = class extends workflows.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");
@@ -236,8 +266,14 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.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;
   }
@@ -258,27 +294,6 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.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);
@@ -331,7 +346,7 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.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,
@@ -342,6 +357,7 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
           value: {},
           context: {},
           activePaths: [],
+          waitingPaths: {},
           serializedStepGraph: this.serializedStepGraph,
           suspendedPaths: {},
           result: void 0,
@@ -362,7 +378,9 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.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 }) => {
@@ -406,7 +424,9 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
           runtimeContext: new di.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 };
       }
@@ -450,7 +470,7 @@ function createStep(params) {
       outputSchema: zod.z.object({
         text: zod.z.string()
       }),
-      execute: async ({ inputData, [_constants.EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort }) => {
+      execute: async ({ inputData, [_constants.EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort, tracingContext }) => {
         let streamPromise = {};
         streamPromise.promise = new Promise((resolve, reject) => {
           streamPromise.resolve = resolve;
@@ -461,13 +481,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);
           },
@@ -477,29 +498,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
         };
@@ -516,11 +520,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: aiTracing.wrapMastra(mastra, tracingContext),
+          runtimeContext,
+          tracingContext
         });
       }
     };
@@ -574,12 +579,12 @@ var InngestExecutionEngine = class extends workflows.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;
@@ -641,33 +646,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     executionSpan?.end();
     return base;
   }
-  async superExecuteStep({
-    workflowId,
-    runId,
-    step,
-    stepResults,
-    executionContext,
-    resume,
-    prevOutput,
-    emitter,
-    abortController,
-    runtimeContext,
-    writableStream
-  }) {
-    return super.executeStep({
-      workflowId,
-      runId,
-      step,
-      stepResults,
-      executionContext,
-      resume,
-      prevOutput,
-      emitter,
-      abortController,
-      runtimeContext,
-      writableStream
-    });
-  }
   // async executeSleep({ id, duration }: { id: string; duration: number }): Promise<void> {
   //   await this.inngestStep.sleep(id, duration);
   // }
@@ -680,9 +658,19 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    executionContext,
+    writableStream,
+    tracingContext
   }) {
     let { duration, fn } = entry;
+    const sleepSpan = tracingContext?.currentSpan?.createChildSpan({
+      type: aiTracing.AISpanType.WORKFLOW_SLEEP,
+      name: `sleep: ${duration ? `${duration}ms` : "dynamic"}`,
+      attributes: {
+        durationMs: duration,
+        sleepType: fn ? "dynamic" : "fixed"
+      }
+    });
     if (fn) {
       const stepCallId = crypto.randomUUID();
       duration = await this.inngestStep.run(`workflow.${workflowId}.sleep.${entry.id}`, async () => {
@@ -693,6 +681,9 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           runtimeContext,
           inputData: prevOutput,
           runCount: -1,
+          tracingContext: {
+            currentSpan: sleepSpan
+          },
           getInitData: () => stepResults?.input,
           getStepResult: (step) => {
             if (!step?.id) {
@@ -713,11 +704,13 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             abortController?.abort();
           },
           [_constants.EMITTER_SYMBOL]: emitter,
+          // TODO: add streamVNext support
+          [_constants.STREAM_FORMAT_SYMBOL]: executionContext.format,
           engine: { step: this.inngestStep },
           abortSignal: abortController?.signal,
           writer: new tools.ToolStream(
             {
-              prefix: "step",
+              prefix: "workflow-step",
               callId: stepCallId,
               name: "sleep",
               runId
@@ -726,8 +719,19 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           )
         });
       });
+      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,
@@ -738,9 +742,20 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    executionContext,
+    writableStream,
+    tracingContext
   }) {
     let { date, fn } = entry;
+    const sleepUntilSpan = tracingContext?.currentSpan?.createChildSpan({
+      type: aiTracing.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 = crypto.randomUUID();
@@ -751,6 +766,9 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           runtimeContext,
           inputData: prevOutput,
           runCount: -1,
+          tracingContext: {
+            currentSpan: sleepUntilSpan
+          },
           getInitData: () => stepResults?.input,
           getStepResult: (step) => {
             if (!step?.id) {
@@ -771,11 +789,13 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             abortController?.abort();
           },
           [_constants.EMITTER_SYMBOL]: emitter,
+          [_constants.STREAM_FORMAT_SYMBOL]: executionContext.format,
+          // TODO: add streamVNext support
           engine: { step: this.inngestStep },
           abortSignal: abortController?.signal,
           writer: new tools.ToolStream(
             {
-              prefix: "step",
+              prefix: "workflow-step",
               callId: stepCallId,
               name: "sleep",
               runId
@@ -784,11 +804,24 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           )
         });
       });
+      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}`, {
@@ -809,8 +842,18 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    tracingContext,
+    writableStream,
+    disableScorers
   }) {
+    const stepAISpan = tracingContext?.currentSpan?.createChildSpan({
+      name: `workflow step: '${step.id}'`,
+      type: aiTracing.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 () => {
@@ -837,7 +880,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           eventTimestamp: Date.now()
         });
         await emitter.emit("watch-v2", {
-          type: "step-start",
+          type: "workflow-step-start",
           payload: {
             id: step.id,
             status: "running",
@@ -907,7 +950,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               eventTimestamp: Date.now()
             });
             await emitter.emit("watch-v2", {
-              type: "step-result",
+              type: "workflow-step-result",
               payload: {
                 id: step.id,
                 status: "failed",
@@ -942,7 +985,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
                 eventTimestamp: Date.now()
               });
               await emitter.emit("watch-v2", {
-                type: "step-suspended",
+                type: "workflow-step-suspended",
                 payload: {
                   id: step.id,
                   status: "suspended"
@@ -999,7 +1042,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             eventTimestamp: Date.now()
           });
           await emitter.emit("watch-v2", {
-            type: "step-result",
+            type: "workflow-step-result",
             payload: {
               id: step.id,
               status: "success",
@@ -1007,7 +1050,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             }
           });
           await emitter.emit("watch-v2", {
-            type: "step-finish",
+            type: "workflow-step-finish",
             payload: {
               id: step.id,
               metadata: {}
@@ -1031,6 +1074,9 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           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];
@@ -1094,7 +1140,9 @@ var InngestExecutionEngine = class extends workflows.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", {
@@ -1115,7 +1163,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
       });
       if (execResults.status === "suspended") {
         await emitter.emit("watch-v2", {
-          type: "step-suspended",
+          type: "workflow-step-suspended",
           payload: {
             id: step.id,
             ...execResults
@@ -1123,22 +1171,40 @@ var InngestExecutionEngine = class extends workflows.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,
+            tracingContext: { currentSpan: stepAISpan }
+          });
+        }
+      });
+    }
     Object.assign(executionContext.suspendedPaths, stepRes.executionContext.suspendedPaths);
     Object.assign(stepResults, stepRes.stepResults);
     return stepRes.result;
@@ -1165,6 +1231,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             context: stepResults,
             activePaths: [],
             suspendedPaths: executionContext.suspendedPaths,
+            waitingPaths: {},
             serializedStepGraph,
             status: workflowStatus,
             result,
@@ -1189,12 +1256,30 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    writableStream,
+    disableScorers,
+    tracingContext
   }) {
+    const conditionalSpan = tracingContext?.currentSpan?.createChildSpan({
+      type: aiTracing.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: aiTracing.AISpanType.WORKFLOW_CONDITIONAL_EVAL,
+            name: `condition: '${index}'`,
+            input: prevOutput,
+            attributes: {
+              conditionIndex: index
+            }
+          });
           try {
             const result = await cond({
               runId,
@@ -1203,6 +1288,9 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               runtimeContext,
               runCount: -1,
               inputData: prevOutput,
+              tracingContext: {
+                currentSpan: evalSpan
+              },
               getInitData: () => stepResults?.input,
               getStepResult: (step) => {
                 if (!step?.id) {
@@ -1223,13 +1311,15 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
                 abortController.abort();
               },
               [_constants.EMITTER_SYMBOL]: emitter,
+              [_constants.STREAM_FORMAT_SYMBOL]: executionContext.format,
+              // TODO: add streamVNext support
               engine: {
                 step: this.inngestStep
               },
               abortSignal: abortController.signal,
               writer: new tools.ToolStream(
                 {
-                  prefix: "step",
+                  prefix: "workflow-step",
                   callId: crypto.randomUUID(),
                   name: "conditional",
                   runId
@@ -1237,24 +1327,42 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
                 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,
@@ -1266,7 +1374,11 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           emitter,
           abortController,
           runtimeContext,
-          writableStream
+          writableStream,
+          disableScorers,
+          tracingContext: {
+            currentSpan: conditionalSpan
+          }
         })
       )
     );
@@ -1287,6 +1399,15 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
         }, {})
       };
     }
+    if (execResults.status === "failed") {
+      conditionalSpan?.error({
+        error: new Error(execResults.error)
+      });
+    } else {
+      conditionalSpan?.end({
+        output: execResults.output || execResults
+      });
+    }
     return execResults;
   }
 };