@mastra/inngest 0.11.11-alpha.0 → 0.12.0-alpha.1

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @mastra/inngest@0.11.11-alpha.0 build /home/runner/work/mastra/mastra/workflows/inngest
+> @mastra/inngest@0.12.0-alpha.1 build /home/runner/work/mastra/mastra/workflows/inngest
 > tsup --silent --config tsup.config.ts
 

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @mastra/inngest
 
+## 0.12.0-alpha.1
+
+### Minor Changes
+
+- [#6971](https://github.com/mastra-ai/mastra/pull/6971) [`727f7e5`](https://github.com/mastra-ai/mastra/commit/727f7e5086e62e0dfe3356fb6dcd8bcb420af246) Thanks [@epinzur](https://github.com/epinzur)! - "updated ai tracing in workflows"
+
+- [#7011](https://github.com/mastra-ai/mastra/pull/7011) [`4189486`](https://github.com/mastra-ai/mastra/commit/4189486c6718fda78347bdf4ce4d3fc33b2236e1) Thanks [@epinzur](https://github.com/epinzur)! - Wrapped mastra objects in workflow steps to automatically pass on tracing context
+
+### Patch Changes
+
+- [#6996](https://github.com/mastra-ai/mastra/pull/6996) [`24d9ee3`](https://github.com/mastra-ai/mastra/commit/24d9ee3db1c09d15f27a5d0971b102abcfcf7dfd) Thanks [@wardpeet](https://github.com/wardpeet)! - Improve type resolving
+
+- Updated dependencies [[`943a7f3`](https://github.com/mastra-ai/mastra/commit/943a7f3dbc6a8ab3f9b7bc7c8a1c5b319c3d7f56), [`be49354`](https://github.com/mastra-ai/mastra/commit/be493546dca540101923ec700feb31f9a13939f2), [`d591ab3`](https://github.com/mastra-ai/mastra/commit/d591ab3ecc985c1870c0db347f8d7a20f7360536), [`ba82abe`](https://github.com/mastra-ai/mastra/commit/ba82abe76e869316bb5a9c95e8ea3946f3436fae), [`727f7e5`](https://github.com/mastra-ai/mastra/commit/727f7e5086e62e0dfe3356fb6dcd8bcb420af246), [`82d9f64`](https://github.com/mastra-ai/mastra/commit/82d9f647fbe4f0177320e7c05073fce88599aa95), [`4189486`](https://github.com/mastra-ai/mastra/commit/4189486c6718fda78347bdf4ce4d3fc33b2236e1), [`ca8ec2f`](https://github.com/mastra-ai/mastra/commit/ca8ec2f61884b9dfec5fc0d5f4f29d281ad13c01)]:
+  - @mastra/core@0.14.2-alpha.1
+
 ## 0.11.11-alpha.0
 
 ### Patch Changes

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"
       }
@@ -342,6 +344,7 @@ var InngestWorkflow = class _InngestWorkflow extends workflows.Workflow {
           value: {},
           context: {},
           activePaths: [],
+          waitingPaths: {},
           serializedStepGraph: this.serializedStepGraph,
           suspendedPaths: {},
           result: void 0,
@@ -406,7 +409,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 +455,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;
@@ -468,6 +473,7 @@ function createStep(params) {
           // resourceId: inputData.resourceId,
           // threadId: inputData.threadId,
           runtimeContext,
+          tracingContext,
           onFinish: (result) => {
             streamPromise.resolve(result.text);
           },
@@ -516,11 +522,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
         });
       }
     };
@@ -641,35 +648,6 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     executionSpan?.end();
     return base;
   }
-  async superExecuteStep({
-    workflowId,
-    runId,
-    step,
-    stepResults,
-    executionContext,
-    resume,
-    prevOutput,
-    emitter,
-    abortController,
-    runtimeContext,
-    writableStream,
-    serializedStepGraph
-  }) {
-    return super.executeStep({
-      workflowId,
-      runId,
-      step,
-      stepResults,
-      executionContext,
-      resume,
-      prevOutput,
-      emitter,
-      abortController,
-      runtimeContext,
-      writableStream,
-      serializedStepGraph
-    });
-  }
   // async executeSleep({ id, duration }: { id: string; duration: number }): Promise<void> {
   //   await this.inngestStep.sleep(id, duration);
   // }
@@ -682,9 +660,18 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    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 () => {
@@ -695,6 +682,9 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           runtimeContext,
           inputData: prevOutput,
           runCount: -1,
+          tracingContext: {
+            currentSpan: sleepSpan
+          },
           getInitData: () => stepResults?.input,
           getStepResult: (step) => {
             if (!step?.id) {
@@ -728,8 +718,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,
@@ -740,9 +741,19 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    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();
@@ -753,6 +764,9 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           runtimeContext,
           inputData: prevOutput,
           runCount: -1,
+          tracingContext: {
+            currentSpan: sleepUntilSpan
+          },
           getInitData: () => stepResults?.input,
           getStepResult: (step) => {
             if (!step?.id) {
@@ -786,11 +800,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}`, {
@@ -811,8 +838,17 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    writableStream,
+    tracingContext
   }) {
+    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 () => {
@@ -1033,6 +1069,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];
@@ -1096,7 +1135,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", {
@@ -1139,6 +1180,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           }
         });
       }
+      stepAISpan?.end({ output: execResults });
       return { result: execResults, executionContext, stepResults };
     });
     Object.assign(executionContext.suspendedPaths, stepRes.executionContext.suspendedPaths);
@@ -1167,6 +1209,7 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
             context: stepResults,
             activePaths: [],
             suspendedPaths: executionContext.suspendedPaths,
+            waitingPaths: {},
             serializedStepGraph,
             status: workflowStatus,
             result,
@@ -1191,12 +1234,29 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
     emitter,
     abortController,
     runtimeContext,
-    writableStream
+    writableStream,
+    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,
@@ -1205,6 +1265,9 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
               runtimeContext,
               runCount: -1,
               inputData: prevOutput,
+              tracingContext: {
+                currentSpan: evalSpan
+              },
               getInitData: () => stepResults?.input,
               getStepResult: (step) => {
                 if (!step?.id) {
@@ -1239,14 +1302,32 @@ 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({
@@ -1268,7 +1349,10 @@ var InngestExecutionEngine = class extends workflows.DefaultExecutionEngine {
           emitter,
           abortController,
           runtimeContext,
-          writableStream
+          writableStream,
+          tracingContext: {
+            currentSpan: conditionalSpan
+          }
         })
       )
     );
@@ -1289,6 +1373,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;
   }
 };