@mastra/memory 0.2.0-alpha.0 → 0.2.0-alpha.10

package/.turbo/turbo-build.log

@@ -1,27 +1,27 @@
 
-> @mastra/memory@0.2.0-alpha.0 build /home/runner/work/mastra/mastra/packages/memory
+> @mastra/memory@0.2.0-alpha.10 build /home/runner/work/mastra/mastra/packages/memory
 > pnpm run check && tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake
 
 
-> @mastra/memory@0.2.0-alpha.0 check /home/runner/work/mastra/mastra/packages/memory
+> @mastra/memory@0.2.0-alpha.10 check /home/runner/work/mastra/mastra/packages/memory
 > tsc --noEmit
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.3.6
 TSC Build start
-TSC ⚡️ Build success in 7804ms
+TSC ⚡️ Build success in 8086ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.7.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/memory/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.7.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/memory/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 10512ms
+DTS ⚡️ Build success in 10514ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 12.07 KB
-ESM ⚡️ Build success in 709ms
-CJS dist/index.cjs 12.10 KB
-CJS ⚡️ Build success in 711ms
+ESM dist/index.js 12.79 KB
+ESM ⚡️ Build success in 657ms
+CJS dist/index.cjs 12.83 KB
+CJS ⚡️ Build success in 658ms

package/CHANGELOG.md

@@ -1,5 +1,94 @@
 # @mastra/memory
 
+## 0.2.0-alpha.10
+
+### Patch Changes
+
+- Updated dependencies [a910463]
+  - @mastra/core@0.5.0-alpha.10
+
+## 0.2.0-alpha.9
+
+### Patch Changes
+
+- f2301de: Added the ability to ensure the accessed thread in memory.query() is for the right resource id. ex memory.query({ threadId, resourceId }). If the resourceId doesn't own the thread it will throw an error.
+- Updated dependencies [e9fbac5]
+- Updated dependencies [1e8bcbc]
+- Updated dependencies [aeb5e36]
+- Updated dependencies [f2301de]
+  - @mastra/core@0.5.0-alpha.9
+
+## 0.2.0-alpha.8
+
+### Patch Changes
+
+- Updated dependencies [506f1d5]
+  - @mastra/core@0.5.0-alpha.8
+
+## 0.2.0-alpha.7
+
+### Patch Changes
+
+- Updated dependencies [ee667a2]
+  - @mastra/core@0.5.0-alpha.7
+
+## 0.2.0-alpha.6
+
+### Patch Changes
+
+- Updated dependencies [f6678e4]
+  - @mastra/core@0.5.0-alpha.6
+
+## 0.2.0-alpha.5
+
+### Patch Changes
+
+- c151ae6: Fixed an issue where models that don't support structured output would error when generating a thread title. Added an option to disable thread title llm generation `new Memory({ threads: { generateTitle: false }})`
+- Updated dependencies [22643eb]
+- Updated dependencies [6feb23f]
+- Updated dependencies [f2d6727]
+- Updated dependencies [301e4ee]
+- Updated dependencies [dfbe4e9]
+- Updated dependencies [9e81f35]
+- Updated dependencies [caefaa2]
+- Updated dependencies [c151ae6]
+- Updated dependencies [52e0418]
+- Updated dependencies [03236ec]
+- Updated dependencies [3764e71]
+- Updated dependencies [df982db]
+- Updated dependencies [0461849]
+- Updated dependencies [2259379]
+- Updated dependencies [358f069]
+  - @mastra/core@0.5.0-alpha.5
+
+## 0.2.0-alpha.4
+
+### Patch Changes
+
+- Updated dependencies [d79aedf]
+  - @mastra/core@0.5.0-alpha.4
+
+## 0.2.0-alpha.3
+
+### Patch Changes
+
+- Updated dependencies [3d0e290]
+  - @mastra/core@0.5.0-alpha.3
+
+## 0.2.0-alpha.2
+
+### Patch Changes
+
+- Updated dependencies [02ffb7b]
+  - @mastra/core@0.5.0-alpha.2
+
+## 0.2.0-alpha.1
+
+### Patch Changes
+
+- Updated dependencies [dab255b]
+  - @mastra/core@0.5.0-alpha.1
+
 ## 0.2.0-alpha.0
 
 ### Minor Changes

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

