@mastra/core 0.4.4 → 0.5.0-alpha.1

package/dist/agent/index.cjs

@@ -398,7 +398,8 @@ var MastraLLM = class extends MastraLLMBase {
     tools,
     runId,
     threadId,
-    resourceId
+    resourceId,
+    memory
   } = {}) {
     this.logger.debug("Starting tool conversion for LLM");
     const converted = Object.entries(tools || {}).reduce((memo, value) => {
@@ -419,6 +420,7 @@ var MastraLLM = class extends MastraLLMBase {
                 threadId,
                 resourceId,
                 mastra: this.#mastra,
+                memory,
                 runId
               }, options) ?? void 0;
             } catch (error) {
@@ -453,6 +455,7 @@ var MastraLLM = class extends MastraLLMBase {
     telemetry,
     threadId,
     resourceId,
+    memory,
     ...rest
   }) {
     const model = this.#model;
@@ -468,7 +471,8 @@ var MastraLLM = class extends MastraLLMBase {
       tools,
       runId,
       threadId,
-      resourceId
+      resourceId,
+      memory
     });
     const argsForExecute = {
       model,
@@ -536,6 +540,7 @@ var MastraLLM = class extends MastraLLMBase {
     telemetry,
     threadId,
     resourceId,
+    memory,
     ...rest
   }) {
     const model = this.#model;
@@ -546,7 +551,8 @@ var MastraLLM = class extends MastraLLMBase {
       tools,
       runId,
       threadId,
-      resourceId
+      resourceId,
+      memory
     });
     const argsForExecute = {
       model,
@@ -611,6 +617,7 @@ var MastraLLM = class extends MastraLLMBase {
     telemetry,
     threadId,
     resourceId,
+    memory,
     ...rest
   }) {
     const model = this.#model;
@@ -626,7 +633,8 @@ var MastraLLM = class extends MastraLLMBase {
       tools,
       runId,
       threadId,
-      resourceId
+      resourceId,
+      memory
     });
     const argsForExecute = {
       model,
@@ -708,6 +716,7 @@ var MastraLLM = class extends MastraLLMBase {
     telemetry,
     threadId,
     resourceId,
+    memory,
     ...rest
   }) {
     const model = this.#model;
@@ -721,7 +730,8 @@ var MastraLLM = class extends MastraLLMBase {
       tools,
       runId,
       threadId,
-      resourceId
+      resourceId,
+      memory
     });
     const argsForExecute = {
       model,
@@ -796,6 +806,7 @@ var MastraLLM = class extends MastraLLMBase {
     output,
     temperature,
     telemetry,
+    memory,
     ...rest
   } = {}) {
     const msgs = this.convertToMessages(messages);
@@ -808,6 +819,7 @@ var MastraLLM = class extends MastraLLMBase {
         convertedTools,
         runId,
         temperature,
+        memory,
         ...rest
       });
     }
@@ -820,6 +832,7 @@ var MastraLLM = class extends MastraLLMBase {
       convertedTools,
       runId,
       telemetry,
+      memory,
       ...rest
     });
   }
@@ -1342,6 +1355,8 @@ exports.Agent = class Agent extends (_a = MastraBase) {
       threadId,
       resourceId
     });
