@mastra/inngest 0.0.0-fix-memory-search-fetch-20251027160505 → 0.0.0-fix-persist-session-cache-option-mcp-server-20251030161352

package/dist/index.js

@@ -2,8 +2,8 @@ import { randomUUID } from 'crypto';
 import { ReadableStream } from 'stream/web';
 import { subscribe } from '@inngest/realtime';
 import { wrapMastra, AISpanType } from '@mastra/core/ai-tracing';
-import { RuntimeContext } from '@mastra/core/di';
-import { WorkflowRunOutput } from '@mastra/core/stream';
+import { RequestContext } from '@mastra/core/di';
+import { ChunkFrom, WorkflowRunOutput } from '@mastra/core/stream';
 import { ToolStream, Tool } from '@mastra/core/tools';
 import { Run, Workflow, DefaultExecutionEngine, createDeprecationProxy, getStepResult, runCountDeprecationMessage, validateStepInput } from '@mastra/core/workflows';
 import { EMITTER_SYMBOL, STREAM_FORMAT_SYMBOL } from '@mastra/core/workflows/_constants';
@@ -18,7 +18,7 @@ function serve({
   functions: userFunctions = [],
   registerOptions
 }) {
-  const wfs = mastra.getWorkflows();
+  const wfs = mastra.listWorkflows();
   const workflowFunctions = Array.from(
     new Set(
       Object.values(wfs).flatMap((wf) => {
@@ -108,9 +108,15 @@ var InngestRun = class extends Run {
       });
     }
   }
-  async start({
+  async start(params) {
+    return this._start(params);
+  }
+  async _start({
     inputData,
-    initialState
+    initialState,
+    outputOptions,
+    tracingOptions,
+    format
   }) {
     await this.#mastra.getStorage()?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
@@ -137,7 +143,10 @@ var InngestRun = class extends Run {
         inputData: inputDataToUse,
         initialState: initialStateToUse,
         runId: this.runId,
-        resourceId: this.resourceId
+        resourceId: this.resourceId,
+        outputOptions,
+        tracingOptions,
+        format
       }
     });
     const eventId = eventOutput.ids[0];
@@ -226,20 +235,35 @@ var InngestRun = class extends Run {
       });
     };
   }
