@mastra/core 1.13.3-alpha.1 → 1.14.0-alpha.2

package/dist/{chunk-QXNHZJRV.js → chunk-UWTB4U2X.js}

@@ -1,22 +1,22 @@
 import { DefaultVoice } from './chunk-ZU7M6YE4.js';
 import { PUBSUB_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-2QXNHEDL.js';
 import { createWorkspaceTools, createSkillTools, getTiktoken, BM25Index } from './chunk-II3LKO2G.js';
-import { InMemoryStore } from './chunk-T5M2TGCD.js';
-import { MessageList, coreContentToString, DefaultGeneratedFile, DefaultGeneratedFileWithType, sanitizeToolName } from './chunk-6JM4RID6.js';
+import { InMemoryStore } from './chunk-OGR427FH.js';
+import { MessageList, coreContentToString, DefaultGeneratedFile, DefaultGeneratedFileWithType, sanitizeToolName } from './chunk-MCAE3D3S.js';
 import { parsePartialJson, isDeepEqualData, stepCountIs } from './chunk-MMLX7TES.js';
 import { generateId, APICallError, tool, asSchema } from './chunk-6PALJNKG.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-CMTNYR6E.js';
-import { MastraLLMV1 } from './chunk-WKZEZJKQ.js';
+import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-5UAF67E3.js';
+import { MastraLLMV1 } from './chunk-7V4HN5NK.js';
 import { noopLogger } from './chunk-PSCMWPLC.js';
 import { EventEmitterPubSub } from './chunk-X2HAI3OX.js';
-import { removeUndefinedValues, isZodType, ensureToolProperties, makeCoreTool, createMastraProxy, deepMerge, generateEmptyFromSchema, selectFields, delay } from './chunk-CJYTDH5Q.js';
-import { resolveObservabilityContext, createObservabilityContext, getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-DJCCDPZQ.js';
-import { MastraError, getErrorFromUnknown } from './chunk-FJEVLHJT.js';
+import { removeUndefinedValues, isZodType, ensureToolProperties, makeCoreTool, createMastraProxy, deepMerge, generateEmptyFromSchema, selectFields, delay } from './chunk-KJUHI5QK.js';
+import { resolveObservabilityContext, EntityType, createObservabilityContext, getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-GVQJCS5O.js';
 import { ToolStream } from './chunk-DD2VNRQM.js';
 import { Tool, createTool, isMastraTool, isProviderTool, getProviderToolName, isProviderDefinedTool } from './chunk-UPXPPD5L.js';
 import { toStandardSchema, standardSchemaToJSONSchema, isStandardSchemaWithJSON } from './chunk-6VAVASZ5.js';
 import { RequestContext, MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY } from './chunk-JGOH7RWL.js';
+import { MastraError, getErrorFromUnknown } from './chunk-FJEVLHJT.js';
 import { MastraBase } from './chunk-WCAFTXGK.js';
 import { RegisteredLogger, ConsoleLogger } from './chunk-X2WMFSPB.js';
 import { __commonJS, __toESM } from './chunk-TM6AOUSD.js';
@@ -1064,7 +1064,7 @@ var ProcessorState = class {
     this.span = parentSpan?.createChildSpan({
       type: "processor_run" /* PROCESSOR_RUN */,
       name: `output stream processor: ${options.processorName}`,
-      entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+      entityType: EntityType.OUTPUT_PROCESSOR,
       entityName: options.processorName,
       attributes: {
         processorExecutor: "legacy",
@@ -1241,7 +1241,7 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = parentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `output processor: ${processor.id}`,
-        entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+        entityType: EntityType.OUTPUT_PROCESSOR,
         entityId: processor.id,
         entityName: processor.name,
         attributes: {
@@ -1541,7 +1541,7 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = parentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `input processor: ${processor.id}`,
-        entityType: "input_processor" /* INPUT_PROCESSOR */,
+        entityType: EntityType.INPUT_PROCESSOR,
         entityId: processor.id,
         entityName: processor.name,
         attributes: {
@@ -1740,7 +1740,7 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = currentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `input step processor: ${processor.id}`,
-        entityType: "input_step_processor" /* INPUT_STEP_PROCESSOR */,
+        entityType: EntityType.INPUT_STEP_PROCESSOR,
         entityId: processor.id,
         entityName: processor.name,
         attributes: {
@@ -1906,7 +1906,7 @@ var ProcessorRunner = class _ProcessorRunner {
       const processorSpan = parentSpan?.createChildSpan({
         type: "processor_run" /* PROCESSOR_RUN */,
         name: `output step processor: ${processor.id}`,
-        entityType: "output_step_processor" /* OUTPUT_STEP_PROCESSOR */,
+        entityType: EntityType.OUTPUT_STEP_PROCESSOR,
         entityId: processor.id,
         entityName: processor.name,
         attributes: {
@@ -7199,7 +7199,7 @@ async function executeStep(engine, params) {
     options: {
       name: `workflow step: '${step.id}'`,
       type: "workflow_step" /* WORKFLOW_STEP */,
-      entityType: "workflow_step" /* WORKFLOW_STEP */,
+      entityType: EntityType.WORKFLOW_STEP,
       entityId: step.id,
       input: inputData,
       tracingPolicy: engine.options?.tracingPolicy,
@@ -8510,16 +8510,16 @@ function createStepFromProcessor(processor) {
   const getProcessorEntityType = (phase) => {
     switch (phase) {
       case "input":
-        return "input_processor" /* INPUT_PROCESSOR */;
+        return EntityType.INPUT_PROCESSOR;
       case "inputStep":
-        return "input_step_processor" /* INPUT_STEP_PROCESSOR */;
+        return EntityType.INPUT_STEP_PROCESSOR;
       case "outputStream":
       case "outputResult":
-        return "output_processor" /* OUTPUT_PROCESSOR */;
+        return EntityType.OUTPUT_PROCESSOR;
       case "outputStep":
-        return "output_step_processor" /* OUTPUT_STEP_PROCESSOR */;
+        return EntityType.OUTPUT_STEP_PROCESSOR;
       default:
-        return "output_processor" /* OUTPUT_PROCESSOR */;
+        return EntityType.OUTPUT_PROCESSOR;
     }
   };
   const getSpanNamePrefix = (phase) => {
@@ -8819,7 +8819,7 @@ function createStepFromProcessor(processor) {
                 processorSpan2 = parentSpan.createChildSpan({
                   type: "processor_run" /* PROCESSOR_RUN */,
                   name: `output stream processor: ${processor.id}`,
-                  entityType: "output_processor" /* OUTPUT_PROCESSOR */,
+                  entityType: EntityType.OUTPUT_PROCESSOR,
                   entityId: processor.id,
                   entityName: processor.name ?? processor.id,
                   input: { phase, totalChunks: 0 },
@@ -10084,7 +10084,7 @@ var Run = class {
     const workflowSpan = getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
-      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityType: EntityType.WORKFLOW_RUN,
       entityId: this.workflowId,
       input: inputData,
       metadata: {
@@ -10603,7 +10603,7 @@ var Run = class {
     const workflowSpan = getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}' (resumed)`,
-      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityType: EntityType.WORKFLOW_RUN,
       entityId: this.workflowId,
       input: resumeDataToUse,
       metadata: {
@@ -10722,7 +10722,7 @@ var Run = class {
     const workflowSpan = getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
-      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityType: EntityType.WORKFLOW_RUN,
       entityId: this.workflowId,
       metadata: {
         resourceId: this.resourceId,
@@ -10820,7 +10820,7 @@ var Run = class {
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
       input: inputData,
-      entityType: "workflow_run" /* WORKFLOW_RUN */,
+      entityType: EntityType.WORKFLOW_RUN,
       entityId: this.workflowId,
       metadata: {
         resourceId: this.resourceId,
@@ -12242,8 +12242,7 @@ async function processOutputStream({
   includeRawChunks,
   logger,
   transportRef,
-  transportResolver,
-  persistedToolCallIds
+  transportResolver
 }) {
   let transportSet = false;
   for await (const chunk of outputStream._getBaseStream()) {
@@ -12395,34 +12394,6 @@ async function processOutputStream({
         safeEnqueue(controller, chunk);
         break;
       }
-      case "tool-call": {
-        const message = {
-          id: messageId,
-          role: "assistant",
-          content: {
-            format: 2,
-            parts: [
-              {
-                type: "tool-invocation",
-                toolInvocation: {
-                  state: "call",
-                  toolCallId: chunk.payload.toolCallId,
-                  toolName: chunk.payload.toolName,
-                  args: chunk.payload.args ?? {}
-                },
-                providerMetadata: chunk.payload.providerMetadata,
-                ...{ providerExecuted: chunk.payload.providerExecuted }
-              }
-            ],
-            ...buildResponseModelMetadata(runState)
-          },
-          createdAt: /* @__PURE__ */ new Date()
-        };
-        messageList.add(message, "response");
-        persistedToolCallIds?.add(chunk.payload.toolCallId);
-        safeEnqueue(controller, chunk);
-        break;
-      }
       case "tool-call-input-streaming-end": {
         safeEnqueue(controller, chunk);
         break;
@@ -12585,6 +12556,57 @@ async function processOutputStream({
         safeEnqueue(controller, { ...chunk, payload: { ...chunk.payload, error } });
         await options?.onError?.({ error });
         break;
+      // Provider-executed tool results (e.g. web_search). Client tool results
+      // are handled by llm-mapping-step after execution.
+      case "tool-result": {
+        if (chunk.payload.result != null) {
+          const resultToolDef = tools?.[chunk.payload.toolName] || findProviderToolByName(tools, chunk.payload.toolName);
+          messageList.updateToolInvocation({
+            type: "tool-invocation",
+            toolInvocation: {
+              state: "result",
+              toolCallId: chunk.payload.toolCallId,
+              toolName: chunk.payload.toolName,
+              args: chunk.payload.args,
+              result: chunk.payload.result
+            },
+            providerMetadata: chunk.payload.providerMetadata,
+            // @ts-expect-error - providerExecuted is not in the type but is read by output-converter.ts (to keep deferred provider calls) and tool-call-step.ts (to skip client execution)
+            providerExecuted: inferProviderExecuted(chunk.payload.providerExecuted, resultToolDef)
+          });
+        }
+        safeEnqueue(controller, chunk);
+        break;
+      }
+      case "tool-call": {
+        const toolDef = tools?.[chunk.payload.toolName] || findProviderToolByName(tools, chunk.payload.toolName);
+        const inferredProviderExecuted = inferProviderExecuted(chunk.payload.providerExecuted, toolDef);
+        const toolCallPart = {
+          type: "tool-invocation",
+          toolInvocation: {
+            state: "call",
+            toolCallId: chunk.payload.toolCallId,
+            toolName: chunk.payload.toolName,
+            args: chunk.payload.args
+          },
+          providerMetadata: chunk.payload.providerMetadata,
+          // @ts-expect-error - providerExecuted is not in the type but is read by output-converter.ts (to keep deferred provider calls) and tool-call-step.ts (to skip client execution)
+          providerExecuted: inferredProviderExecuted
+        };
+        const message = {
+          id: messageId,
+          role: "assistant",
+          content: {
+            format: 2,
+            parts: [toolCallPart],
+            ...buildResponseModelMetadata(runState)
+          },
+          createdAt: /* @__PURE__ */ new Date()
+        };
+        messageList.add(message, "response");
+        safeEnqueue(controller, chunk);
+        break;
+      }
       default:
         safeEnqueue(controller, chunk);
     }
@@ -12686,7 +12708,6 @@ function createLLMExecutionStep({
       let warnings;
       let request;
       let rawResponse;
-      const persistedToolCallIds = /* @__PURE__ */ new Set();
       const { outputStream, callBail, runState, stepTools, stepWorkspace } = await executeStreamWithFallbackModels(
         models,
         logger
@@ -12981,8 +13002,7 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
             },
             logger,
             transportRef: _internal?.transportRef,
-            transportResolver,
-            persistedToolCallIds
+            transportResolver
           });
         } catch (error) {
           const provider = model?.provider;
@@ -13088,50 +13108,13 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           }
         });
       }
-      const toolResults = outputStream._getImmediateToolResults()?.map((chunk) => chunk.payload) ?? [];
-      const toolResultById = new Map(toolResults.map((result) => [result.toolCallId, result]));
-      const toolCalls = outputStream._getImmediateToolCalls()?.map((chunk) => {
-        const toolResult = toolResultById.get(chunk.payload.toolCallId);
-        const output = chunk.payload.output ?? toolResult?.result;
-        const tool2 = findProviderToolByName(stepTools, chunk.payload.toolName);
-        const providerExecuted = inferProviderExecuted(
-          chunk.payload.providerExecuted ?? toolResult?.providerExecuted,
-          tool2
-        );
+      const toolCalls = (outputStream._getImmediateToolCalls() ?? []).map((chunk) => {
+        const tool2 = stepTools?.[chunk.payload.toolName] || findProviderToolByName(stepTools, chunk.payload.toolName);
         return {
           ...chunk.payload,
-          args: chunk.payload.args ?? toolResult?.args ?? {},
-          ...output !== void 0 ? { output } : {},
-          providerExecuted,
-          providerMetadata: chunk.payload.providerMetadata ?? toolResult?.providerMetadata
-        };
-      }) ?? [];
-      const toolCallsToPersist = toolCalls.filter((toolCall) => !persistedToolCallIds.has(toolCall.toolCallId));
-      if (toolCallsToPersist.length > 0) {
-        const message = {
-          id: outputStream.messageId,
-          role: "assistant",
-          content: {
-            format: 2,
-            parts: toolCallsToPersist.map((toolCall) => {
-              return {
-                type: "tool-invocation",
-                toolInvocation: {
-                  state: "call",
-                  toolCallId: toolCall.toolCallId,
-                  toolName: toolCall.toolName,
-                  args: toolCall.args
-                },
-                providerMetadata: toolCall.providerMetadata,
-                providerExecuted: toolCall.providerExecuted
-              };
-            }),
-            ...buildResponseModelMetadata(runState)
-          },
-          createdAt: /* @__PURE__ */ new Date()
+          providerExecuted: inferProviderExecuted(chunk.payload.providerExecuted, tool2)
         };
-        messageList.add(message, "response");
-      }
+      });
       let processOutputStepTripwire = null;
       if (outputProcessors && outputProcessors.length > 0) {
         const processorRunner = new ProcessorRunner({
@@ -13337,9 +13320,8 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
         const hasMetadata = Object.keys(providerMetadata).length > 0;
         return hasMetadata ? providerMetadata : void 0;
       }
-      if (inputData?.some((toolCall) => toolCall?.result === void 0)) {
-        const errorResults = inputData.filter((toolCall) => toolCall?.error);
-        const toolResultMessageId = rest.experimental_generateMessageId?.() || _internal?.generateId?.();
+      if (inputData?.some((toolCall) => toolCall?.result === void 0 && !toolCall.providerExecuted)) {
+        const errorResults = inputData.filter((toolCall) => toolCall?.error && !toolCall.providerExecuted);
         if (errorResults?.length) {
           for (const toolCall of errorResults) {
             const chunk = {
@@ -13356,29 +13338,18 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
             };
             const processed = await processAndEnqueueChunk(chunk);
             if (processed) await rest.options?.onChunk?.(processed);
+            rest.messageList.updateToolInvocation({
+              type: "tool-invocation",
+              toolInvocation: {
+                state: "result",
+                toolCallId: toolCall.toolCallId,
+                toolName: sanitizeToolName(toolCall.toolName),
+                args: toolCall.args,
+                result: toolCall.error?.message ?? toolCall.error
+              },
+              ...toolCall.providerMetadata ? { providerMetadata: toolCall.providerMetadata } : {}
+            });
           }
-          const msg = {
-            id: toolResultMessageId || "",
-            role: "assistant",
-            content: {
-              format: 2,
-              parts: errorResults.map((toolCallErrorResult) => {
-                return {
-                  type: "tool-invocation",
-                  toolInvocation: {
-                    state: "result",
-                    toolCallId: toolCallErrorResult.toolCallId,
-                    toolName: sanitizeToolName(toolCallErrorResult.toolName),
-                    args: toolCallErrorResult.args,
-                    result: toolCallErrorResult.error?.message ?? toolCallErrorResult.error
-                  },
-                  ...toolCallErrorResult.providerMetadata ? { providerMetadata: toolCallErrorResult.providerMetadata } : {}
-                };
-              })
-            },
-            createdAt: /* @__PURE__ */ new Date()
-          };
-          rest.messageList.add(msg, "response");
         }
         const hasPendingHITL = inputData.some((tc) => tc.result === void 0 && !tc.error && !tc.providerExecuted);
         if (errorResults?.length > 0 && !hasPendingHITL) {
@@ -13400,60 +13371,20 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
               };
               const processed = await processAndEnqueueChunk(chunk);
               if (processed) await rest.options?.onChunk?.(processed);
-            }
-            const clientResults = successfulResults.filter((tc) => !tc.providerExecuted);
-            if (clientResults.length > 0) {
-              const successMessageId = rest.experimental_generateMessageId?.() || _internal?.generateId?.();
-              const successMessage = {
-                id: successMessageId || "",
-                role: "assistant",
-                content: {
-                  format: 2,
-                  parts: await Promise.all(
-                    clientResults.map(async (toolCall) => {
-                      const providerMetadata = await getProviderMetadataWithModelOutput(toolCall);
-                      return {
-                        type: "tool-invocation",
-                        toolInvocation: {
-                          state: "result",
-                          toolCallId: toolCall.toolCallId,
-                          toolName: sanitizeToolName(toolCall.toolName),
-                          args: toolCall.args,
-                          result: toolCall.result
-                        },
-                        ...providerMetadata ? { providerMetadata } : {}
-                      };
-                    })
-                  )
-                },
-                createdAt: /* @__PURE__ */ new Date()
-              };
-              rest.messageList.add(successMessage, "response");
-            }
-            if (successfulResults.some((tc) => tc.providerExecuted)) {
-              const providerResults = successfulResults.filter((tc) => tc.providerExecuted);
-              const providerMessageId = rest.experimental_generateMessageId?.() || _internal?.generateId?.();
-              const providerMessage = {
-                id: providerMessageId || "",
-                role: "assistant",
-                content: {
-                  format: 2,
-                  parts: providerResults.map((toolCall) => ({
-                    type: "tool-invocation",
-                    toolInvocation: {
-                      state: "result",
-                      toolCallId: toolCall.toolCallId,
-                      toolName: sanitizeToolName(toolCall.toolName),
-                      args: toolCall.args,
-                      result: toolCall.result
-                    },
-                    ...toolCall.providerMetadata ? { providerMetadata: toolCall.providerMetadata } : {},
-                    providerExecuted: true
-                  }))
-                },
-                createdAt: /* @__PURE__ */ new Date()
-              };
-              rest.messageList.add(providerMessage, "response");
+              if (!toolCall.providerExecuted) {
+                const providerMetadata = await getProviderMetadataWithModelOutput(toolCall);
+                rest.messageList.updateToolInvocation({
+                  type: "tool-invocation",
+                  toolInvocation: {
+                    state: "result",
+                    toolCallId: toolCall.toolCallId,
+                    toolName: sanitizeToolName(toolCall.toolName),
+                    args: toolCall.args,
+                    result: toolCall.result
+                  },
+                  ...providerMetadata ? { providerMetadata } : {}
+                });
+              }
             }
           }
           initialResult.stepResult.isContinued = true;
@@ -13481,6 +13412,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
       }
       if (inputData?.length) {
         for (const toolCall of inputData) {
+          if (toolCall.result === void 0) continue;
           const chunk = {
             type: "tool-result",
             runId: rest.runId,
@@ -13496,60 +13428,20 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
           };
           const processed = await processAndEnqueueChunk(chunk);
           if (processed) await rest.options?.onChunk?.(processed);
-        }
-        const clientExecutedToolCalls = inputData.filter((toolCall) => !toolCall.providerExecuted);
-        if (clientExecutedToolCalls.length > 0) {
-          const toolResultMessageId = rest.experimental_generateMessageId?.() || _internal?.generateId?.();
-          const toolResultMessage = {
-            id: toolResultMessageId || "",
-            role: "assistant",
-            content: {
-              format: 2,
-              parts: await Promise.all(
-                clientExecutedToolCalls.map(async (toolCall) => {
-                  const providerMetadata = await getProviderMetadataWithModelOutput(toolCall);
-                  return {
-                    type: "tool-invocation",
-                    toolInvocation: {
-                      state: "result",
-                      toolCallId: toolCall.toolCallId,
-                      toolName: sanitizeToolName(toolCall.toolName),
-                      args: toolCall.args,
-                      result: toolCall.result
-                    },
-                    ...providerMetadata ? { providerMetadata } : {}
-                  };
-                })
-              )
-            },
-            createdAt: /* @__PURE__ */ new Date()
-          };
-          rest.messageList.add(toolResultMessage, "response");
-        }
-        const providerExecutedToolCalls = inputData.filter((toolCall) => toolCall.providerExecuted);
-        if (providerExecutedToolCalls.length > 0) {
-          const providerResultMessageId = rest.experimental_generateMessageId?.() || _internal?.generateId?.();
-          const providerResultMessage = {
-            id: providerResultMessageId || "",
-            role: "assistant",
-            content: {
-              format: 2,
-              parts: providerExecutedToolCalls.map((toolCall) => ({
-                type: "tool-invocation",
-                toolInvocation: {
-                  state: "result",
-                  toolCallId: toolCall.toolCallId,
-                  toolName: sanitizeToolName(toolCall.toolName),
-                  args: toolCall.args,
-                  result: toolCall.result
-                },
-                ...toolCall.providerMetadata ? { providerMetadata: toolCall.providerMetadata } : {},
-                providerExecuted: true
-              }))
-            },
-            createdAt: /* @__PURE__ */ new Date()
-          };
-          rest.messageList.add(providerResultMessage, "response");
+          if (!toolCall.providerExecuted) {
+            const providerMetadata = await getProviderMetadataWithModelOutput(toolCall);
+            rest.messageList.updateToolInvocation({
+              type: "tool-invocation",
+              toolInvocation: {
+                state: "result",
+                toolCallId: toolCall.toolCallId,
+                toolName: sanitizeToolName(toolCall.toolName),
+                args: toolCall.args,
+                result: toolCall.result
+              },
+              ...providerMetadata ? { providerMetadata } : {}
+            });
+          }
         }
         if (rest.requestContext?.get("__mastra_delegationBailed") && _internal) {
           _internal._delegationBailed = true;
@@ -13726,10 +13618,7 @@ function createToolCallStep({
         }
       };
       if (inputData.providerExecuted) {
-        return {
-          ...inputData,
-          result: inputData.output ?? { providerExecuted: true, toolName: inputData.toolName }
-        };
+        return inputData;
       }
       const toolKey = stepTools?.[inputData.toolName] ? inputData.toolName : Object.entries(stepTools || {}).find(([_, t]) => t === tool2)?.[0];
       const isHiddenByActiveTools = stepActiveTools && toolKey && !stepActiveTools.includes(toolKey);
@@ -17213,7 +17102,7 @@ var AgentLegacyHandler = class {
         const agentSpan = getOrCreateSpan({
           type: "agent_run" /* AGENT_RUN */,
           name: `agent run: '${this.capabilities.id}'`,
-          entityType: "agent" /* AGENT */,
+          entityType: EntityType.AGENT,
           entityId: this.capabilities.id,
           entityName: this.capabilities.name,
           input: {
@@ -22111,7 +22000,7 @@ ${effectiveInstructions}`;
     const agentSpan = getOrCreateSpan({
       type: "agent_run" /* AGENT_RUN */,
       name: `agent run: '${this.id}'`,
-      entityType: "agent" /* AGENT */,
+      entityType: EntityType.AGENT,
       entityId: this.id,
       entityName: this.name,
       input: options.messages,
@@ -26810,5 +26699,5 @@ var MockMemory = class extends MastraMemory {
 };
 
 export { Agent, BaseProcessor, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, ExecutionEngine, FilePartSchema, ImagePartSchema, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MastraScorer, MemoryProcessor, MessageContentSchema, MessageHistory, MessagePartSchema, MockMemory, ModerationProcessor, PIIDetector, ProcessorInputPhaseSchema, ProcessorInputStepPhaseSchema, ProcessorMessageContentSchema, ProcessorMessageSchema, ProcessorOutputResultPhaseSchema, ProcessorOutputStepPhaseSchema, ProcessorOutputStreamPhaseSchema, ProcessorRunner, ProcessorState, ProcessorStepInputSchema, ProcessorStepOutputSchema, ProcessorStepSchema, PromptInjectionDetector, ReasoningPartSchema, Run, SemanticRecall, SkillsProcessor, SourcePartSchema, StepStartPartSchema, StructuredOutputProcessor, SystemPromptScrubber, TextPartSchema, TokenLimiterProcessor, ToolCallFilter, ToolInvocationPartSchema, ToolSearchProcessor, TripWire, UnicodeNormalizer, WORKING_MEMORY_END_TAG, WORKING_MEMORY_START_TAG, Workflow, WorkflowRunOutput, WorkingMemory, WorkspaceInstructionsProcessor, augmentWithInit, cleanStepResult, cloneStep, cloneWorkflow, convertFullStreamChunkToMastra, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createScorer, createStep, createTimeTravelExecutionParams, createWorkflow, extractWorkingMemoryContent, extractWorkingMemoryTags, formatCheckFeedback, formatCompletionFeedback, formatStreamCompletionFeedback, formatValidationFeedback, forwardAgentStreamChunk, generateFinalResult, generateStructuredFinalResult, getResumeLabelsByStepId, getStepIds, getStepResult, getThreadOMMetadata, globalEmbeddingCache, hydrateSerializedStepErrors, isObservationalMemoryEnabled, isProcessor, isProcessorWorkflow, isSupportedLanguageModel, loop, mapVariable, memoryDefaultOptions, parseMemoryRequestContext, removeWorkingMemoryTags, resolveThreadIdFromArgs, runChecks, runCompletionScorers, runCountDeprecationMessage, runDefaultCompletionCheck, runStreamCompletionScorers, runValidation, setThreadOMMetadata, supportedLanguageModelSpecifications, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepRequestContext, validateStepResumeData, validateStepStateData, validateStepSuspendData };
-//# sourceMappingURL=chunk-QXNHZJRV.js.map
-//# sourceMappingURL=chunk-QXNHZJRV.js.map
+//# sourceMappingURL=chunk-UWTB4U2X.js.map
+//# sourceMappingURL=chunk-UWTB4U2X.js.map