+    const memory = this.getMemory();
+    const memoryTools = memory?.getTools();
     const converted = Object.entries(this.tools || {}).reduce((memo, value) => {
       const k = value[0];
       const tool = this.tools[k];
@@ -1362,6 +1377,7 @@ exports.Agent = class Agent extends (_a = MastraBase) {
               return tool?.execute?.({
                 context: args,
                 mastra: this.#mastra,
+                memory,
                 runId,
                 threadId,
                 resourceId
@@ -1380,8 +1396,44 @@ exports.Agent = class Agent extends (_a = MastraBase) {
       }
       return memo;
     }, {});
+    const convertedMemoryTools = memoryTools ? Object.entries(memoryTools).reduce((memo, [k, tool]) => {
+      memo[k] = {
+        description: tool.description,
+        parameters: tool.parameters,
+        execute: typeof tool?.execute === "function" ? async (args, options) => {
+          try {
+            this.logger.debug(`[Agent:${this.name}] - Executing memory tool ${k}`, {
+              name: k,
+              description: tool.description,
+              args,
+              runId,
+              threadId,
+              resourceId
+            });
+            return tool?.execute?.({
+              context: args,
+              mastra: this.#mastra,
+              memory,
+              runId,
+              threadId,
+              resourceId
+            }, options) ?? void 0;
+          } catch (err) {
+            this.logger.error(`[Agent:${this.name}] - Failed memory tool execution`, {
+              error: err,
+              runId,
+              threadId,
+              resourceId
+            });
+            throw err;
+          }
+        } : void 0
+      };
+      return memo;
+    }, {}) : {};
     const toolsFromToolsetsConverted = {
-      ...converted
+      ...converted,
+      ...convertedMemoryTools
     };
     const toolsFromToolsets = Object.values(toolsets || {});
     if (toolsFromToolsets.length > 0) {
@@ -1651,6 +1703,7 @@ exports.Agent = class Agent extends (_a = MastraBase) {
         experimental_output,
         threadId,
         resourceId,
+        memory: this.getMemory(),
         ...rest
       });
       const outputText2 = result2.text;
@@ -1678,6 +1731,7 @@ exports.Agent = class Agent extends (_a = MastraBase) {
         telemetry,
         threadId,
         resourceId,
+        memory: this.getMemory(),
         ...rest
       });
       const outputText2 = result2.text;
@@ -1701,6 +1755,7 @@ exports.Agent = class Agent extends (_a = MastraBase) {
       temperature,
       toolChoice,
       telemetry,
+      memory: this.getMemory(),
       ...rest
     });
     const outputText = JSON.stringify(result.object);
@@ -1798,6 +1853,7 @@ exports.Agent = class Agent extends (_a = MastraBase) {
         runId: runIdToUse,
         toolChoice,
         experimental_output,
+        memory: this.getMemory(),
         ...rest
       });
       const newStreamResult = streamResult;
@@ -1836,6 +1892,7 @@ exports.Agent = class Agent extends (_a = MastraBase) {
         runId: runIdToUse,
         toolChoice,
         telemetry,
+        memory: this.getMemory(),
         ...rest
       });
     }
@@ -1871,6 +1928,7 @@ exports.Agent = class Agent extends (_a = MastraBase) {
       runId: runIdToUse,
       toolChoice,
       telemetry,
+      memory: this.getMemory(),
       ...rest
     });
   }

package/dist/agent/index.d.cts

@@ -1,7 +1,7 @@
 export { Message as AiMessageType } from 'ai';
 import 'json-schema';
 import 'zod';
-export { A as Agent, n as AgentConfig, ao as AgentGenerateOptions, ap as AgentStreamOptions, an as ToolsInput, am as ToolsetsInput } from '../base-CbCmDLUb.cjs';
+export { A as Agent, n as AgentConfig, ao as AgentGenerateOptions, ap as AgentStreamOptions, an as ToolsInput, am as ToolsetsInput } from '../base-C_bOLlEO.cjs';
 import '../base-hs9NDAZ2.cjs';
 import '../types-m9RryK9a.cjs';
 import '../voice/index.cjs';

package/dist/agent/index.d.ts

@@ -1,7 +1,7 @@
 export { Message as AiMessageType } from 'ai';
 import 'json-schema';
 import 'zod';
-export { A as Agent, n as AgentConfig, ao as AgentGenerateOptions, ap as AgentStreamOptions, an as ToolsInput, am as ToolsetsInput } from '../base-DqRXkxCw.js';
+export { A as Agent, n as AgentConfig, ao as AgentGenerateOptions, ap as AgentStreamOptions, an as ToolsInput, am as ToolsetsInput } from '../base-42kpYoR1.js';
 import '../base-D90KQ4XI.js';
 import '../types-m9RryK9a.js';
 import '../voice/index.js';

package/dist/agent/index.js

@@ -1 +1 @@
-export { Agent } from '../chunk-E7K35ROR.js';
+export { Agent } from '../chunk-NWPCPTB7.js';

package/dist/{base-DqRXkxCw.d.ts → base-42kpYoR1.d.ts}

@@ -1,5 +1,5 @@
 import * as ai from 'ai';