@@ -1,8 +1,8 @@
+import type { AiMessageType } from '@mastra/core';
 import type { CoreMessage } from '@mastra/core';
 import type { CoreTool } from '@mastra/core';
 import { MastraMemory } from '@mastra/core/memory';
 import type { MemoryConfig } from '@mastra/core/memory';
-import type { Message } from 'ai';
 import type { MessageType } from '@mastra/core/memory';
 import type { SharedMemoryConfig } from '@mastra/core/memory';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
@@ -14,17 +14,20 @@ import type { StorageThreadType } from '@mastra/core/memory';
  */
 export declare class Memory extends MastraMemory {
     constructor(config?: SharedMemoryConfig);
-    query({ threadId, selectBy, threadConfig, }: StorageGetMessagesArg): Promise<{
+    private validateThreadIsOwnedByResource;
+    query({ threadId, resourceId, selectBy, threadConfig, }: StorageGetMessagesArg): Promise<{
         messages: CoreMessage[];
-        uiMessages: Message[];
+        uiMessages: AiMessageType[];
     }>;
-    rememberMessages({ threadId, vectorMessageSearch, config, }: {
+    rememberMessages({ threadId, resourceId, vectorMessageSearch, config, }: {
         threadId: string;
+        resourceId?: string;
         vectorMessageSearch?: string;
         config?: MemoryConfig;
     }): Promise<{
+        threadId: string;
         messages: CoreMessage[];
-        uiMessages: Message[];
+        uiMessages: AiMessageType[];
     }>;
     getThreadById({ threadId }: {
         threadId: string;

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

@@ -1,8 +1,8 @@
+import type { AiMessageType } from '@mastra/core';
 import type { CoreMessage } from '@mastra/core';
 import type { CoreTool } from '@mastra/core';
 import { MastraMemory } from '@mastra/core/memory';
 import type { MemoryConfig } from '@mastra/core/memory';
-import type { Message } from 'ai';
 import type { MessageType } from '@mastra/core/memory';
 import type { SharedMemoryConfig } from '@mastra/core/memory';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
@@ -14,17 +14,20 @@ import type { StorageThreadType } from '@mastra/core/memory';
  */
 export declare class Memory extends MastraMemory {
     constructor(config?: SharedMemoryConfig);
-    query({ threadId, selectBy, threadConfig, }: StorageGetMessagesArg): Promise<{
+    private validateThreadIsOwnedByResource;
+    query({ threadId, resourceId, selectBy, threadConfig, }: StorageGetMessagesArg): Promise<{
         messages: CoreMessage[];
-        uiMessages: Message[];
+        uiMessages: AiMessageType[];
     }>;
-    rememberMessages({ threadId, vectorMessageSearch, config, }: {
+    rememberMessages({ threadId, resourceId, vectorMessageSearch, config, }: {
         threadId: string;
+        resourceId?: string;
         vectorMessageSearch?: string;
         config?: MemoryConfig;
     }): Promise<{
+        threadId: string;
         messages: CoreMessage[];
-        uiMessages: Message[];
+        uiMessages: AiMessageType[];
     }>;
     getThreadById({ threadId }: {
         threadId: string;

package/dist/index.cjs

@@ -2,8 +2,8 @@
 
 var core = require('@mastra/core');
 var memory = require('@mastra/core/memory');
-var zod = require('zod');
 var ai = require('ai');
+var zod = require('zod');
 
 // src/index.ts
 var updateWorkingMemoryTool = {
@@ -11,7 +11,7 @@ var updateWorkingMemoryTool = {
   parameters: zod.z.object({
     memory: zod.z.string().describe("The XML-formatted working memory content to store")
   }),
-  execute: async (params, _options) => {
+  execute: async (params) => {
     const { context, threadId, memory } = params;
     if (!threadId || !memory) {
       throw new Error("Thread ID and Memory instance are required for working memory updates");
@@ -32,6 +32,8 @@ var updateWorkingMemoryTool = {
     return { success: true };
   }
 };
+
+// src/index.ts
 var Memory = class extends memory.MastraMemory {
   constructor(config = {}) {
     super({ name: "Memory", ...config });
@@ -43,11 +45,24 @@ var Memory = class extends memory.MastraMemory {
     });
     this.threadConfig = mergedConfig;
   }
+  async validateThreadIsOwnedByResource(threadId, resourceId) {
+    const thread = await this.storage.getThreadById({ threadId });
+    if (!thread) {
+      throw new Error(`No thread found with id ${threadId}`);
+    }
+    if (thread.resourceId !== resourceId) {
+      throw new Error(
+        `Thread with id ${threadId} is for resource with id ${thread.resourceId} but resource ${resourceId} was queried.`
+      );
+    }
+  }
   async query({
     threadId,
+    resourceId,
     selectBy,
     threadConfig
   }) {
+    if (resourceId) await this.validateThreadIsOwnedByResource(threadId, resourceId);
     let vectorResults = null;
     this.logger.debug(`Memory query() with:`, {
       threadId,
@@ -97,14 +112,17 @@ var Memory = class extends memory.MastraMemory {
   }
   async rememberMessages({
     threadId,
+    resourceId,
     vectorMessageSearch,
     config
   }) {
+    if (resourceId) await this.validateThreadIsOwnedByResource(threadId, resourceId);
     const threadConfig = this.getMergedThreadConfig(config || {});
     if (!threadConfig.lastMessages && !threadConfig.semanticRecall) {
       return {
         messages: [],
-        uiMessages: []
+        uiMessages: [],
+        threadId
       };
     }
     const messages = await this.query({
@@ -116,7 +134,11 @@ var Memory = class extends memory.MastraMemory {
       threadConfig: config
     });
     this.logger.debug(`Remembered message history includes ${messages.messages.length} messages.`);
-    return messages;
+    return {
+      threadId,
+      messages: messages.messages,
+      uiMessages: messages.uiMessages
+    };
   }
   async getThreadById({ threadId }) {
     return this.storage.__getThreadById({ threadId });

package/dist/index.js

@@ -1,7 +1,7 @@
 import { deepMerge } from '@mastra/core';
 import { MastraMemory } from '@mastra/core/memory';
-import { z } from 'zod';
 import { embed } from 'ai';
+import { z } from 'zod';
 
 // src/index.ts
 var updateWorkingMemoryTool = {
@@ -9,7 +9,7 @@ var updateWorkingMemoryTool = {
   parameters: z.object({
     memory: z.string().describe("The XML-formatted working memory content to store")
   }),
-  execute: async (params, _options) => {
+  execute: async (params) => {
     const { context, threadId, memory } = params;
     if (!threadId || !memory) {
       throw new Error("Thread ID and Memory instance are required for working memory updates");
@@ -30,6 +30,8 @@ var updateWorkingMemoryTool = {
     return { success: true };
   }
 };
+
+// src/index.ts
 var Memory = class extends MastraMemory {
   constructor(config = {}) {
     super({ name: "Memory", ...config });
@@ -41,11 +43,24 @@ var Memory = class extends MastraMemory {
     });
     this.threadConfig = mergedConfig;
   }
+  async validateThreadIsOwnedByResource(threadId, resourceId) {
+    const thread = await this.storage.getThreadById({ threadId });
+    if (!thread) {
+      throw new Error(`No thread found with id ${threadId}`);
+    }
+    if (thread.resourceId !== resourceId) {
+      throw new Error(
+        `Thread with id ${threadId} is for resource with id ${thread.resourceId} but resource ${resourceId} was queried.`
+      );
+    }
+  }
   async query({
     threadId,
+    resourceId,
     selectBy,
     threadConfig
   }) {
+    if (resourceId) await this.validateThreadIsOwnedByResource(threadId, resourceId);
     let vectorResults = null;
     this.logger.debug(`Memory query() with:`, {
       threadId,
@@ -95,14 +110,17 @@ var Memory = class extends MastraMemory {
   }
   async rememberMessages({
     threadId,
+    resourceId,
     vectorMessageSearch,
     config
   }) {
+    if (resourceId) await this.validateThreadIsOwnedByResource(threadId, resourceId);
     const threadConfig = this.getMergedThreadConfig(config || {});
     if (!threadConfig.lastMessages && !threadConfig.semanticRecall) {
       return {
         messages: [],
-        uiMessages: []
+        uiMessages: [],
+        threadId
       };
     }
     const messages = await this.query({
@@ -114,7 +132,11 @@ var Memory = class extends MastraMemory {
       threadConfig: config
     });
     this.logger.debug(`Remembered message history includes ${messages.messages.length} messages.`);
-    return messages;
+    return {
+      threadId,
+      messages: messages.messages,
+      uiMessages: messages.uiMessages
+    };
   }
   async getThreadById({ threadId }) {
     return this.storage.__getThreadById({ threadId });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/memory",
-  "version": "0.2.0-alpha.0",
+  "version": "0.2.0-alpha.10",
   "description": "",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,7 +49,7 @@
     "postgres": "^3.4.5",
     "redis": "^4.7.0",
     "zod": "^3.24.1",
-    "@mastra/core": "^0.5.0-alpha.0"
+    "@mastra/core": "^0.5.0-alpha.10"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.49.2",

package/src/index.ts

@@ -1,11 +1,10 @@
 import { deepMerge } from '@mastra/core';
-import type { CoreMessage, CoreTool } from '@mastra/core';
+import type { AiMessageType, CoreMessage, CoreTool } from '@mastra/core';
 import { MastraMemory } from '@mastra/core/memory';
 import type { MessageType, MemoryConfig, SharedMemoryConfig, StorageThreadType } from '@mastra/core/memory';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
-import { updateWorkingMemoryTool } from './tools/working-memory';
 import { embed } from 'ai';
-import type { Message as AiMessage } from 'ai';
+import { updateWorkingMemoryTool } from './tools/working-memory';
 
 /**
  * Concrete implementation of MastraMemory that adds support for thread configuration
@@ -24,11 +23,26 @@ export class Memory extends MastraMemory {
     this.threadConfig = mergedConfig;
   }
 
+  private async validateThreadIsOwnedByResource(threadId: string, resourceId: string) {
+    const thread = await this.storage.getThreadById({ threadId });
+    if (!thread) {
+      throw new Error(`No thread found with id ${threadId}`);
+    }
+    if (thread.resourceId !== resourceId) {
+      throw new Error(
+        `Thread with id ${threadId} is for resource with id ${thread.resourceId} but resource ${resourceId} was queried.`,
+      );
+    }
+  }
+
   async query({
     threadId,
+    resourceId,
     selectBy,
     threadConfig,
-  }: StorageGetMessagesArg): Promise<{ messages: CoreMessage[]; uiMessages: AiMessage[] }> {
+  }: StorageGetMessagesArg): Promise<{ messages: CoreMessage[]; uiMessages: AiMessageType[] }> {
+    if (resourceId) await this.validateThreadIsOwnedByResource(threadId, resourceId);
+
     let vectorResults:
       | null
       | {
@@ -108,20 +122,29 @@ export class Memory extends MastraMemory {
 
   async rememberMessages({
     threadId,
+    resourceId,
     vectorMessageSearch,
     config,
   }: {
     threadId: string;
+    resourceId?: string;
     vectorMessageSearch?: string;
     config?: MemoryConfig;
-  }) {
+  }): Promise<{
+    threadId: string;
+    messages: CoreMessage[];
+    uiMessages: AiMessageType[];
+  }> {
+    if (resourceId) await this.validateThreadIsOwnedByResource(threadId, resourceId);
+
     const threadConfig = this.getMergedThreadConfig(config || {});
 
     if (!threadConfig.lastMessages && !threadConfig.semanticRecall) {
       return {
         messages: [],
         uiMessages: [],
-      } satisfies Awaited<ReturnType<typeof this.query>>;
+        threadId,
+      };
     }
 
     const messages = await this.query({
@@ -134,7 +157,11 @@ export class Memory extends MastraMemory {
     });
 
     this.logger.debug(`Remembered message history includes ${messages.messages.length} messages.`);
-    return messages;
+    return {
+      threadId,
+      messages: messages.messages,
+      uiMessages: messages.uiMessages,
+    };
   }
 
   async getThreadById({ threadId }: { threadId: string }): Promise<StorageThreadType | null> {

package/src/tools/working-memory.ts

@@ -1,5 +1,4 @@
 import type { CoreTool } from '@mastra/core';
-import type { ToolExecutionOptions } from 'ai';
 import { z } from 'zod';
 
 export const updateWorkingMemoryTool: CoreTool = {
@@ -7,7 +6,7 @@ export const updateWorkingMemoryTool: CoreTool = {
   parameters: z.object({
     memory: z.string().describe('The XML-formatted working memory content to store'),
   }),
-  execute: async (params: any, _options: ToolExecutionOptions) => {
+  execute: async (params: any) => {
     const { context, threadId, memory } = params;
     if (!threadId || !memory) {
       throw new Error('Thread ID and Memory instance are required for working memory updates');