@mastra/core 1.0.0-beta.6 → 1.0.0-beta.7

package/dist/{chunk-45NA5ZD3.js → chunk-POM7FCH5.js}

@@ -1,14 +1,14 @@
 import { DefaultVoice } from './chunk-F2GAJSBI.js';
 import { EMITTER_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-NLNKQD2T.js';
-import { InMemoryStore } from './chunk-OPALPWAM.js';
-import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-APMPOYPI.js';
-import { ModelRouterEmbeddingModel, resolveModelConfig } from './chunk-TARWUQG6.js';
-import { MastraLLMV1 } from './chunk-WDRA4WKG.js';
+import { InMemoryStore } from './chunk-G32WDDGV.js';
+import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-DMPHPHMU.js';
+import { ModelRouterEmbeddingModel, resolveModelConfig } from './chunk-NAKPEQEQ.js';
+import { MastraLLMV1 } from './chunk-4GTU7MB2.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { removeUndefinedValues, deepMerge, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, selectFields, delay } from './chunk-KZLP6TPJ.js';
-import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-FYP3AT6W.js';
+import { removeUndefinedValues, deepMerge, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, selectFields, delay } from './chunk-URBPEE67.js';
+import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-FNSFXWDN.js';
 import { MastraError, getErrorFromUnknown } from './chunk-JJ5O45LH.js';
-import { ToolStream } from './chunk-LEZIKVRQ.js';
+import { ToolStream } from './chunk-F54IK3GJ.js';
 import { Tool, createTool } from './chunk-4F6RAJFU.js';
 import { RequestContext, MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY } from './chunk-6TBWJV35.js';
 import { zodToJsonSchema as zodToJsonSchema$1 } from './chunk-PJKCPRYF.js';
@@ -3203,10 +3203,11 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             }
           });
         }
-        if (lastOutput.result.status === "suspended" && params.outputOptions?.includeResumeLabels) {
-          return { ...result2, resumeLabels: lastOutput.mutableContext.resumeLabels };
-        }
-        return result2;
+        return {
+          ...result2,
+          ...lastOutput.result.status === "suspended" && params.outputOptions?.includeResumeLabels ? { resumeLabels: lastOutput.mutableContext.resumeLabels } : {},
+          ...params.outputOptions?.includeState ? { state: lastState } : {}
+        };
       }
     }
     const result = await this.fmtReturnValue(params.emitter, stepResults, lastOutput.result);