-import { EmbeddingModel, CoreMessage as CoreMessage$1, Message, UserContent, AssistantContent, ToolExecutionOptions, LanguageModelV1, TelemetrySettings, generateText, generateObject, streamText, GenerateTextResult, GenerateObjectResult, streamObject, StreamTextResult, StreamObjectResult, CoreSystemMessage as CoreSystemMessage$1, CoreAssistantMessage as CoreAssistantMessage$1, CoreUserMessage as CoreUserMessage$1, CoreToolMessage as CoreToolMessage$1, EmbedResult as EmbedResult$1, EmbedManyResult as EmbedManyResult$1, LanguageModel as LanguageModel$1, DeepPartial, ToolContent } from 'ai';
+import { EmbeddingModel, CoreTool as CoreTool$1, CoreMessage as CoreMessage$1, Message, UserContent, AssistantContent, ToolExecutionOptions, LanguageModelV1, TelemetrySettings, generateText, generateObject, streamText, GenerateTextResult, GenerateObjectResult, streamObject, StreamTextResult, StreamObjectResult, CoreSystemMessage as CoreSystemMessage$1, CoreAssistantMessage as CoreAssistantMessage$1, CoreUserMessage as CoreUserMessage$1, CoreToolMessage as CoreToolMessage$1, EmbedResult as EmbedResult$1, EmbedManyResult as EmbedManyResult$1, LanguageModel as LanguageModel$1, DeepPartial, ToolContent } from 'ai';
 import { M as MastraBase, T as Telemetry } from './base-D90KQ4XI.js';
 import { Query } from 'sift';
 import { z, ZodSchema } from 'zod';
@@ -35,6 +35,12 @@ declare abstract class MastraMemory extends MastraBase {
         threadId: string;
         memoryConfig?: MemoryConfig;
     }): Promise<string | null>;
+    /**
+     * Get tools that should be available to the agent.
+     * This will be called when converting tools for the agent.
+     * Implementations can override this to provide additional tools.
+     */
+    getTools(config?: MemoryConfig): Record<string, CoreTool$1>;
     protected createEmbeddingIndex(): Promise<{
         indexName: string;
     }>;
@@ -547,8 +553,8 @@ type StructuredOutput = {
         items: StructuredOutputArrayItem;
     };
 };
-type GenerateReturn<Z extends ZodSchema | JSONSchema7 | undefined = undefined> = Z extends undefined ? GenerateTextResult<any, any> : GenerateObjectResult<any>;
-type StreamReturn<Z extends ZodSchema | JSONSchema7 | undefined = undefined> = Z extends undefined ? StreamTextResult<any, any> : StreamObjectResult<any, any, any>;
+type GenerateReturn<Z extends ZodSchema | JSONSchema7 | undefined = undefined> = Z extends undefined ? GenerateTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown> : GenerateObjectResult<Z extends ZodSchema ? z.infer<Z> : unknown>;
+type StreamReturn<Z extends ZodSchema | JSONSchema7 | undefined = undefined> = Z extends undefined ? StreamTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown> : StreamObjectResult<any, Z extends ZodSchema ? z.infer<Z> : unknown, any>;
 type OutputType = StructuredOutput | ZodSchema | JSONSchema7 | undefined;
 type GenerateTextOptions = Parameters<typeof generateText>[0];
 type StreamTextOptions = Parameters<typeof streamText>[0];
@@ -692,7 +698,7 @@ declare class Agent<TTools extends Record<string, ToolAction<any, any, any, any>
     generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentGenerateOptions<Z> & {
         output?: never;
         experimental_output?: never;
-    }): Promise<GenerateTextResult<any, any>>;
+    }): Promise<GenerateTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown>>;
     generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentGenerateOptions<Z> & ({
         output: Z;
         experimental_output?: never;
@@ -703,14 +709,14 @@ declare class Agent<TTools extends Record<string, ToolAction<any, any, any, any>
     stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentStreamOptions<Z> & {
         output?: never;
         experimental_output?: never;
-    }): Promise<StreamReturn<any>>;
+    }): Promise<StreamTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown>>;
     stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentStreamOptions<Z> & ({
         output: Z;
         experimental_output?: never;
     } | {
         experimental_output: Z;
         output?: never;
-    })): Promise<StreamReturn<Z extends ZodSchema ? z.infer<Z> : unknown>>;
+    })): Promise<StreamObjectResult<any, Z extends ZodSchema ? z.infer<Z> : unknown, any>>;
     /**
      * Convert text to speech using the configured voice provider
      * @param input Text or text stream to convert to speech
@@ -825,6 +831,7 @@ type MemoryConfig = {
     workingMemory?: {
         enabled: boolean;
         template?: string;
+        use?: 'text-stream' | 'tool-call';
     };
 };
 type SharedMemoryConfig = {
@@ -846,6 +853,7 @@ declare abstract class MastraStorage extends MastraBase {
     /** @deprecated import { TABLE_TRACES } from '@mastra/core/storage' instead */
     static readonly TABLE_TRACES = "mastra_traces";
     protected hasInitialized: null | Promise<boolean>;
