@mastra/memory 0.11.2 → 0.11.3-alpha.0

package/.turbo/turbo-build.log

@@ -1,9 +1,9 @@
 
-> @mastra/memory@0.11.2-alpha.1 build /home/runner/work/mastra/mastra/packages/memory
+> @mastra/memory@0.11.3-alpha.0 build /home/runner/work/mastra/mastra/packages/memory
 > pnpm run check && tsup --silent src/index.ts src/processors/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 
-> @mastra/memory@0.11.2-alpha.1 check /home/runner/work/mastra/mastra/packages/memory
+> @mastra/memory@0.11.3-alpha.0 check /home/runner/work/mastra/mastra/packages/memory
 > tsc --noEmit
 
 Analysis will use the bundled TypeScript version 5.8.3

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @mastra/memory
 
+## 0.11.3-alpha.0
+
+### Patch Changes
+
+- 4b20131: Fixed an issue where per-resource semantic recall wouldn't always be enabled properly in agent tool calls
+- 626b0f4: [Cloud-126] Working Memory Playground - Added working memory to playground to allow users to view/edit working memory
+- Updated dependencies [db5cc15]
+- Updated dependencies [5237998]
+- Updated dependencies [37c1acd]
+- Updated dependencies [1aa60b1]
+- Updated dependencies [89ec9d4]
+- Updated dependencies [626b0f4]
+- Updated dependencies [c22a91f]
+- Updated dependencies [f7403ab]
+- Updated dependencies [6c89d7f]
+  - @mastra/core@0.10.15-alpha.0
+
 ## 0.11.2
 
 ### Patch Changes

package/dist/_tsup-dts-rollup.d.cts

@@ -6,6 +6,7 @@ import { MastraMemory } from '@mastra/core/memory';
 import type { MastraMessageV1 } from '@mastra/core';
 import type { MastraMessageV2 } from '@mastra/core/agent';
 import type { MemoryConfig } from '@mastra/core/memory';
+import type { MemoryConfig as MemoryConfig_2 } from '@mastra/core';
 import { MemoryProcessor } from '@mastra/core/memory';
 import { MemoryProcessor as MemoryProcessor_2 } from '@mastra/core';
 import type { MemoryProcessorOpts } from '@mastra/core';
@@ -14,7 +15,6 @@ import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
 import type { TiktokenBPE } from 'js-tiktoken/lite';
 import type { UIMessage } from 'ai';
