@mastra/core 1.6.0 → 1.7.0-alpha.0

package/dist/{chunk-VJWRJWSC.cjs → chunk-HYU6AULN.cjs}

@@ -2,8 +2,8 @@
 
 var chunkRQ56ZSIR_cjs = require('./chunk-RQ56ZSIR.cjs');
 var chunkZCBG4ZQT_cjs = require('./chunk-ZCBG4ZQT.cjs');
-var chunkAYHSPIT6_cjs = require('./chunk-AYHSPIT6.cjs');
-var chunkTL2TTA4X_cjs = require('./chunk-TL2TTA4X.cjs');
+var chunk7UAJ6LMR_cjs = require('./chunk-7UAJ6LMR.cjs');
+var chunkYQG7NBPR_cjs = require('./chunk-YQG7NBPR.cjs');
 var chunkDB7U2C5B_cjs = require('./chunk-DB7U2C5B.cjs');
 var chunkZIEQA3YP_cjs = require('./chunk-ZIEQA3YP.cjs');
 var chunkPM3UIIBK_cjs = require('./chunk-PM3UIIBK.cjs');
@@ -651,6 +651,37 @@ function isProviderTool(tool2) {
 function getProviderToolName(providerId) {
   return providerId.split(".").slice(1).join(".");
 }
+function fixTypelessProperties(schema) {
+  if (typeof schema !== "object" || schema === null) return schema;
+  const result = { ...schema };
+  if (result.properties && typeof result.properties === "object" && !Array.isArray(result.properties)) {
+    result.properties = Object.fromEntries(
+      Object.entries(result.properties).map(([key, value]) => {
+        if (typeof value !== "object" || value === null || Array.isArray(value)) {
+          return [key, value];
+        }
+        const propSchema = value;
+        const hasType = "type" in propSchema;
+        const hasRef = "$ref" in propSchema;
+        const hasAnyOf = "anyOf" in propSchema;
+        const hasOneOf = "oneOf" in propSchema;
+        const hasAllOf = "allOf" in propSchema;
+        if (!hasType && !hasRef && !hasAnyOf && !hasOneOf && !hasAllOf) {
+          return [key, { ...propSchema, type: ["string", "number", "integer", "boolean", "object", "array", "null"] }];
+        }
+        return [key, fixTypelessProperties(propSchema)];
+      })
+    );
+  }
+  if (result.items) {
+    if (Array.isArray(result.items)) {
+      result.items = result.items.map((item) => fixTypelessProperties(item));
+    } else if (typeof result.items === "object") {
+      result.items = fixTypelessProperties(result.items);
+    }
+  }
+  return result;
+}
 function prepareToolsAndToolChoice({
   tools,
   toolChoice,
@@ -696,7 +727,7 @@ function prepareToolsAndToolChoice({
               type: "function",
               name,
               description: sdkTool.description,
-              inputSchema: chunkPM3UIIBK_cjs.asSchema(sdkTool.inputSchema).jsonSchema,
+              inputSchema: fixTypelessProperties(chunkPM3UIIBK_cjs.asSchema(sdkTool.inputSchema).jsonSchema),
               providerOptions: sdkTool.providerOptions
             };
           case "provider-defined": {
@@ -12676,6 +12707,7 @@ function createAgenticLoopWorkflow(params) {
     );
     const currentContent = allContent.slice(previousContentLength);
     previousContentLength = allContent.length;
+    const toolResultParts = currentContent.filter((part) => part.type === "tool-result");
     const currentStep = {
       content: currentContent,
       usage: typedInputData.output.usage || { inputTokens: 0, outputTokens: 0, totalTokens: 0 },
@@ -12693,12 +12725,16 @@ function createAgenticLoopWorkflow(params) {
       reasoningText: typedInputData.output.reasoningText || "",
       files: typedInputData.output.files || [],
       toolCalls: typedInputData.output.toolCalls || [],
-      toolResults: typedInputData.output.toolResults || [],
+      toolResults: toolResultParts,
       sources: typedInputData.output.sources || [],
       staticToolCalls: typedInputData.output.staticToolCalls || [],
       dynamicToolCalls: typedInputData.output.dynamicToolCalls || [],
-      staticToolResults: typedInputData.output.staticToolResults || [],
-      dynamicToolResults: typedInputData.output.dynamicToolResults || [],
+      staticToolResults: toolResultParts.filter(
+        (part) => part.dynamic === false
+      ),
+      dynamicToolResults: toolResultParts.filter(
+        (part) => part.dynamic === true
+      ),
       providerMetadata: typedInputData.metadata?.providerMetadata
     };
     accumulatedSteps.push(currentStep);
@@ -16391,7 +16427,7 @@ ${skillInstructions}`;
             message: `Reference file "${referencePath}" not found in skill "${skillName}". Available references: ${availableRefs.join(", ") || "none"}`
           };
         }
-        const result = chunkAYHSPIT6_cjs.extractLines(fullContent, startLine, endLine);
+        const result = chunk7UAJ6LMR_cjs.extractLines(fullContent, startLine, endLine);
         return {
           success: true,
           content: result.content,
@@ -16437,7 +16473,7 @@ ${skillInstructions}`;
             message: `Script file "${scriptPath}" not found in skill "${skillName}". Available scripts: ${availableScripts.join(", ") || "none"}`
           };
         }
-        const result = chunkAYHSPIT6_cjs.extractLines(fullContent, startLine, endLine);
+        const result = chunk7UAJ6LMR_cjs.extractLines(fullContent, startLine, endLine);
         return {
           success: true,
           content: result.content,
@@ -16606,6 +16642,23 @@ ${skillInstructions}`;
   }
 };
 
+// src/processors/processors/workspace-instructions.ts
+var WorkspaceInstructionsProcessor = class {
+  id = "workspace-instructions-processor";
+  name = "Workspace Instructions Processor";
+  _workspace;
+  constructor(opts) {
+    this._workspace = opts.workspace;
+  }
+  async processInputStep({ messageList, requestContext }) {
+    const instructions = this._workspace.getInstructions({ requestContext });
+    if (instructions) {
+      messageList.addSystem({ role: "system", content: instructions });
+    }
+    return { messageList };
+  }
+};
+
 // src/agent/agent-legacy.ts
 var import_fast_deep_equal = chunk6SZKM6EC_cjs.__toESM(require_fast_deep_equal(), 1);
 var AgentLegacyHandler = class {
@@ -18372,6 +18425,21 @@ var Agent = class extends chunkRO47SMI7_cjs.MastraBase {
     }
     return [new SkillsProcessor({ workspace, format: this.#skillsFormat })];
   }
+  /**
+   * Gets the workspace-instructions processors to add when the workspace has a
+   * filesystem or sandbox (i.e. something to describe).
+   * @internal
+   */
+  async getWorkspaceInstructionsProcessors(configuredProcessors, requestContext) {
+    const workspace = await this.getWorkspace({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() });
+    if (!workspace) return [];
+    if (!workspace.filesystem && !workspace.sandbox) return [];
+    const hasProcessor = configuredProcessors.some(
+      (p) => !isProcessorWorkflow(p) && "id" in p && p.id === "workspace-instructions-processor"
+    );
+    if (hasProcessor) return [];
+    return [new WorkspaceInstructionsProcessor({ workspace })];
+  }
   /**
    * Validates the request context against the agent's requestContextSchema.
    * Throws an error if validation fails.
@@ -18527,8 +18595,9 @@ ${errorMessages}`,
     const configuredProcessors = configuredProcessorOverrides ? configuredProcessorOverrides : this.#inputProcessors ? typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() }) : this.#inputProcessors : [];
     const memory = await this.getMemory({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() });
     const memoryProcessors = memory ? await memory.getInputProcessors(configuredProcessors, requestContext) : [];
+    const workspaceProcessors = await this.getWorkspaceInstructionsProcessors(configuredProcessors, requestContext);
     const skillsProcessors = await this.getSkillsProcessors(configuredProcessors, requestContext);
-    const allProcessors = [...memoryProcessors, ...skillsProcessors, ...configuredProcessors];
+    const allProcessors = [...memoryProcessors, ...workspaceProcessors, ...skillsProcessors, ...configuredProcessors];
     return this.combineProcessorsIntoWorkflow(allProcessors, `${this.id}-input-processor`);
   }
   /**
@@ -19572,7 +19641,7 @@ ${errorMessages}`,
     if (!workspace) {
       return convertedWorkspaceTools;
     }
-    const workspaceTools = chunkAYHSPIT6_cjs.createWorkspaceTools(workspace);
+    const workspaceTools = chunk7UAJ6LMR_cjs.createWorkspaceTools(workspace);
     if (Object.keys(workspaceTools).length > 0) {
       this.logger.debug(`[Agent:${this.name}] - Adding workspace tools: ${Object.keys(workspaceTools).join(", ")}`, {
         runId
@@ -19611,7 +19680,7 @@ ${errorMessages}`,
     processorStates
   }) {
     let tripwire;
-    if (inputProcessorOverrides?.length || this.#inputProcessors || this.#memory) {
+    if (inputProcessorOverrides?.length || this.#inputProcessors || this.#memory || this.#workspace || this.#mastra?.getWorkspace()) {
       const runner = await this.getProcessorRunner({
         requestContext,
         inputProcessorOverrides,
@@ -23464,7 +23533,7 @@ var ToolSearchProcessor = class {
       minScore: options.search?.minScore ?? 0
     };
     this.ttl = options.ttl ?? 36e5;
-    this.bm25Index = new chunkAYHSPIT6_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
+    this.bm25Index = new chunk7UAJ6LMR_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
     this.indexTools();
     if (this.ttl > 0) {
       this.scheduleCleanup();
@@ -25139,7 +25208,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkTL2TTA4X_cjs.InMemoryStore(),
+      storage: storage || new chunkYQG7NBPR_cjs.InMemoryStore(),
       options: {
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : void 0,
         lastMessages: enableMessageHistory ? 10 : void 0
@@ -25396,6 +25465,7 @@ exports.WORKING_MEMORY_START_TAG = WORKING_MEMORY_START_TAG;
 exports.Workflow = Workflow;
 exports.WorkflowRunOutput = WorkflowRunOutput;
 exports.WorkingMemory = WorkingMemory;
+exports.WorkspaceInstructionsProcessor = WorkspaceInstructionsProcessor;
 exports.augmentWithInit = augmentWithInit;
 exports.cleanStepResult = cleanStepResult;
 exports.cloneStep = cloneStep;
@@ -25446,5 +25516,5 @@ exports.validateStepRequestContext = validateStepRequestContext;
 exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-VJWRJWSC.cjs.map
-//# sourceMappingURL=chunk-VJWRJWSC.cjs.map
+//# sourceMappingURL=chunk-HYU6AULN.cjs.map
+//# sourceMappingURL=chunk-HYU6AULN.cjs.map