+    protected shouldCacheInit: boolean;
     constructor({ name }: {
         name: string;
     });

package/dist/{base-CbCmDLUb.d.cts → base-C_bOLlEO.d.cts}

@@ -1,5 +1,5 @@
 import * as ai from 'ai';
-import { EmbeddingModel, CoreMessage as CoreMessage$1, Message, UserContent, AssistantContent, ToolExecutionOptions, LanguageModelV1, TelemetrySettings, generateText, generateObject, streamText, GenerateTextResult, GenerateObjectResult, streamObject, StreamTextResult, StreamObjectResult, CoreSystemMessage as CoreSystemMessage$1, CoreAssistantMessage as CoreAssistantMessage$1, CoreUserMessage as CoreUserMessage$1, CoreToolMessage as CoreToolMessage$1, EmbedResult as EmbedResult$1, EmbedManyResult as EmbedManyResult$1, LanguageModel as LanguageModel$1, DeepPartial, ToolContent } from 'ai';
+import { EmbeddingModel, CoreTool as CoreTool$1, CoreMessage as CoreMessage$1, Message, UserContent, AssistantContent, ToolExecutionOptions, LanguageModelV1, TelemetrySettings, generateText, generateObject, streamText, GenerateTextResult, GenerateObjectResult, streamObject, StreamTextResult, StreamObjectResult, CoreSystemMessage as CoreSystemMessage$1, CoreAssistantMessage as CoreAssistantMessage$1, CoreUserMessage as CoreUserMessage$1, CoreToolMessage as CoreToolMessage$1, EmbedResult as EmbedResult$1, EmbedManyResult as EmbedManyResult$1, LanguageModel as LanguageModel$1, DeepPartial, ToolContent } from 'ai';
 import { M as MastraBase, T as Telemetry } from './base-hs9NDAZ2.cjs';
 import { Query } from 'sift';
 import { z, ZodSchema } from 'zod';
@@ -35,6 +35,12 @@ declare abstract class MastraMemory extends MastraBase {
         threadId: string;
         memoryConfig?: MemoryConfig;
     }): Promise<string | null>;
+    /**
+     * Get tools that should be available to the agent.
+     * This will be called when converting tools for the agent.
+     * Implementations can override this to provide additional tools.
+     */
+    getTools(config?: MemoryConfig): Record<string, CoreTool$1>;
     protected createEmbeddingIndex(): Promise<{
         indexName: string;
     }>;
@@ -547,8 +553,8 @@ type StructuredOutput = {
         items: StructuredOutputArrayItem;
     };
 };
-type GenerateReturn<Z extends ZodSchema | JSONSchema7 | undefined = undefined> = Z extends undefined ? GenerateTextResult<any, any> : GenerateObjectResult<any>;
-type StreamReturn<Z extends ZodSchema | JSONSchema7 | undefined = undefined> = Z extends undefined ? StreamTextResult<any, any> : StreamObjectResult<any, any, any>;
+type GenerateReturn<Z extends ZodSchema | JSONSchema7 | undefined = undefined> = Z extends undefined ? GenerateTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown> : GenerateObjectResult<Z extends ZodSchema ? z.infer<Z> : unknown>;
+type StreamReturn<Z extends ZodSchema | JSONSchema7 | undefined = undefined> = Z extends undefined ? StreamTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown> : StreamObjectResult<any, Z extends ZodSchema ? z.infer<Z> : unknown, any>;
 type OutputType = StructuredOutput | ZodSchema | JSONSchema7 | undefined;
 type GenerateTextOptions = Parameters<typeof generateText>[0];
 type StreamTextOptions = Parameters<typeof streamText>[0];
