@mastra/inngest 0.13.2 → 0.13.3-alpha.1

package/dist/index.js

@@ -52,7 +52,6 @@ var InngestRun = class extends Run {
       await new Promise((resolve) => setTimeout(resolve, 1e3));
       runs = await this.getRuns(eventId);
       if (runs?.[0]?.status === "Failed") {
-        console.log("run", runs?.[0]);
         throw new Error(`Function run ${runs?.[0]?.status}`);
       } else if (runs?.[0]?.status === "Cancelled") {
         const snapshot = await this.#mastra?.storage?.loadWorkflowSnapshot({
@@ -85,6 +84,7 @@ var InngestRun = class extends Run {
       await this.#mastra?.storage?.persistWorkflowSnapshot({
         workflowName: this.workflowId,
         runId: this.runId,
+        resourceId: this.resourceId,
         snapshot: {
           ...snapshot,
           status: "canceled"
@@ -98,6 +98,7 @@ var InngestRun = class extends Run {
     await this.#mastra.getStorage()?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId,
+      resourceId: this.resourceId,
       snapshot: {
         runId: this.runId,
         serializedStepGraph: this.serializedStepGraph,
@@ -114,7 +115,8 @@ var InngestRun = class extends Run {
       name: `workflow.${this.workflowId}`,
       data: {
         inputData,
-        runId: this.runId
+        runId: this.runId,
+        resourceId: this.resourceId
       }
     });
     const eventId = eventOutput.ids[0];
@@ -202,33 +204,9 @@ 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 {
-        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-", "")
@@ -334,6 +312,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       {
         workflowId: this.id,
         runId: runIdToUse,
+        resourceId: options?.resourceId,
         executionEngine: this.executionEngine,
         executionGraph: this.executionGraph,
         serializedStepGraph: this.serializedStepGraph,
@@ -349,6 +328,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       await this.mastra?.getStorage()?.persistWorkflowSnapshot({
         workflowName: this.id,
         runId: runIdToUse,
+        resourceId: options?.resourceId,
         snapshot: {
           runId: runIdToUse,
           status: "pending",
@@ -382,7 +362,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
-        let { inputData, runId, resume } = event.data;
+        let { inputData, runId, resourceId, resume } = event.data;
         if (!runId) {
           runId = await step.run(`workflow.${this.id}.runIdGen`, async () => {
             return randomUUID();
@@ -414,6 +394,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
         const result = await engine.execute({
           workflowId: this.id,
           runId,
+          resourceId,
           graph: this.executionGraph,
           serializedStepGraph: this.serializedStepGraph,
           input: inputData,
@@ -461,8 +442,6 @@ function createStep(params) {
       // @ts-ignore
       inputSchema: z.object({
         prompt: z.string()
-        // resourceId: z.string().optional(),
-        // threadId: z.string().optional(),
       }),
       // @ts-ignore
       outputSchema: z.object({
@@ -478,13 +457,7 @@ function createStep(params) {
           name: params.name,
           args: inputData
         };
-        await emitter.emit("watch-v2", {
-          type: "workflow-agent-call-start",
-          payload: toolData
-        });
         const { fullStream } = await params.stream(inputData.prompt, {
-          // resourceId: inputData.resourceId,
-          // threadId: inputData.threadId,
           runtimeContext,
           tracingContext,
           onFinish: (result) => {
@@ -495,12 +468,22 @@ function createStep(params) {
         if (abortSignal.aborted) {
           return abort();
         }
+        await emitter.emit("watch-v2", {
+          type: "tool-call-streaming-start",
+          ...toolData ?? {}
+        });
         for await (const chunk of fullStream) {
-          await emitter.emit("watch-v2", chunk);
+          if (chunk.type === "text-delta") {
+            await emitter.emit("watch-v2", {
+              type: "tool-call-delta",
+              ...toolData ?? {},
+              argsTextDelta: chunk.textDelta
+            });
+          }
         }
         await emitter.emit("watch-v2", {
-          type: "workflow-agent-call-finish",
-          payload: toolData
+          type: "tool-call-streaming-finish",
+          ...toolData ?? {}
         });
         return {
           text: await streamPromise.promise
@@ -667,7 +650,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       attributes: {
         durationMs: duration,
         sleepType: fn ? "dynamic" : "fixed"
-      }
+      },
+      isInternal: tracingContext?.isInternal
     });
     if (fn) {
       const stepCallId = randomUUID();
@@ -680,7 +664,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           inputData: prevOutput,
           runCount: -1,
           tracingContext: {
-            currentSpan: sleepSpan
+            currentSpan: sleepSpan,
+            isInternal: sleepSpan?.isInternal
           },
           getInitData: () => stepResults?.input,
           getStepResult: (step) => {
@@ -752,7 +737,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         untilDate: date,
         durationMs: date ? Math.max(0, date.getTime() - Date.now()) : void 0,
         sleepType: fn ? "dynamic" : "fixed"
-      }
+      },
+      isInternal: tracingContext?.isInternal
     });
     if (fn) {
       date = await this.inngestStep.run(`workflow.${workflowId}.sleepUntil.${entry.id}`, async () => {
@@ -765,7 +751,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           inputData: prevOutput,
           runCount: -1,
           tracingContext: {
-            currentSpan: sleepUntilSpan
+            currentSpan: sleepUntilSpan,
+            isInternal: sleepUntilSpan?.isInternal
           },
           getInitData: () => stepResults?.input,
           getStepResult: (step) => {
@@ -802,6 +789,9 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           )
         });
       });
+      if (date && !(date instanceof Date)) {
+        date = new Date(date);
+      }
       const time = !date ? 0 : date.getTime() - Date.now();
       sleepUntilSpan?.update({
         attributes: {
@@ -850,7 +840,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       input: prevOutput,
       attributes: {
         stepId: step.id
-      }
+      },
+      isInternal: tracingContext?.isInternal
     });
     const startedAt = await this.inngestStep.run(
       `workflow.${executionContext.workflowId}.run.${executionContext.runId}.step.${step.id}.running_ev`,
@@ -1073,7 +1064,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           inputData: prevOutput,
           resumeData: resume?.steps[0] === step.id ? resume?.resumePayload : void 0,
           tracingContext: {
-            currentSpan: stepAISpan
+            currentSpan: stepAISpan,
+            isInternal: stepAISpan?.isInternal
           },
           getInitData: () => stepResults?.input,
           getStepResult: (step2) => {
@@ -1198,7 +1190,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             stepId: step.id,
             runtimeContext,
             disableScorers,
-            tracingContext: { currentSpan: stepAISpan }
+            tracingContext: { currentSpan: stepAISpan, isInternal: true }
           });
         }
       });
@@ -1211,6 +1203,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     workflowId,
     runId,
     stepResults,
+    resourceId,
     executionContext,
     serializedStepGraph,
     workflowStatus,
@@ -1223,6 +1216,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         await this.mastra?.getStorage()?.persistWorkflowSnapshot({
           workflowName: workflowId,
           runId,
+          resourceId,
           snapshot: {
             runId,
             value: {},
@@ -1264,7 +1258,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       input: prevOutput,
       attributes: {
         conditionCount: entry.conditions.length
-      }
+      },
+      isInternal: tracingContext?.isInternal
     });
     let execResults;
     const truthyIndexes = (await Promise.all(
@@ -1276,7 +1271,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             input: prevOutput,
             attributes: {
               conditionIndex: index
-            }
+            },
+            isInternal: tracingContext?.isInternal
           });
           try {
             const result = await cond({
@@ -1287,7 +1283,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               runCount: -1,
               inputData: prevOutput,
               tracingContext: {
-                currentSpan: evalSpan
+                currentSpan: evalSpan,
+                isInternal: evalSpan?.isInternal
               },
               getInitData: () => stepResults?.input,
               getStepResult: (step) => {
@@ -1375,7 +1372,8 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           writableStream,
           disableScorers,
           tracingContext: {
-            currentSpan: conditionalSpan
+            currentSpan: conditionalSpan,
+            isInternal: conditionalSpan?.isInternal
           }
         })
       )