@mastra/inngest 1.8.7 → 1.8.8

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as InngestPubSub, i as InngestRun, n as collectInngestFunctions, o as InngestExecutionEngine, r as InngestWorkflow, t as connect } from "./connect-D7Dro-2T.js";
+import { a as buildDurableResumeEventData, c as InngestPubSub, i as InngestRun, l as InngestExecutionEngine, n as collectInngestFunctions, o as buildDurableTriggerEventData, r as InngestWorkflow, s as mergeResumeRequestContext, t as connect } from "./connect-Dsxakf92.js";
 import { Agent, MessageList, TripWire } from "@mastra/core/agent";
 import { ErrorCategory, ErrorDomain, MastraError } from "@mastra/core/error";
 import { EntityType, InternalSpans, SpanType } from "@mastra/core/observability";
@@ -7,6 +7,7 @@ import { toStandardSchema } from "@mastra/core/schema";
 import { Tool, createTool } from "@mastra/core/tools";
 import { Workflow, createStepFromAgent, createStepFromTool } from "@mastra/core/workflows";
 import { DurableAgentDefaults, DurableStepIds, baseIterationStateSchema, createBaseIterationStateUpdate, createDurableAgentStream, createDurableBackgroundTaskCheckStep, createDurableLLMExecutionStep, createDurableLLMMappingStep, createDurableToolCallStep, durableAgenticOutputSchema, emitErrorEvent, emitFinishEvent, executeDurableAgentScorers, globalRunRegistry, modelConfigSchema, prepareForDurableExecution, publishAbortRequest, resolveDurableToolCallConcurrency, runDurableFinishSideEffects, runDurableStreamUntilIdle, runResumeDurableStreamUntilIdle } from "@mastra/core/agent/durable";
+import { NonRetriableError } from "inngest";
 import { CachingPubSub } from "@mastra/core/events";
 import { serve as serve$1 } from "inngest/hono";
 import { InMemoryServerCache } from "@mastra/core/cache";