@@ -692,7 +698,7 @@ declare class Agent<TTools extends Record<string, ToolAction<any, any, any, any>
     generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentGenerateOptions<Z> & {
         output?: never;
         experimental_output?: never;
-    }): Promise<GenerateTextResult<any, any>>;
+    }): Promise<GenerateTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown>>;
     generate<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentGenerateOptions<Z> & ({
         output: Z;
         experimental_output?: never;
@@ -703,14 +709,14 @@ declare class Agent<TTools extends Record<string, ToolAction<any, any, any, any>
     stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentStreamOptions<Z> & {
         output?: never;
         experimental_output?: never;
-    }): Promise<StreamReturn<any>>;
+    }): Promise<StreamTextResult<any, Z extends ZodSchema ? z.infer<Z> : unknown>>;
     stream<Z extends ZodSchema | JSONSchema7 | undefined = undefined>(messages: string | string[] | CoreMessage$1[], args?: AgentStreamOptions<Z> & ({
         output: Z;
         experimental_output?: never;
     } | {
         experimental_output: Z;
         output?: never;
-    })): Promise<StreamReturn<Z extends ZodSchema ? z.infer<Z> : unknown>>;
+    })): Promise<StreamObjectResult<any, Z extends ZodSchema ? z.infer<Z> : unknown, any>>;
     /**
      * Convert text to speech using the configured voice provider
      * @param input Text or text stream to convert to speech
@@ -825,6 +831,7 @@ type MemoryConfig = {
     workingMemory?: {
         enabled: boolean;
         template?: string;
+        use?: 'text-stream' | 'tool-call';
     };
 };
 type SharedMemoryConfig = {
@@ -846,6 +853,7 @@ declare abstract class MastraStorage extends MastraBase {
     /** @deprecated import { TABLE_TRACES } from '@mastra/core/storage' instead */
     static readonly TABLE_TRACES = "mastra_traces";
     protected hasInitialized: null | Promise<boolean>;
+    protected shouldCacheInit: boolean;
     constructor({ name }: {
         name: string;
     });

package/dist/{chunk-WIBGG4X6.js → chunk-3GC7P4J6.js}

@@ -75,7 +75,7 @@ Examples: ${value.examples.join(", ")}` : ""));
     if (requiredFields.includes(key)) {
       zodSchema[key] = zodType;
     } else {
-      zodSchema[key] = zodType.nullable();
+      zodSchema[key] = zodType.nullable().optional();
     }
   }
   return z.object(zodSchema);

package/dist/{chunk-5XPCMNGW.js → chunk-KQN7VU7J.js}

@@ -14,6 +14,7 @@ var MastraStorage = class extends MastraBase {
   /** @deprecated import { TABLE_TRACES } from '@mastra/core/storage' instead */
   static TABLE_TRACES = TABLE_TRACES;
   hasInitialized = null;
+  shouldCacheInit = true;
   constructor({ name }) {
     super({
       component: "STORAGE",
@@ -69,7 +70,7 @@ var MastraStorage = class extends MastraBase {
     return this.getTraces({ scope, page, perPage, attributes });
   }
   async init() {
-    if (await this.hasInitialized) {
+    if (this.shouldCacheInit && await this.hasInitialized) {
       return;
     }
     this.hasInitialized = Promise.all([

package/dist/{chunk-KNVTCZW7.js → chunk-MGBSRQQW.js}

@@ -1,4 +1,4 @@
-import { MastraStorage } from './chunk-5XPCMNGW.js';
+import { MastraStorage } from './chunk-KQN7VU7J.js';
 import { TABLE_WORKFLOW_SNAPSHOT, TABLE_THREADS, TABLE_MESSAGES, TABLE_EVALS, TABLE_TRACES } from './chunk-RG66XEJT.js';
 import { join } from 'node:path';
 import { createClient } from '@libsql/client';
@@ -14,6 +14,9 @@ var LibSQLStore = class extends MastraStorage {
   client;
   constructor({ config }) {
     super({ name: `LibSQLStore` });
+    if (config.url === ":memory:") {
+      this.shouldCacheInit = false;
+    }
     this.client = createClient({
       url: this.rewriteDbUrl(config.url),
       authToken: config.authToken
@@ -23,8 +26,8 @@ var LibSQLStore = class extends MastraStorage {
     if (url.startsWith("file:") && !url.startsWith("file:/")) {
       const cwd = process.cwd();
       const relativePath = url.slice("file:".length);
-      if (cwd.endsWith(".mastra") || cwd.endsWith(".mastra/")) {
-        const baseDir = join(cwd, `..`);
+      if (cwd.includes(".mastra") && (cwd.endsWith(`output`) || cwd.endsWith(`output/`) || cwd.endsWith(`output\\`))) {
+        const baseDir = join(cwd, `..`, `..`);
         const fullPath = join(baseDir, relativePath);
         this.logger.debug(
           `Initializing LibSQL db with url ${url} with relative file path from inside .mastra directory. Rewriting relative file url to "file:${fullPath}". This ensures it's outside the .mastra directory. If the db is stored inside .mastra it will be deleted when Mastra re-bundles code.`