-  streamLegacy({ inputData, runtimeContext } = {}) {
+  streamLegacy({ inputData, requestContext } = {}) {
     const { readable, writable } = new TransformStream();
     const writer = writable.getWriter();
     const unwatch = this.watch(async (event) => {
       try {
+        await writer.write({
+          // @ts-ignore
+          type: "start",
+          // @ts-ignore
+          payload: { runId: this.runId }
+        });
         const e = {
           ...event,
           type: event.type.replace("workflow-", "")
         };
+        if (e.type === "step-output") {
+          e.type = e.payload.output.type;
+          e.payload = e.payload.output.payload;
+        }
         await writer.write(e);
       } catch {
       }
     }, "watch-v2");
     this.closeStreamAction = async () => {
+      await writer.write({
+        type: "finish",
+        // @ts-ignore
+        payload: { runId: this.runId }
+      });
       unwatch();
       try {
         await writer.close();
@@ -249,7 +273,7 @@ var InngestRun = class extends Run {
         writer.releaseLock();
       }
     };
-    this.executionResults = this.start({ inputData, runtimeContext }).then((result) => {
+    this.executionResults = this._start({ inputData, requestContext, format: "legacy" }).then((result) => {
       if (result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {
         });
@@ -263,11 +287,18 @@ var InngestRun = class extends Run {
   }
   stream({
     inputData,
-    runtimeContext,
-    closeOnSuspend = true
+    requestContext,
+    tracingOptions,
+    closeOnSuspend = true,
+    initialState,
+    outputOptions
   } = {}) {
+    if (this.closeStreamAction && this.streamOutput) {
+      return this.streamOutput;
+    }
+    this.closeStreamAction = async () => {
+    };
     const self = this;
-    let streamOutput;
     const stream = new ReadableStream({
       async start(controller) {
         const unwatch = self.watch(async ({ type, from = ChunkFrom.WORKFLOW, payload }) => {
@@ -276,7 +307,7 @@ var InngestRun = class extends Run {
             runId: self.runId,
             from,
             payload: {
-              stepName: payload.id,
+              stepName: payload?.id,
               ...payload
             }
           });
@@ -289,29 +320,46 @@ var InngestRun = class extends Run {
             console.error("Error closing stream:", err);
           }
         };
-        const executionResultsPromise = self.start({
+        const executionResultsPromise = self._start({
           inputData,
-          runtimeContext
+          requestContext,
+          // tracingContext, // We are not able to pass a reference to a span here, what to do?
+          initialState,
+          tracingOptions,
+          outputOptions,
+          format: "vnext"
         });
-        const executionResults = await executionResultsPromise;
-        if (closeOnSuspend) {
-          self.closeStreamAction?.().catch(() => {
-          });
-        } else if (executionResults.status !== "suspended") {
+        let executionResults;
+        try {
+          executionResults = await executionResultsPromise;
+          if (closeOnSuspend) {
+            self.closeStreamAction?.().catch(() => {
+            });
+          } else if (executionResults.status !== "suspended") {
+            self.closeStreamAction?.().catch(() => {
+            });
+          }
+          if (self.streamOutput) {
+            self.streamOutput.updateResults(
+              executionResults
+            );
+          }
+        } catch (err) {
+          self.streamOutput?.rejectResults(err);
           self.closeStreamAction?.().catch(() => {
           });
         }
-        if (streamOutput) {
-          streamOutput.updateResults(executionResults);
-        }
       }
     });
-    streamOutput = new WorkflowRunOutput({
+    this.streamOutput = new WorkflowRunOutput({
       runId: this.runId,
       workflowId: this.workflowId,
       stream
     });
-    return streamOutput;
+    return this.streamOutput;
+  }
+  streamVNext(args = {}) {
+    return this.stream(args);
   }
 };
 var InngestWorkflow = class _InngestWorkflow extends Workflow {
@@ -435,7 +483,7 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
       },
       { event: `workflow.${this.id}` },
       async ({ event, step, attempt, publish }) => {
-        let { inputData, initialState, runId, resourceId, resume, outputOptions } = event.data;
+        let { inputData, initialState, runId, resourceId, resume, outputOptions, format } = event.data;
         if (!runId) {
           runId = await step.run(`workflow.${this.id}.runIdGen`, async () => {
             return randomUUID();
@@ -474,13 +522,19 @@ var InngestWorkflow = class _InngestWorkflow extends Workflow {
           initialState,
           emitter,
           retryConfig: this.retryConfig,
-          runtimeContext: new RuntimeContext(),
+          requestContext: new RequestContext(),
           // TODO
           resume,
+          format,
           abortController: new AbortController(),
-          currentSpan: void 0,
-          // TODO: Pass actual parent AI span from workflow execution context
-          outputOptions
+          // currentSpan: undefined, // TODO: Pass actual parent AI span from workflow execution context
+          outputOptions,
+          writableStream: new WritableStream({
+            write(chunk) {
+              void emitter.emit("watch-v2", chunk).catch(() => {
+              });
+            }
+          })
         });
         await step.run(`workflow.${this.id}.finalize`, async () => {
           if (result.status === "failed") {
@@ -518,7 +572,7 @@ function isAgent(params) {
 function isTool(params) {
   return params instanceof Tool;
 }
-function createStep(params) {
+function createStep(params, agentOptions) {
   if (isAgent(params)) {
     return {
       id: params.name,
@@ -526,12 +580,23 @@ function createStep(params) {
       // @ts-ignore
       inputSchema: z.object({
         prompt: z.string()
+        // resourceId: z.string().optional(),
+        // threadId: z.string().optional(),
       }),
       // @ts-ignore
       outputSchema: z.object({
         text: z.string()
       }),
-      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort, tracingContext }) => {
+      execute: async ({
+        inputData,
+        [EMITTER_SYMBOL]: emitter,
+        [STREAM_FORMAT_SYMBOL]: streamFormat,
+        requestContext,
+        tracingContext,
+        abortSignal,
+        abort,
+        writer
+      }) => {
         let streamPromise = {};
         streamPromise.promise = new Promise((resolve, reject) => {
           streamPromise.resolve = resolve;
@@ -541,48 +606,40 @@ function createStep(params) {
           name: params.name,
           args: inputData
         };
-        if ((await params.getLLM()).getModel().specificationVersion === `v2`) {
-          const { fullStream } = await params.stream(inputData.prompt, {
-            runtimeContext,
+        let stream;
+        if ((await params.getModel()).specificationVersion === "v1") {
+          const { fullStream } = await params.streamLegacy(inputData.prompt, {
+            ...agentOptions ?? {},
+            // resourceId: inputData.resourceId,
+            // threadId: inputData.threadId,
+            requestContext,
             tracingContext,
             onFinish: (result) => {
               streamPromise.resolve(result.text);
+              void agentOptions?.onFinish?.(result);
             },
             abortSignal
           });
-          if (abortSignal.aborted) {
-            return abort();
-          }
-          await emitter.emit("watch-v2", {
-            type: "tool-call-streaming-start",
-            ...toolData ?? {}
-          });
-          for await (const chunk of fullStream) {
-            if (chunk.type === "text-delta") {
-              await emitter.emit("watch-v2", {
-                type: "tool-call-delta",
-                ...toolData ?? {},
-                argsTextDelta: chunk.payload.text
-              });
-            }
-          }
+          stream = fullStream;
         } else {
-          const { fullStream } = await params.streamLegacy(inputData.prompt, {
-            runtimeContext,
+          const modelOutput = await params.stream(inputData.prompt, {
+            ...agentOptions ?? {},
+            requestContext,
             tracingContext,
             onFinish: (result) => {
               streamPromise.resolve(result.text);
+              void agentOptions?.onFinish?.(result);
             },
             abortSignal
           });
-          if (abortSignal.aborted) {
-            return abort();
-          }
+          stream = modelOutput.fullStream;
+        }
+        if (streamFormat === "legacy") {
           await emitter.emit("watch-v2", {
             type: "tool-call-streaming-start",
             ...toolData ?? {}
           });
-          for await (const chunk of fullStream) {
+          for await (const chunk of stream) {
             if (chunk.type === "text-delta") {
               await emitter.emit("watch-v2", {
                 type: "tool-call-delta",
@@ -591,11 +648,18 @@ function createStep(params) {
               });
             }
           }
+          await emitter.emit("watch-v2", {
+            type: "tool-call-streaming-finish",
+            ...toolData ?? {}
+          });
+        } else {
+          for await (const chunk of stream) {
+            await writer.write(chunk);
+          }
+        }
+        if (abortSignal.aborted) {
+          return abort();
         }
-        await emitter.emit("watch-v2", {
-          type: "tool-call-streaming-finish",
-          ...toolData ?? {}
-        });
         return {
           text: await streamPromise.promise
         };
@@ -614,11 +678,11 @@ function createStep(params) {
       description: params.description,
       inputSchema: params.inputSchema,
       outputSchema: params.outputSchema,
-      execute: async ({ inputData, mastra, runtimeContext, tracingContext, suspend, resumeData }) => {
+      execute: async ({ inputData, mastra, requestContext, tracingContext, suspend, resumeData }) => {
         return params.execute({
           context: inputData,
           mastra: wrapMastra(mastra, tracingContext),
-          runtimeContext,
+          requestContext,
           tracingContext,
           suspend,
           resumeData
@@ -681,18 +745,6 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     this.inngestStep = inngestStep;
     this.inngestAttempts = inngestAttempts;
   }
-  async execute(params) {
-    await params.emitter.emit("watch-v2", {
-      type: "workflow-start",
-      payload: { runId: params.runId }
-    });
-    const result = await super.execute(params);
-    await params.emitter.emit("watch-v2", {
-      type: "workflow-finish",
-      payload: { runId: params.runId }
-    });
-    return result;
-  }
   async fmtReturnValue(emitter, stepResults, lastOutput, error) {
     const base = {
       status: lastOutput.status,
@@ -760,7 +812,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     stepResults,
     emitter,
     abortController,
-    runtimeContext,
+    requestContext,
     executionContext,
     writableStream,
     tracingContext
@@ -784,7 +836,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               runId,
               workflowId,
               mastra: this.mastra,
-              runtimeContext,
+              requestContext,
               inputData: prevOutput,
               state: executionContext.state,
               setState: (state) => {
@@ -806,7 +858,6 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
                 abortController?.abort();
               },
               [EMITTER_SYMBOL]: emitter,
-              // TODO: add streamVNext support
               [STREAM_FORMAT_SYMBOL]: executionContext.format,
               engine: { step: this.inngestStep },
               abortSignal: abortController?.signal,
@@ -850,7 +901,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     stepResults,
     emitter,
     abortController,
-    runtimeContext,
+    requestContext,
     executionContext,
     writableStream,
     tracingContext
@@ -875,7 +926,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               runId,
               workflowId,
               mastra: this.mastra,
-              runtimeContext,
+              requestContext,
               inputData: prevOutput,
               state: executionContext.state,
               setState: (state) => {
@@ -898,7 +949,6 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               },
               [EMITTER_SYMBOL]: emitter,
               [STREAM_FORMAT_SYMBOL]: executionContext.format,
-              // TODO: add streamVNext support
               engine: { step: this.inngestStep },
               abortSignal: abortController?.signal,
               writer: new ToolStream(
@@ -959,7 +1009,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     prevOutput,
     emitter,
     abortController,
-    runtimeContext,
+    requestContext,
     tracingContext,
     writableStream,
     disableScorers
@@ -1223,6 +1273,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
         resumePayload: resume?.steps[0] === step.id ? resume?.resumePayload : void 0
       };
     }
+    const stepCallId = randomUUID();
     let stepRes;
     try {
       stepRes = await this.inngestStep.run(`workflow.${executionContext.workflowId}.step.${step.id}`, async () => {
@@ -1236,8 +1287,16 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           const result = await step.execute({
             runId: executionContext.runId,
             mastra: this.mastra,
-            runtimeContext,
-            writableStream,
+            requestContext,
+            writer: new ToolStream(
+              {
+                prefix: "workflow-step",
+                callId: stepCallId,
+                name: step.id,
+                runId: executionContext.runId
+              },
+              writableStream
+            ),
             state: executionContext?.state ?? {},
             setState: (state) => {
               executionContext.state = state;
@@ -1272,6 +1331,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
               runId: stepResults[step.id]?.suspendPayload?.__workflow_meta?.runId
             },
             [EMITTER_SYMBOL]: emitter,
+            [STREAM_FORMAT_SYMBOL]: executionContext.format,
             engine: {
               step: this.inngestStep
             },
@@ -1393,7 +1453,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
             output: stepRes.result,
             workflowId: executionContext.workflowId,
             stepId: step.id,
-            runtimeContext,
+            requestContext,
             disableScorers,
             tracingContext: { currentSpan: stepAISpan }
           });
@@ -1451,14 +1511,12 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
     runId,
     entry,
     prevOutput,
-    prevStep,
     stepResults,
-    serializedStepGraph,
     resume,
     executionContext,
     emitter,
     abortController,
-    runtimeContext,
+    requestContext,
     writableStream,
     disableScorers,
     tracingContext
@@ -1492,7 +1550,7 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
                   runId,
                   workflowId,
                   mastra: this.mastra,
-                  runtimeContext,
+                  requestContext,
                   runCount: -1,
                   retryCount: -1,
                   inputData: prevOutput,
@@ -1515,7 +1573,6 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
                   },
                   [EMITTER_SYMBOL]: emitter,
                   [STREAM_FORMAT_SYMBOL]: executionContext.format,
-                  // TODO: add streamVNext support
                   engine: {
                     step: this.inngestStep
                   },
@@ -1564,13 +1621,14 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
       }
     });
     const results = await Promise.all(
-      stepsToRun.map(
-        (step, index) => this.executeEntry({
-          workflowId,
-          runId,
-          entry: step,
-          serializedStepGraph,
-          prevStep,
+      stepsToRun.map(async (step, index) => {
+        const currStepResult = stepResults[step.step.id];
+        if (currStepResult && currStepResult.status === "success") {
+          return currStepResult;
+        }
+        const result = await this.executeStep({
+          step: step.step,
+          prevOutput,
           stepResults,
           resume,
           executionContext: {
@@ -1584,26 +1642,28 @@ var InngestExecutionEngine = class extends DefaultExecutionEngine {
           },
           emitter,
           abortController,
-          runtimeContext,
+          requestContext,
           writableStream,
           disableScorers,
           tracingContext: {
             currentSpan: conditionalSpan
           }
-        })
-      )
+        });
+        stepResults[step.step.id] = result;
+        return result;
+      })
     );
-    const hasFailed = results.find((result) => result.result.status === "failed");
-    const hasSuspended = results.find((result) => result.result.status === "suspended");
+    const hasFailed = results.find((result) => result.status === "failed");
+    const hasSuspended = results.find((result) => result.status === "suspended");
     if (hasFailed) {
-      execResults = { status: "failed", error: hasFailed.result.error };
+      execResults = { status: "failed", error: hasFailed.error };
     } else if (hasSuspended) {
-      execResults = { status: "suspended", suspendPayload: hasSuspended.result.suspendPayload };
+      execResults = { status: "suspended", suspendPayload: hasSuspended.suspendPayload };
     } else {
       execResults = {
         status: "success",
         output: results.reduce((acc, result, index) => {
-          if (result.result.status === "success") {
+          if (result.status === "success") {
             acc[stepsToRun[index].step.id] = result.output;
           }
           return acc;