@@ -448,17 +449,18 @@ function createInngestAgent(options) {
 	/**
 	* Trigger the workflow via Inngest event
 	*/
-	async function triggerWorkflow(runId, workflowInput, tracingOptions) {
+	async function triggerWorkflow(runId, workflowInput, tracingOptions, actor) {
 		const eventName = `workflow.${InngestDurableStepIds.AGENTIC_LOOP}`;
 		await inngest.send({
 			name: eventName,
-			data: {
+			data: buildDurableTriggerEventData({
 				inputData: workflowInput,
 				runId,
 				resourceId: workflowInput.state?.resourceId,
 				requestContext: workflowInput.requestContextEntries ?? {},
-				tracingOptions
-			}
+				tracingOptions,
+				actor
+			})
 		});
 	}
 	/**
@@ -528,7 +530,10 @@ function createInngestAgent(options) {
 				options: streamOptions,
 				runId: streamOptions?.runId,
 				requestContext: streamOptions?.requestContext,
-				methodType: streamOptions?.__methodType ?? "stream"
+				methodType: streamOptions?.__methodType ?? "stream",
+				mastra,
+				durableAgentId: agentId,
+				durableAgentName: agentName
 			});
 			workflowInput.agentId = agentId;
 			workflowInput.agentName = agentName;
@@ -541,33 +546,6 @@ function createInngestAgent(options) {
 			registryEntry.abortController = abortController;
 			registryEntry.abortSignal = abortController.signal;
 			globalRunRegistry.set(runId, registryEntry);
-			const agentSpan = (mastra?.observability?.getSelectedInstance({ requestContext: streamOptions?.requestContext }))?.startSpan({
-				type: SpanType.AGENT_RUN,
-				name: `agent run: '${agentId}'`,
-				entityType: EntityType.AGENT,
-				entityId: agentId,
-				entityName: agentName,
-				input: workflowInput.messageListState,
-				metadata: {
-					runId,
-					threadId,
-					resourceId
-				}
-			});
-			const agentSpanData = agentSpan?.exportSpan();
-			const modelSpanData = (agentSpan?.createChildSpan({
-				type: SpanType.MODEL_GENERATION,
-				name: `llm: '${workflowInput.modelConfig.modelId}'`,
-				input: { messages: workflowInput.messageListState },
-				attributes: {
-					model: workflowInput.modelConfig.modelId,
-					provider: workflowInput.modelConfig.provider,
-					streaming: true,
-					parameters: { temperature: workflowInput.options?.modelSettings?.temperature }
-				}
-			}))?.exportSpan();
-			workflowInput.agentSpanData = agentSpanData;
-			workflowInput.modelSpanData = modelSpanData;
 			workflowInput.stepIndex = 0;
 			let cleanedUp = false;
 			const finalizeGlobalRegistry = () => {
@@ -615,11 +593,12 @@ function createInngestAgent(options) {
 				} : void 0,
 				closeOnSuspend: streamOptions?.[CLOSE_ON_SUSPEND] === true
 			});
-			const tracingOptions = agentSpanData ? {
+			const agentSpanData = workflowInput.agentSpanData;
+			const tracingOptions = agentSpanData?.traceId && agentSpanData?.id ? {
 				traceId: agentSpanData.traceId,
 				parentSpanId: agentSpanData.id
 			} : void 0;
-			const workflowExecution = ready.then(() => triggerWorkflow(runId, workflowInput, tracingOptions)).catch((error) => {
+			const workflowExecution = ready.then(() => triggerWorkflow(runId, workflowInput, tracingOptions, streamOptions?.actor)).catch((error) => {
 				emitError(runId, error);
 			});
 			const trackedEntry = globalRunRegistry.get(runId);
@@ -718,40 +697,64 @@ function createInngestAgent(options) {
 				closeOnSuspend: resumeOptions?.[CLOSE_ON_SUSPEND] === true
 			});
 			const eventName = `workflow.${InngestDurableStepIds.AGENTIC_LOOP}`;
-			const workflowExecution = ready.then(async () => {
+			const dispatch = ready.then(async () => {
 				const snapshot = await (await mastra?.getStorage()?.getStore("workflows"))?.loadWorkflowSnapshot({
 					workflowName: InngestDurableStepIds.AGENTIC_LOOP,
 					runId
 				});
 				const suspendedStepIds = snapshot?.suspendedPaths ? Object.keys(snapshot.suspendedPaths) : [];
-				const steps = suspendedStepIds.length > 0 ? suspendedStepIds : [];
-				const requestContext = {
-					...snapshot?.requestContext ?? {},
-					...resumeOptions?.requestContext?.toJSON() ?? {}
+				const resumeLabels = snapshot?.resumeLabels ?? {};
+				const toolCallId = resumeOptions?.toolCallId;
+				const expandToLeafPath = (stepId) => {
+					const nestedPath = (snapshot?.context ?? {})[stepId]?.suspendPayload?.__workflow_meta?.path;
+					return Array.isArray(nestedPath) ? [stepId, ...nestedPath] : [stepId];
 				};
+				let steps;
+				if (toolCallId) {
+					const targetStepId = resumeLabels[toolCallId]?.stepId;
+					if (!targetStepId) {
+						const available = Object.keys(resumeLabels);
+						throw new NonRetriableError(`Cannot resume run ${runId}: no suspended tool call with id "${toolCallId}". ` + (available.length > 0 ? `Suspended tool call ids: ${available.join(", ")}.` : `No tool calls are currently suspended.`));
+					}
+					steps = expandToLeafPath(targetStepId);
+				} else {
+					const available = Object.keys(resumeLabels);
+					if (suspendedStepIds.length > 1 || available.length > 1) throw new NonRetriableError(`Cannot resume run ${runId}: more than one suspension is parked. Pass "toolCallId" to choose which suspended tool call to resume.` + (available.length > 0 ? ` Suspended tool call ids: ${available.join(", ")}.` : ""));
+					steps = suspendedStepIds[0] ? expandToLeafPath(suspendedStepIds[0]) : [];
+				}
+				const requestContext = mergeResumeRequestContext(snapshot?.requestContext, resumeOptions?.requestContext);
 				const tracingOptions = snapshot?.tracingContext ? {
 					traceId: snapshot.tracingContext.traceId,
 					parentSpanId: snapshot.tracingContext.spanId
 				} : void 0;
 				await inngest.send({
 					name: eventName,
-					data: {
+					data: buildDurableResumeEventData({
 						inputData: resumeData,
 						runId,
 						resourceId: resumeOptions?.resourceId,
 						requestContext,
 						tracingOptions,
+						actor: resumeOptions?.actor,
 						resume: {
 							steps,
 							resumePayload: resumeData,
 							resumePath: steps[0] ? snapshot?.suspendedPaths?.[steps[0]] : void 0
 						}
-					}
+					})
 				});
-			}).catch((error) => {
+			});
+			const workflowExecution = dispatch.catch((error) => {
 				emitError(runId, error);
 			});
 			existingEntry.workflowExecution = workflowExecution;
+			try {
+				await dispatch;
+			} catch (error) {
+				streamCleanup();
+				finalizeResumeRegistry();
+				throw error;
+			}
 			const abort = async (reason) => {
 				if (!abortController.signal.aborted) abortController.abort(reason);
 				await requestRemoteAbort(runId);
@@ -778,7 +781,10 @@ function createInngestAgent(options) {
 				agent,
 				messages,
 				options: prepareOptions,
-				requestContext: prepareOptions?.requestContext
+				requestContext: prepareOptions?.requestContext,
+				mastra,
+				durableAgentId: agentId,
+				durableAgentName: agentName
 			});
 			preparation.workflowInput.agentId = agentId;
 			preparation.workflowInput.agentName = agentName;