package/dist/{chunk-E7K35ROR.js → chunk-NWPCPTB7.js}

@@ -1,5 +1,5 @@
 import { InstrumentClass } from './chunk-W5HVJX45.js';
-import { delay } from './chunk-WIBGG4X6.js';
+import { delay } from './chunk-3GC7P4J6.js';
 import { MastraBase } from './chunk-OZ4XVJ6F.js';
 import { RegisteredLogger } from './chunk-PHMSPCTC.js';
 import { executeHook } from './chunk-BB4KXGBU.js';
@@ -138,7 +138,8 @@ var MastraLLM = class extends MastraLLMBase {
     tools,
     runId,
     threadId,
-    resourceId
+    resourceId,
+    memory
   } = {}) {
     this.logger.debug("Starting tool conversion for LLM");
     const converted = Object.entries(tools || {}).reduce((memo, value) => {
@@ -159,6 +160,7 @@ var MastraLLM = class extends MastraLLMBase {
                 threadId,
                 resourceId,
                 mastra: this.#mastra,
+                memory,
                 runId
               }, options) ?? void 0;
             } catch (error) {
@@ -193,6 +195,7 @@ var MastraLLM = class extends MastraLLMBase {
     telemetry,
     threadId,
     resourceId,
+    memory,
     ...rest
   }) {
     const model = this.#model;
@@ -208,7 +211,8 @@ var MastraLLM = class extends MastraLLMBase {
       tools,
       runId,
       threadId,
-      resourceId
+      resourceId,
+      memory
     });
     const argsForExecute = {
       model,
@@ -276,6 +280,7 @@ var MastraLLM = class extends MastraLLMBase {
     telemetry,
     threadId,
     resourceId,
+    memory,
     ...rest
   }) {
     const model = this.#model;
@@ -286,7 +291,8 @@ var MastraLLM = class extends MastraLLMBase {
       tools,
       runId,
       threadId,
-      resourceId
+      resourceId,
+      memory
     });
     const argsForExecute = {
       model,
@@ -351,6 +357,7 @@ var MastraLLM = class extends MastraLLMBase {
     telemetry,
     threadId,
     resourceId,
+    memory,
     ...rest
   }) {
     const model = this.#model;
@@ -366,7 +373,8 @@ var MastraLLM = class extends MastraLLMBase {
       tools,
       runId,
       threadId,
-      resourceId
+      resourceId,
+      memory
     });
     const argsForExecute = {
       model,
@@ -448,6 +456,7 @@ var MastraLLM = class extends MastraLLMBase {
     telemetry,
     threadId,
     resourceId,
+    memory,
     ...rest
   }) {
     const model = this.#model;
@@ -461,7 +470,8 @@ var MastraLLM = class extends MastraLLMBase {
       tools,
       runId,
       threadId,
-      resourceId
+      resourceId,
+      memory
     });
     const argsForExecute = {
       model,
@@ -536,6 +546,7 @@ var MastraLLM = class extends MastraLLMBase {
     output,
     temperature,
     telemetry,
+    memory,
     ...rest
   } = {}) {
     const msgs = this.convertToMessages(messages);
@@ -548,6 +559,7 @@ var MastraLLM = class extends MastraLLMBase {
         convertedTools,
         runId,
         temperature,
+        memory,
         ...rest
       });
     }
@@ -560,6 +572,7 @@ var MastraLLM = class extends MastraLLMBase {
       convertedTools,
       runId,
       telemetry,
+      memory,
       ...rest
     });
   }
@@ -974,6 +987,8 @@ var Agent = class extends (_a = MastraBase) {
       threadId,
       resourceId
     });