@@ -6250,18 +6251,39 @@ function convertMastraChunkToAISDKv5({
 }
 
 // src/stream/aisdk/v5/input.ts
+function isNumericId(id) {
+  return /^\d+$/.test(id);
+}
 var AISDKV5InputStream = class extends MastraModelInput {
-  constructor({ component, name }) {
+  #generateId;
+  constructor({
+    component,
+    name,
+    generateId: generateId3
+  }) {
     super({ component, name });
+    this.#generateId = generateId3 ?? generateId;
   }
   async transform({
     runId,
     stream,
     controller
   }) {
+    const idMap = /* @__PURE__ */ new Map();
     for await (const chunk of stream) {
-      const transformedChunk = convertFullStreamChunkToMastra(chunk, { runId });
+      const rawChunk = chunk;
+      if (rawChunk.type === "stream-start") {
+        idMap.clear();
+      }
+      const transformedChunk = convertFullStreamChunkToMastra(rawChunk, { runId });
       if (transformedChunk) {
+        if ((transformedChunk.type === "text-start" || transformedChunk.type === "text-delta" || transformedChunk.type === "text-end") && transformedChunk.payload?.id && isNumericId(transformedChunk.payload.id)) {
+          const originalId = transformedChunk.payload.id;
+          if (!idMap.has(originalId)) {
+            idMap.set(originalId, this.#generateId());
+          }
+          transformedChunk.payload.id = idMap.get(originalId);
+        }
         controller.enqueue(transformedChunk);
       }
     }
@@ -6290,11 +6312,13 @@ function execute({
   structuredOutput,
   headers,
   shouldThrowError,
-  methodType
+  methodType,
+  generateId: generateId3
 }) {
   const v5 = new AISDKV5InputStream({
     component: "LLM",
-    name: model.modelId
+    name: model.modelId,
+    generateId: generateId3
   });
   const toolsAndToolChoice = prepareToolsAndToolChoice({
     tools,
@@ -6952,6 +6976,7 @@ function createLLMExecutionStep({
                 structuredOutput,
                 headers,
                 methodType,
+                generateId: _internal?.generateId,
                 onResult: ({
                   warnings: warningsFromStream,
                   request: requestFromStream,
@@ -7767,6 +7792,31 @@ function workflowLoopStream({
         requestContext
       });
       if (executionResult.status !== "success") {
+        if (executionResult.status === "failed") {
+          let executionResultError = executionResult.error;
+          if (typeof executionResult.error === "string") {
+            const prependedErrorString = "Error: ";
+            if (executionResult.error.startsWith(`${prependedErrorString}${prependedErrorString}`)) {
+              executionResultError = executionResult.error.substring(
+                `${prependedErrorString}${prependedErrorString}`.length
+              );
+            } else if (executionResult.error.startsWith(prependedErrorString)) {
+              executionResultError = executionResult.error.substring(prependedErrorString.length);
+            }
+          }
+          const error = getErrorFromUnknown(executionResultError, {
+            fallbackMessage: "Unknown error in agent workflow stream"
+          });
+          controller.enqueue({
+            type: "error",
+            runId,
+            from: "AGENT" /* AGENT */,
+            payload: { error }
+          });
+          if (rest.options?.onError) {
+            await rest.options?.onError?.({ error });
+          }
+        }
         controller.close();
         return;
       }
@@ -8015,6 +8065,7 @@ var MastraLLMVNext = class extends MastraBase {
     resourceId,
     structuredOutput,
     options,
+    inputProcessors,
     outputProcessors,
     returnScorerData,
     providerOptions,
@@ -8078,6 +8129,7 @@ var MastraLLMVNext = class extends MastraBase {
         providerOptions,
         _internal,
         structuredOutput,
+        inputProcessors,
         outputProcessors,
         returnScorerData,
         modelSpanTracker,
@@ -8148,7 +8200,9 @@ var MastraLLMVNext = class extends MastraBase {
                   totalTokens: props?.totalUsage?.totalTokens,
                   reasoningTokens: props?.totalUsage?.reasoningTokens,
                   cachedInputTokens: props?.totalUsage?.cachedInputTokens
-                }
+                },
+                responseId: props?.response.id,
+                responseModel: props?.response.modelId
               }
             });
             try {
@@ -9506,6 +9560,7 @@ var AgentLegacyHandler = class {
           },
           attributes: {
             agentId: this.capabilities.id,
+            agentName: this.capabilities.name,
             instructions: this.capabilities.convertInstructionsToString(instructions),
             availableTools: [
               ...toolsets ? Object.keys(toolsets) : [],
@@ -12073,7 +12128,7 @@ var BatchPartsProcessor = class {
       const combinedText = textChunks.map((part) => part.type === "text-delta" ? part.payload.text : "").join("");
       const combinedChunk = {
         type: "text-delta",
-        payload: { text: combinedText, id: "1" },
+        payload: { text: combinedText, id: "text-1" },
         runId: "1",
         from: "AGENT" /* AGENT */
       };
@@ -12760,6 +12815,9 @@ var isAugmentedSymbol = Symbol("isAugmented");
 function augmentWithInit(storage) {
   let hasInitialized = null;
   const ensureInit = async () => {
+    if (storage.disableInit) {
+      return;
+    }
     if (!hasInitialized) {
       hasInitialized = storage.init();
     }
@@ -14063,6 +14121,9 @@ function createMapResultsStep({
       const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput);
       effectiveOutputProcessors = effectiveOutputProcessors ? [...effectiveOutputProcessors, structuredProcessor] : [structuredProcessor];
     }
+    const effectiveInputProcessors = options.inputProcessors || (capabilities.inputProcessors ? typeof capabilities.inputProcessors === "function" ? await capabilities.inputProcessors({
+      requestContext: result.requestContext
+    }) : capabilities.inputProcessors : []);
     const messageList = memoryData.messageList;
     const modelMethodType = getModelMethodFromAgentMethod(methodType);
     const loopOptions = {
@@ -14129,6 +14190,7 @@ function createMapResultsStep({
         abortSignal: options.abortSignal
       },
       structuredOutput: options.structuredOutput,
+      inputProcessors: effectiveInputProcessors,
       outputProcessors: effectiveOutputProcessors,
       modelSettings: {
         temperature: 0,
@@ -14275,7 +14337,7 @@ function createPrepareMemoryStep({
           title: thread.title,
           memoryConfig,
           resourceId,
-          saveThread: false
+          saveThread: true
         });
       }
       requestContext.set("MastraMemory", {
@@ -15774,10 +15836,10 @@ var Agent = class extends MastraBase {
           subAgentThreadId: z.string().describe("The thread ID of the agent").optional(),
           subAgentResourceId: z.string().describe("The resource ID of the agent").optional()
         });
-        const modelVersion = (await agent.getModel()).specificationVersion;
+        const modelVersion = (await agent.getModel({ requestContext })).specificationVersion;
         const toolObj = createTool({
           id: `agent-${agentName}`,
-          description: `Agent: ${agentName}`,
+          description: agent.getDescription() || `Agent: ${agentName}`,
           inputSchema: agentInputSchema,
           outputSchema: agentOutputSchema,
           mastra: this.#mastra,
@@ -16423,6 +16485,8 @@ var Agent = class extends MastraBase {
       input: options.messages,
       attributes: {
         agentId: this.id,
+        agentName: this.name,
+        conversationId: threadFromArgs?.id,
         instructions: this.#convertInstructionsToString(instructions)
       },
       metadata: {
@@ -16456,6 +16520,7 @@ var Agent = class extends MastraBase {
       getMemoryMessages: this.getMemoryMessages.bind(this),
       runInputProcessors: this.__runInputProcessors.bind(this),
       executeOnFinish: this.#executeOnFinish.bind(this),
+      inputProcessors: async ({ requestContext: requestContext2 }) => this.listResolvedInputProcessors(requestContext2),
       outputProcessors: async ({ requestContext: requestContext2 }) => this.listResolvedOutputProcessors(requestContext2),
       llm
     };
@@ -18731,5 +18796,5 @@ var MastraModelOutput = class extends MastraBase {
 };
 
 export { AISDKV5OutputStream, Agent, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, ExecutionEngine, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MemoryProcessor, MessageHistory, MockMemory, ModerationProcessor, PIIDetector, ProcessorRunner, ProcessorState, PromptInjectionDetector, Run, SemanticRecall, StructuredOutputProcessor, SystemPromptScrubber, TokenLimiterProcessor, ToolCallFilter, TripWire, UnicodeNormalizer, Workflow, WorkflowRunOutput, WorkingMemory, augmentWithInit, cloneStep, cloneWorkflow, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createStep, createTimeTravelExecutionParams, createWorkflow, getResumeLabelsByStepId, getStepIds, getStepResult, getZodErrors, loop, mapVariable, memoryDefaultOptions, parseMemoryRuntimeContext, resolveThreadIdFromArgs, runCountDeprecationMessage, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepResumeData, validateStepSuspendData };
-//# sourceMappingURL=chunk-45NA5ZD3.js.map
-//# sourceMappingURL=chunk-45NA5ZD3.js.map
+//# sourceMappingURL=chunk-POM7FCH5.js.map
+//# sourceMappingURL=chunk-POM7FCH5.js.map