-import type { WorkingMemoryFormat } from '@mastra/core/memory';
 import type { WorkingMemoryTemplate } from '@mastra/core/memory';
 
 /**
@@ -90,7 +90,16 @@ export declare class Memory extends MastraMemory {
         resourceId?: string;
         memoryConfig?: MemoryConfig;
     }): Promise<string | null>;
-    getWorkingMemoryTemplate(): Promise<WorkingMemoryTemplate | null>;
+    /**
+     * Gets the working memory template for the current memory configuration.
+     * Supports both ZodObject and JSONSchema7 schemas.
+     *
+     * @param memoryConfig - The memory configuration containing the working memory settings
+     * @returns The working memory template with format and content, or null if working memory is disabled
+     */
+    getWorkingMemoryTemplate({ memoryConfig, }: {
+        memoryConfig?: MemoryConfig;
+    }): Promise<WorkingMemoryTemplate | null>;
     getSystemMessage({ threadId, resourceId, memoryConfig, }: {
         threadId: string;
         resourceId?: string;
@@ -164,8 +173,6 @@ declare class ToolCallFilter extends MemoryProcessor_2 {
 export { ToolCallFilter }
 export { ToolCallFilter as ToolCallFilter_alias_1 }
 
-export declare const updateWorkingMemoryTool: ({ format }: {
-    format: WorkingMemoryFormat;
-}) => CoreTool;
+export declare const updateWorkingMemoryTool: (memoryConfig?: MemoryConfig_2) => CoreTool;
 
 export { }

package/dist/_tsup-dts-rollup.d.ts

@@ -6,6 +6,7 @@ import { MastraMemory } from '@mastra/core/memory';
 import type { MastraMessageV1 } from '@mastra/core';
 import type { MastraMessageV2 } from '@mastra/core/agent';
 import type { MemoryConfig } from '@mastra/core/memory';
+import type { MemoryConfig as MemoryConfig_2 } from '@mastra/core';
 import { MemoryProcessor } from '@mastra/core/memory';
 import { MemoryProcessor as MemoryProcessor_2 } from '@mastra/core';
 import type { MemoryProcessorOpts } from '@mastra/core';
@@ -14,7 +15,6 @@ import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
 import type { TiktokenBPE } from 'js-tiktoken/lite';
 import type { UIMessage } from 'ai';
-import type { WorkingMemoryFormat } from '@mastra/core/memory';
 import type { WorkingMemoryTemplate } from '@mastra/core/memory';
 
 /**
@@ -90,7 +90,16 @@ export declare class Memory extends MastraMemory {
         resourceId?: string;
         memoryConfig?: MemoryConfig;
     }): Promise<string | null>;
-    getWorkingMemoryTemplate(): Promise<WorkingMemoryTemplate | null>;
+    /**
+     * Gets the working memory template for the current memory configuration.
+     * Supports both ZodObject and JSONSchema7 schemas.
+     *
+     * @param memoryConfig - The memory configuration containing the working memory settings
+     * @returns The working memory template with format and content, or null if working memory is disabled
+     */
+    getWorkingMemoryTemplate({ memoryConfig, }: {
+        memoryConfig?: MemoryConfig;
+    }): Promise<WorkingMemoryTemplate | null>;
     getSystemMessage({ threadId, resourceId, memoryConfig, }: {
         threadId: string;
         resourceId?: string;
@@ -164,8 +173,6 @@ declare class ToolCallFilter extends MemoryProcessor_2 {
 export { ToolCallFilter }
 export { ToolCallFilter as ToolCallFilter_alias_1 }
 
-export declare const updateWorkingMemoryTool: ({ format }: {
-    format: WorkingMemoryFormat;
-}) => CoreTool;
+export declare const updateWorkingMemoryTool: (memoryConfig?: MemoryConfig_2) => CoreTool;
 
 export { }

package/dist/index.cjs

@@ -5,8 +5,8 @@ var agent = require('@mastra/core/agent');
 var memory = require('@mastra/core/memory');
 var ai = require('ai');
 var xxhash = require('xxhash-wasm');
-var zodToJsonSchema = require('zod-to-json-schema');
 var zod = require('zod');
+var zodToJsonSchema = require('zod-to-json-schema');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -14,10 +14,12 @@ var xxhash__default = /*#__PURE__*/_interopDefault(xxhash);
 var zodToJsonSchema__default = /*#__PURE__*/_interopDefault(zodToJsonSchema);
 
 // src/index.ts
-var updateWorkingMemoryTool = ({ format }) => ({
-  description: "Update the working memory with new information",
+var updateWorkingMemoryTool = (memoryConfig) => ({
+  description: "Update the working memory with new information. Always pass data as string to the memory field. Never pass an object.",
   parameters: zod.z.object({
-    memory: zod.z.string().describe(`The ${format === "json" ? "JSON" : "Markdown"} formatted working memory content to store`)
+    memory: zod.z.string().describe(
+      `The ${!!memoryConfig?.workingMemory?.schema ? "JSON" : "Markdown"} formatted working memory content to store. This MUST be a string. Never pass an object.`
+    )
   }),
   execute: async (params) => {
     const { context, threadId, memory, resourceId } = params;
@@ -35,7 +37,8 @@ var updateWorkingMemoryTool = ({ format }) => ({
     await memory.updateWorkingMemory({
       threadId,
       resourceId: resourceId || thread.resourceId,
-      workingMemory
+      workingMemory,
+      memoryConfig
     });
     return { success: true };
   }
@@ -45,6 +48,7 @@ var updateWorkingMemoryTool = ({ format }) => ({
 var CHARS_PER_TOKEN = 4;
 var DEFAULT_MESSAGE_RANGE = { before: 2, after: 2 };
 var DEFAULT_TOP_K = 2;
+var isZodObject = (v) => v instanceof zod.ZodObject;
 var Memory = class extends memory.MastraMemory {
   constructor(config = {}) {
     super({ name: "Memory", ...config });
@@ -208,27 +212,20 @@ var Memory = class extends memory.MastraMemory {
     const config = this.getMergedThreadConfig(memoryConfig || {});
     if (config.workingMemory?.enabled) {
       const scope = config.workingMemory.scope || "thread";
+      const workingMemory = await this.getWorkingMemoryTemplate({ memoryConfig: config });
       if (scope === "resource" && thread.resourceId) {
         const existingResource = await this.storage.getResourceById({ resourceId: thread.resourceId });
         if (!existingResource?.workingMemory) {
-          let workingMemory = config.workingMemory.template || this.defaultWorkingMemoryTemplate;
-          if (config.workingMemory.schema) {
-            workingMemory = JSON.stringify(zodToJsonSchema__default.default(config.workingMemory.schema));
-          }
           await this.storage.updateResource({
             resourceId: thread.resourceId,
-            workingMemory
+            workingMemory: workingMemory?.content
           });
         }
       } else if (scope === "thread" && !thread?.metadata?.workingMemory) {
-        let workingMemory = config.workingMemory.template || this.defaultWorkingMemoryTemplate;
-        if (config.workingMemory.schema) {
-          workingMemory = JSON.stringify(zodToJsonSchema__default.default(config.workingMemory.schema));
-        }
         return this.storage.saveThread({
           thread: core.deepMerge(thread, {
             metadata: {
-              workingMemory
+              workingMemory: workingMemory?.content
             }
           })
         });
@@ -479,23 +476,38 @@ var Memory = class extends memory.MastraMemory {
     }
     return workingMemoryData;
   }
-  async getWorkingMemoryTemplate() {
-    if (!this.threadConfig.workingMemory?.enabled) {
+  /**
+   * Gets the working memory template for the current memory configuration.
+   * Supports both ZodObject and JSONSchema7 schemas.
+   *
+   * @param memoryConfig - The memory configuration containing the working memory settings
+   * @returns The working memory template with format and content, or null if working memory is disabled
+   */
+  async getWorkingMemoryTemplate({
+    memoryConfig
+  }) {
+    const config = this.getMergedThreadConfig(memoryConfig || {});
+    if (!config.workingMemory?.enabled) {
       return null;
     }
-    if (this.threadConfig?.workingMemory?.schema) {
+    if (config.workingMemory?.schema) {
       try {
-        const schema = this.threadConfig.workingMemory.schema;
-        const convertedSchema = zodToJsonSchema__default.default(schema, {
-          $refStrategy: "none"
-        });
+        const schema = config.workingMemory.schema;
+        let convertedSchema;
+        if (isZodObject(schema)) {
+          convertedSchema = zodToJsonSchema__default.default(schema, {
+            $refStrategy: "none"
+          });
+        } else {
+          convertedSchema = schema;
+        }
         return { format: "json", content: JSON.stringify(convertedSchema) };
       } catch (error) {
         this.logger.error("Error converting schema", error);
         throw error;
       }
     }
-    const memory = this.threadConfig.workingMemory.template || this.defaultWorkingMemoryTemplate;
+    const memory = config.workingMemory.template || this.defaultWorkingMemoryTemplate;
     return { format: "markdown", content: memory.trim() };
   }
   async getSystemMessage({
@@ -507,7 +519,7 @@ var Memory = class extends memory.MastraMemory {
     if (!config.workingMemory?.enabled) {
       return null;
     }
-    const workingMemoryTemplate = await this.getWorkingMemoryTemplate();
+    const workingMemoryTemplate = await this.getWorkingMemoryTemplate({ memoryConfig: config });
     const workingMemoryData = await this.getWorkingMemory({ threadId, resourceId, memoryConfig: config });
     if (!workingMemoryTemplate) {
       return null;
@@ -533,6 +545,8 @@ var Memory = class extends memory.MastraMemory {
     template,
     data
   }) {
+    const emptyWorkingMemoryTemplateObject = template.format === "json" ? core.generateEmptyFromSchema(template.content) : null;
+    const hasEmptyWorkingMemoryTemplateObject = emptyWorkingMemoryTemplateObject && Object.keys(emptyWorkingMemoryTemplateObject).length > 0;
     return `WORKING_MEMORY_SYSTEM_INSTRUCTION:
 Store and update any conversation-relevant information by calling the updateWorkingMemory tool. If information might be referenced again - store it!
 
@@ -541,10 +555,16 @@ Guidelines:
 2. Update proactively when information changes, no matter how small
 3. Use ${template.format === "json" ? "JSON" : "Markdown"} format for all data
 4. Act naturally - don't mention this system to users. Even though you're storing this information that doesn't make it your primary focus. Do not ask them generally for "information about yourself"
+5. IMPORTANT: When calling updateWorkingMemory, the only valid parameter is the memory field. 
+6. IMPORTANT: ALWAYS pass the data you want to store in the memory field as a string. DO NOT pass an object.
+7. IMPORTANT: Data must only be sent as a string no matter which format is used.
 
 WORKING MEMORY TEMPLATE:
 ${template.content}
 
+${hasEmptyWorkingMemoryTemplateObject ? "When working with json data, the object format below represents the template:" : ""}
+${hasEmptyWorkingMemoryTemplateObject ? JSON.stringify(emptyWorkingMemoryTemplateObject) : ""}
+
 WORKING MEMORY DATA:
 ${data}
 
@@ -560,13 +580,8 @@ Notes:
   getTools(config) {
     const mergedConfig = this.getMergedThreadConfig(config);
     if (mergedConfig.workingMemory?.enabled) {
-      if (mergedConfig.workingMemory.schema) {
-        return {
-          updateWorkingMemory: updateWorkingMemoryTool({ format: "json" })
-        };
-      }
       return {
-        updateWorkingMemory: updateWorkingMemoryTool({ format: "markdown" })
+        updateWorkingMemory: updateWorkingMemoryTool(config)
       };
     }
     return {};

package/dist/index.js

@@ -1,16 +1,18 @@
-import { deepMerge } from '@mastra/core';
+import { deepMerge, generateEmptyFromSchema } from '@mastra/core';
 import { MessageList } from '@mastra/core/agent';
 import { MastraMemory } from '@mastra/core/memory';
 import { embedMany } from 'ai';
 import xxhash from 'xxhash-wasm';
+import { z, ZodObject } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
-import { z } from 'zod';
 
 // src/index.ts
-var updateWorkingMemoryTool = ({ format }) => ({
-  description: "Update the working memory with new information",
+var updateWorkingMemoryTool = (memoryConfig) => ({
+  description: "Update the working memory with new information. Always pass data as string to the memory field. Never pass an object.",
   parameters: z.object({
-    memory: z.string().describe(`The ${format === "json" ? "JSON" : "Markdown"} formatted working memory content to store`)
+    memory: z.string().describe(
+      `The ${!!memoryConfig?.workingMemory?.schema ? "JSON" : "Markdown"} formatted working memory content to store. This MUST be a string. Never pass an object.`
+    )
   }),
   execute: async (params) => {
     const { context, threadId, memory, resourceId } = params;
@@ -28,7 +30,8 @@ var updateWorkingMemoryTool = ({ format }) => ({
     await memory.updateWorkingMemory({
       threadId,
       resourceId: resourceId || thread.resourceId,
-      workingMemory
+      workingMemory,
+      memoryConfig
     });
     return { success: true };
   }
@@ -38,6 +41,7 @@ var updateWorkingMemoryTool = ({ format }) => ({
 var CHARS_PER_TOKEN = 4;
 var DEFAULT_MESSAGE_RANGE = { before: 2, after: 2 };
 var DEFAULT_TOP_K = 2;
+var isZodObject = (v) => v instanceof ZodObject;
 var Memory = class extends MastraMemory {
   constructor(config = {}) {
     super({ name: "Memory", ...config });
@@ -201,27 +205,20 @@ var Memory = class extends MastraMemory {
     const config = this.getMergedThreadConfig(memoryConfig || {});
     if (config.workingMemory?.enabled) {
       const scope = config.workingMemory.scope || "thread";
+      const workingMemory = await this.getWorkingMemoryTemplate({ memoryConfig: config });
       if (scope === "resource" && thread.resourceId) {
         const existingResource = await this.storage.getResourceById({ resourceId: thread.resourceId });
         if (!existingResource?.workingMemory) {
-          let workingMemory = config.workingMemory.template || this.defaultWorkingMemoryTemplate;
-          if (config.workingMemory.schema) {
-            workingMemory = JSON.stringify(zodToJsonSchema(config.workingMemory.schema));
-          }
           await this.storage.updateResource({
             resourceId: thread.resourceId,
-            workingMemory
+            workingMemory: workingMemory?.content
           });
         }
       } else if (scope === "thread" && !thread?.metadata?.workingMemory) {
-        let workingMemory = config.workingMemory.template || this.defaultWorkingMemoryTemplate;
-        if (config.workingMemory.schema) {
-          workingMemory = JSON.stringify(zodToJsonSchema(config.workingMemory.schema));
-        }
         return this.storage.saveThread({
           thread: deepMerge(thread, {
             metadata: {
-              workingMemory
+              workingMemory: workingMemory?.content
             }
           })
         });
@@ -472,23 +469,38 @@ var Memory = class extends MastraMemory {
     }
     return workingMemoryData;
   }
-  async getWorkingMemoryTemplate() {
-    if (!this.threadConfig.workingMemory?.enabled) {
+  /**
+   * Gets the working memory template for the current memory configuration.
+   * Supports both ZodObject and JSONSchema7 schemas.
+   *
+   * @param memoryConfig - The memory configuration containing the working memory settings
+   * @returns The working memory template with format and content, or null if working memory is disabled
+   */
+  async getWorkingMemoryTemplate({
+    memoryConfig
+  }) {
+    const config = this.getMergedThreadConfig(memoryConfig || {});
+    if (!config.workingMemory?.enabled) {
       return null;
     }
-    if (this.threadConfig?.workingMemory?.schema) {
+    if (config.workingMemory?.schema) {
       try {
-        const schema = this.threadConfig.workingMemory.schema;
-        const convertedSchema = zodToJsonSchema(schema, {
-          $refStrategy: "none"
-        });
+        const schema = config.workingMemory.schema;
+        let convertedSchema;
+        if (isZodObject(schema)) {
+          convertedSchema = zodToJsonSchema(schema, {
+            $refStrategy: "none"
+          });
+        } else {
+          convertedSchema = schema;
+        }
         return { format: "json", content: JSON.stringify(convertedSchema) };
       } catch (error) {
         this.logger.error("Error converting schema", error);
         throw error;
       }
     }
-    const memory = this.threadConfig.workingMemory.template || this.defaultWorkingMemoryTemplate;
+    const memory = config.workingMemory.template || this.defaultWorkingMemoryTemplate;
     return { format: "markdown", content: memory.trim() };
   }
   async getSystemMessage({
@@ -500,7 +512,7 @@ var Memory = class extends MastraMemory {
     if (!config.workingMemory?.enabled) {
       return null;
     }
-    const workingMemoryTemplate = await this.getWorkingMemoryTemplate();
+    const workingMemoryTemplate = await this.getWorkingMemoryTemplate({ memoryConfig: config });
     const workingMemoryData = await this.getWorkingMemory({ threadId, resourceId, memoryConfig: config });
     if (!workingMemoryTemplate) {
       return null;
@@ -526,6 +538,8 @@ var Memory = class extends MastraMemory {
     template,
     data
   }) {
+    const emptyWorkingMemoryTemplateObject = template.format === "json" ? generateEmptyFromSchema(template.content) : null;
+    const hasEmptyWorkingMemoryTemplateObject = emptyWorkingMemoryTemplateObject && Object.keys(emptyWorkingMemoryTemplateObject).length > 0;
     return `WORKING_MEMORY_SYSTEM_INSTRUCTION:
 Store and update any conversation-relevant information by calling the updateWorkingMemory tool. If information might be referenced again - store it!
 
@@ -534,10 +548,16 @@ Guidelines:
 2. Update proactively when information changes, no matter how small
 3. Use ${template.format === "json" ? "JSON" : "Markdown"} format for all data
 4. Act naturally - don't mention this system to users. Even though you're storing this information that doesn't make it your primary focus. Do not ask them generally for "information about yourself"
+5. IMPORTANT: When calling updateWorkingMemory, the only valid parameter is the memory field. 
+6. IMPORTANT: ALWAYS pass the data you want to store in the memory field as a string. DO NOT pass an object.
+7. IMPORTANT: Data must only be sent as a string no matter which format is used.
 
 WORKING MEMORY TEMPLATE:
 ${template.content}
 
+${hasEmptyWorkingMemoryTemplateObject ? "When working with json data, the object format below represents the template:" : ""}
+${hasEmptyWorkingMemoryTemplateObject ? JSON.stringify(emptyWorkingMemoryTemplateObject) : ""}
+
 WORKING MEMORY DATA:
 ${data}
 
@@ -553,13 +573,8 @@ Notes:
   getTools(config) {
     const mergedConfig = this.getMergedThreadConfig(config);
     if (mergedConfig.workingMemory?.enabled) {
-      if (mergedConfig.workingMemory.schema) {
-        return {
-          updateWorkingMemory: updateWorkingMemoryTool({ format: "json" })
-        };
-      }
       return {
-        updateWorkingMemory: updateWorkingMemoryTool({ format: "markdown" })
+        updateWorkingMemory: updateWorkingMemoryTool(config)
       };
     }
     return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/memory",
-  "version": "0.11.2",
+  "version": "0.11.3-alpha.0",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -35,6 +35,7 @@
     "@upstash/redis": "^1.35.0",
     "ai": "^4.3.16",
     "js-tiktoken": "^1.0.20",
+    "json-schema": "^0.4.0",
     "pg": "^8.16.3",
     "pg-pool": "^3.10.1",
     "postgres": "^3.4.7",
@@ -46,15 +47,16 @@
   "devDependencies": {
     "@ai-sdk/openai": "^1.3.22",
     "@microsoft/api-extractor": "^7.52.8",
+    "@types/json-schema": "^7.0.15",
     "@types/node": "^20.19.0",
     "@types/pg": "^8.15.4",
-    "eslint": "^9.29.0",
+    "eslint": "^9.30.1",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.34.0",
     "vitest": "^3.2.4",
-    "@mastra/core": "0.10.11",
-    "@internal/lint": "0.0.18"
+    "@mastra/core": "0.10.15-alpha.0",
+    "@internal/lint": "0.0.19"
   },
   "peerDependencies": {
     "@mastra/core": ">=0.10.9-0 <0.11.0-0"

package/src/index.ts

@@ -1,4 +1,4 @@
-import { deepMerge } from '@mastra/core';
+import { deepMerge, generateEmptyFromSchema } from '@mastra/core';
 import type { CoreTool, MastraMessageV1 } from '@mastra/core';
 import { MessageList } from '@mastra/core/agent';
 import type { MastraMessageV2 } from '@mastra/core/agent';
@@ -7,8 +7,11 @@ import type { MemoryConfig, SharedMemoryConfig, StorageThreadType, WorkingMemory
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
 import { embedMany } from 'ai';
 import type { CoreMessage, TextPart, UIMessage } from 'ai';
+import type { JSONSchema7 } from 'json-schema';
 
 import xxhash from 'xxhash-wasm';
+import { ZodObject } from 'zod';
+import type { ZodTypeAny } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
 import { updateWorkingMemoryTool } from './tools/working-memory';
 
@@ -18,6 +21,8 @@ const CHARS_PER_TOKEN = 4;
 const DEFAULT_MESSAGE_RANGE = { before: 2, after: 2 } as const;
 const DEFAULT_TOP_K = 2;
 
+const isZodObject = (v: ZodTypeAny): v is ZodObject<any, any, any> => v instanceof ZodObject;
+
 /**
  * Concrete implementation of MastraMemory that adds support for thread configuration
  * and message injection.
@@ -258,35 +263,22 @@ export class Memory extends MastraMemory {
 
     if (config.workingMemory?.enabled) {
       const scope = config.workingMemory.scope || 'thread';
-
+      const workingMemory = await this.getWorkingMemoryTemplate({ memoryConfig: config });
       if (scope === 'resource' && thread.resourceId) {
         // For resource scope, initialize working memory in resource table
         const existingResource = await this.storage.getResourceById({ resourceId: thread.resourceId });
-
         if (!existingResource?.workingMemory) {
-          let workingMemory = config.workingMemory.template || this.defaultWorkingMemoryTemplate;
-
-          if (config.workingMemory.schema) {
-            workingMemory = JSON.stringify(zodToJsonSchema(config.workingMemory.schema));
-          }
-
           await this.storage.updateResource({
             resourceId: thread.resourceId,
-            workingMemory,
+            workingMemory: workingMemory?.content,
           });
         }
       } else if (scope === 'thread' && !thread?.metadata?.workingMemory) {
         // For thread scope, initialize working memory in thread metadata (existing behavior)
-        let workingMemory = config.workingMemory.template || this.defaultWorkingMemoryTemplate;
-
-        if (config.workingMemory.schema) {
-          workingMemory = JSON.stringify(zodToJsonSchema(config.workingMemory.schema));
-        }
-
         return this.storage.saveThread({
           thread: deepMerge(thread, {
             metadata: {
-              workingMemory,
+              workingMemory: workingMemory?.content,
             },
           }),
         });
@@ -654,18 +646,39 @@ export class Memory extends MastraMemory {
     return workingMemoryData;
   }
 
-  public async getWorkingMemoryTemplate(): Promise<WorkingMemoryTemplate | null> {
-    if (!this.threadConfig.workingMemory?.enabled) {
+  /**
+   * Gets the working memory template for the current memory configuration.
+   * Supports both ZodObject and JSONSchema7 schemas.
+   *
+   * @param memoryConfig - The memory configuration containing the working memory settings
+   * @returns The working memory template with format and content, or null if working memory is disabled
+   */
+  public async getWorkingMemoryTemplate({
+    memoryConfig,
+  }: {
+    memoryConfig?: MemoryConfig;
+  }): Promise<WorkingMemoryTemplate | null> {
+    const config = this.getMergedThreadConfig(memoryConfig || {});
+
+    if (!config.workingMemory?.enabled) {
       return null;
     }
 
     // Get thread from storage
-    if (this.threadConfig?.workingMemory?.schema) {
+    if (config.workingMemory?.schema) {
       try {
-        const schema = this.threadConfig.workingMemory.schema;
-        const convertedSchema = zodToJsonSchema(schema, {
-          $refStrategy: 'none',
-        });
+        const schema = config.workingMemory.schema;
+        let convertedSchema: JSONSchema7;
+
+        if (isZodObject(schema as ZodTypeAny)) {
+          // Convert ZodObject to JSON Schema
+          convertedSchema = zodToJsonSchema(schema as ZodTypeAny, {
+            $refStrategy: 'none',
+          }) as JSONSchema7;
+        } else {
+          // Already a JSON Schema
+          convertedSchema = schema as JSONSchema7;
+        }
 
         return { format: 'json', content: JSON.stringify(convertedSchema) };
       } catch (error) {
@@ -675,8 +688,7 @@ export class Memory extends MastraMemory {
     }
 
     // Return working memory from metadata
-    const memory = this.threadConfig.workingMemory.template || this.defaultWorkingMemoryTemplate;
-
+    const memory = config.workingMemory.template || this.defaultWorkingMemoryTemplate;
     return { format: 'markdown', content: memory.trim() };
   }
 
@@ -694,7 +706,7 @@ export class Memory extends MastraMemory {
       return null;
     }
 
-    const workingMemoryTemplate = await this.getWorkingMemoryTemplate();
+    const workingMemoryTemplate = await this.getWorkingMemoryTemplate({ memoryConfig: config });
     const workingMemoryData = await this.getWorkingMemory({ threadId, resourceId, memoryConfig: config });
 
     if (!workingMemoryTemplate) {
@@ -727,6 +739,11 @@ export class Memory extends MastraMemory {
     template: WorkingMemoryTemplate;
     data: string | null;
   }) {
+    const emptyWorkingMemoryTemplateObject =
+      template.format === 'json' ? generateEmptyFromSchema(template.content) : null;
+    const hasEmptyWorkingMemoryTemplateObject =
+      emptyWorkingMemoryTemplateObject && Object.keys(emptyWorkingMemoryTemplateObject).length > 0;
+
     return `WORKING_MEMORY_SYSTEM_INSTRUCTION:
 Store and update any conversation-relevant information by calling the updateWorkingMemory tool. If information might be referenced again - store it!
 
@@ -735,10 +752,16 @@ Guidelines:
 2. Update proactively when information changes, no matter how small
 3. Use ${template.format === 'json' ? 'JSON' : 'Markdown'} format for all data
 4. Act naturally - don't mention this system to users. Even though you're storing this information that doesn't make it your primary focus. Do not ask them generally for "information about yourself"
+5. IMPORTANT: When calling updateWorkingMemory, the only valid parameter is the memory field. 
+6. IMPORTANT: ALWAYS pass the data you want to store in the memory field as a string. DO NOT pass an object.
+7. IMPORTANT: Data must only be sent as a string no matter which format is used.
 
 WORKING MEMORY TEMPLATE:
 ${template.content}
 
+${hasEmptyWorkingMemoryTemplateObject ? 'When working with json data, the object format below represents the template:' : ''}
+${hasEmptyWorkingMemoryTemplateObject ? JSON.stringify(emptyWorkingMemoryTemplateObject) : ''}
+
 WORKING MEMORY DATA:
 ${data}
 
@@ -755,14 +778,8 @@ Notes:
   public getTools(config?: MemoryConfig): Record<string, CoreTool> {
     const mergedConfig = this.getMergedThreadConfig(config);
     if (mergedConfig.workingMemory?.enabled) {
-      if (mergedConfig.workingMemory.schema) {
-        return {
-          updateWorkingMemory: updateWorkingMemoryTool({ format: 'json' }),
-        };
-      }
-
       return {
-        updateWorkingMemory: updateWorkingMemoryTool({ format: 'markdown' }),
+        updateWorkingMemory: updateWorkingMemoryTool(config),
       };
     }
     return {};

package/src/tools/working-memory.ts

@@ -1,13 +1,15 @@
-import type { CoreTool } from '@mastra/core';
-import type { WorkingMemoryFormat } from '@mastra/core/memory';
+import type { CoreTool, MemoryConfig } from '@mastra/core';
 import { z } from 'zod';
 
-export const updateWorkingMemoryTool = ({ format }: { format: WorkingMemoryFormat }): CoreTool => ({
-  description: 'Update the working memory with new information',
+export const updateWorkingMemoryTool = (memoryConfig?: MemoryConfig): CoreTool => ({
+  description:
+    'Update the working memory with new information. Always pass data as string to the memory field. Never pass an object.',
   parameters: z.object({
     memory: z
       .string()
-      .describe(`The ${format === 'json' ? 'JSON' : 'Markdown'} formatted working memory content to store`),
+      .describe(
+        `The ${!!memoryConfig?.workingMemory?.schema ? 'JSON' : 'Markdown'} formatted working memory content to store. This MUST be a string. Never pass an object.`,
+      ),
   }),
   execute: async (params: any) => {
     const { context, threadId, memory, resourceId } = params;
@@ -32,6 +34,7 @@ export const updateWorkingMemoryTool = ({ format }: { format: WorkingMemoryForma
       threadId,
       resourceId: resourceId || thread.resourceId,
       workingMemory: workingMemory,
+      memoryConfig,
     });
 
     return { success: true };