+    const memory = this.getMemory();
+    const memoryTools = memory?.getTools();
     const converted = Object.entries(this.tools || {}).reduce((memo, value) => {
       const k = value[0];
       const tool = this.tools[k];
@@ -994,6 +1009,7 @@ var Agent = class extends (_a = MastraBase) {
               return tool?.execute?.({
                 context: args,
                 mastra: this.#mastra,
+                memory,
                 runId,
                 threadId,
                 resourceId
@@ -1012,8 +1028,44 @@ var Agent = class extends (_a = MastraBase) {
       }
       return memo;
     }, {});
+    const convertedMemoryTools = memoryTools ? Object.entries(memoryTools).reduce((memo, [k, tool]) => {
+      memo[k] = {
+        description: tool.description,
+        parameters: tool.parameters,
+        execute: typeof tool?.execute === "function" ? async (args, options) => {
+          try {
+            this.logger.debug(`[Agent:${this.name}] - Executing memory tool ${k}`, {
+              name: k,
+              description: tool.description,
+              args,
+              runId,
+              threadId,
+              resourceId
+            });
+            return tool?.execute?.({
+              context: args,
+              mastra: this.#mastra,
+              memory,
+              runId,
+              threadId,
+              resourceId
+            }, options) ?? void 0;
+          } catch (err) {
+            this.logger.error(`[Agent:${this.name}] - Failed memory tool execution`, {
+              error: err,
+              runId,
+              threadId,
+              resourceId
+            });
+            throw err;
+          }
+        } : void 0
+      };
+      return memo;
+    }, {}) : {};
     const toolsFromToolsetsConverted = {
-      ...converted
+      ...converted,
+      ...convertedMemoryTools
     };
     const toolsFromToolsets = Object.values(toolsets || {});
     if (toolsFromToolsets.length > 0) {
@@ -1283,6 +1335,7 @@ var Agent = class extends (_a = MastraBase) {
         experimental_output,
         threadId,
         resourceId,
+        memory: this.getMemory(),
         ...rest
       });
       const outputText2 = result2.text;
@@ -1310,6 +1363,7 @@ var Agent = class extends (_a = MastraBase) {
         telemetry,
         threadId,
         resourceId,
+        memory: this.getMemory(),
         ...rest
       });
       const outputText2 = result2.text;
@@ -1333,6 +1387,7 @@ var Agent = class extends (_a = MastraBase) {
       temperature,
       toolChoice,
       telemetry,
+      memory: this.getMemory(),
       ...rest
     });
     const outputText = JSON.stringify(result.object);
@@ -1430,6 +1485,7 @@ var Agent = class extends (_a = MastraBase) {
         runId: runIdToUse,
         toolChoice,
         experimental_output,
+        memory: this.getMemory(),
         ...rest
       });
       const newStreamResult = streamResult;
@@ -1468,6 +1524,7 @@ var Agent = class extends (_a = MastraBase) {
         runId: runIdToUse,
         toolChoice,
         telemetry,
+        memory: this.getMemory(),
         ...rest
       });
     }
@@ -1503,6 +1560,7 @@ var Agent = class extends (_a = MastraBase) {
       runId: runIdToUse,
       toolChoice,
       telemetry,
+      memory: this.getMemory(),
       ...rest
     });
   }

package/dist/{chunk-L7SWFW3L.js → chunk-P47D7HYO.js}

@@ -434,8 +434,8 @@ var LibSQLVector = class extends MastraVector {
     if (url.startsWith("file:") && !url.startsWith("file:/")) {
       const cwd = process.cwd();
       const relativePath = url.slice("file:".length);
-      if (cwd.endsWith(".mastra") || cwd.endsWith(".mastra/")) {
-        const baseDir = join(cwd, `..`);
+      if (cwd.includes(".mastra") && (cwd.endsWith(`output`) || cwd.endsWith(`output/`) || cwd.endsWith(`output\\`))) {
+        const baseDir = join(cwd, `..`, `..`);
         const fullPath = join(baseDir, relativePath);
         this.logger.debug(
           `Initializing LibSQL db with url ${url} with relative file path from inside .mastra directory. Rewriting relative file url to "file:${fullPath}". This ensures it's outside the .mastra directory. If the db is stored inside .mastra it will be deleted when Mastra re-bundles code.`