@mastra/pg 0.11.1-alpha.1 → 0.12.0-alpha.3

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/pg@0.11.1-alpha.1 build /home/runner/work/mastra/mastra/stores/pg
+> @mastra/pg@0.12.0-alpha.3 build /home/runner/work/mastra/mastra/stores/pg
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.0
 TSC Build start
-TSC ⚡️ Build success in 10897ms
+TSC ⚡️ Build success in 11837ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/pg/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/pg/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 11697ms
+DTS ⚡️ Build success in 12951ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 83.06 KB
-ESM ⚡️ Build success in 1628ms
-CJS dist/index.cjs 84.43 KB
-CJS ⚡️ Build success in 1628ms
+ESM dist/index.js 86.23 KB
+ESM ⚡️ Build success in 1680ms
+CJS dist/index.cjs 87.61 KB
+CJS ⚡️ Build success in 1680ms

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @mastra/pg
 
+## 0.12.0-alpha.3
+
+### Minor Changes
+
+- 8a3bfd2: Update peerdeps to latest core
+
+### Patch Changes
+
+- Updated dependencies [792c4c0]
+- Updated dependencies [502fe05]
+- Updated dependencies [4efcfa0]
+  - @mastra/core@0.10.7-alpha.3
+
+## 0.11.1-alpha.2
+
+### Patch Changes
+
+- 15e9d26: Added per-resource working memory for LibSQL, Upstash, and PG
+- 0fb9d64: [MASTRA-4018] Update saveMessages in storage adapters to upsert messages
+- 144eb0b: [MASTRA-3669] Metadata Filter Types
+- f0150c4: Fix LibSQLStore and PgStore getMessagesPaginated implementation
+- Updated dependencies [15e9d26]
+- Updated dependencies [07d6d88]
+- Updated dependencies [5d74aab]
+- Updated dependencies [144eb0b]
+  - @mastra/core@0.10.7-alpha.2
+
 ## 0.11.1-alpha.1
 
 ### Patch Changes

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

@@ -1,4 +1,5 @@
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
+import type { BlacklistedRootOperators } from '@mastra/core/vector/filter';
 import type { CreateIndexParams } from '@mastra/core/vector';
 import type { DeleteIndexParams } from '@mastra/core/vector';
 import type { DeleteVectorParams } from '@mastra/core/vector';
@@ -6,12 +7,14 @@ import type { DescribeIndexParams } from '@mastra/core/vector';
 import type { EvalRow } from '@mastra/core/storage';
 import type { IndexStats } from '@mastra/core/vector';
 import type { ISSLConfig } from 'pg-promise/typescript/pg-subset';
+import type { LogicalOperatorValueMap } from '@mastra/core/vector/filter';
 import type { MastraMessageContentV2 } from '@mastra/core/agent';
 import type { MastraMessageV1 } from '@mastra/core/memory';
 import type { MastraMessageV2 } from '@mastra/core/agent';
 import { MastraStorage } from '@mastra/core/storage';
 import { MastraVector } from '@mastra/core/vector';
 import type { OperatorSupport } from '@mastra/core/vector/filter';
+import type { OperatorValueMap } from '@mastra/core/vector/filter';
 import type { PaginationArgs } from '@mastra/core/storage';
 import type { PaginationInfo } from '@mastra/core/storage';
 import pg from 'pg';
@@ -19,10 +22,12 @@ import type { QueryResult } from '@mastra/core/vector';
 import type { QueryVectorParams } from '@mastra/core/vector';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
+import type { StorageResourceType } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
 import type { TABLE_NAMES } from '@mastra/core/storage';
 import type { UpdateVectorParams } from '@mastra/core/vector';
 import type { UpsertVectorParams } from '@mastra/core/vector';
+import type { VectorFieldValue } from '@mastra/core/vector/filter';
 import type { VectorFilter } from '@mastra/core/vector/filter';
 import type { WorkflowRun } from '@mastra/core/storage';
 import type { WorkflowRuns } from '@mastra/core/storage';
@@ -61,7 +66,7 @@ export declare const baseTestConfigs: {
     }[];
 };
 
-export declare function buildFilterQuery(filter: VectorFilter, minScore: number, topK: number): FilterResult;
+export declare function buildFilterQuery(filter: PGVectorFilter, minScore: number, topK: number): FilterResult;
 
 export declare const calculateRecall: (actual: number[], expected: number[], k: number) => number;
 
@@ -126,6 +131,8 @@ declare interface IVFConfig {
 
 export declare function measureLatency<T>(fn: () => Promise<T>): Promise<[number, T]>;
 
+declare type PGBlacklisted = BlacklistedRootOperators | '$contains' | '$size';
+
 declare interface PgCreateIndexParams extends CreateIndexParams {
     indexConfig?: IndexConfig;
     buildIndex?: boolean;
@@ -147,13 +154,15 @@ declare interface PgDefineIndexParams {
  * - Can take either a single condition or an array of conditions
  *
  */
-export declare class PGFilterTranslator extends BaseFilterTranslator {
+export declare class PGFilterTranslator extends BaseFilterTranslator<PGVectorFilter> {
     protected getSupportedOperators(): OperatorSupport;
-    translate(filter?: VectorFilter): VectorFilter;
+    translate(filter?: PGVectorFilter): PGVectorFilter;
     private translateNode;
     private translateRegexPattern;
 }
 
+declare type PGFilterValue = VectorFieldValue | RegExp;
+
 declare interface PGIndexStats extends IndexStats {
     type: IndexType;
     config: {
@@ -166,7 +175,17 @@ declare interface PGIndexStats extends IndexStats {
 export { PGIndexStats }
 export { PGIndexStats as PGIndexStats_alias_1 }
 
-declare interface PgQueryVectorParams extends QueryVectorParams {
+declare type PGOperatorValueMap = Omit<OperatorValueMap, '$in' | '$all' | '$nin' | '$eq' | '$ne'> & {
+    $size: number;
+    $contains: VectorFieldValue | Record<string, unknown>;
+    $all: VectorFieldValue;
+    $in: VectorFieldValue;
+    $nin: VectorFieldValue;
+    $eq: VectorFieldValue;
+    $ne: VectorFieldValue;
+};
+
+declare interface PgQueryVectorParams extends QueryVectorParams<PGVectorFilter> {
     minScore?: number;
     /**
      * HNSW search parameter. Controls the size of the dynamic candidate
@@ -180,7 +199,7 @@ declare interface PgQueryVectorParams extends QueryVectorParams {
     probes?: number;
 }
 
-declare class PgVector extends MastraVector {
+declare class PgVector extends MastraVector<PGVectorFilter> {
     private pool;
     private describeIndexCache;
     private createdIndexes;
@@ -198,7 +217,7 @@ declare class PgVector extends MastraVector {
     private getMutexByName;
     private getTableName;
     private getSchemaName;
-    transformFilter(filter?: VectorFilter): VectorFilter;
+    transformFilter(filter?: PGVectorFilter): PGVectorFilter;
     getIndexInfo({ indexName }: DescribeIndexParams): Promise<PGIndexStats>;
     query({ indexName, queryVector, topK, filter, includeVector, minScore, ef, probes, }: PgQueryVectorParams): Promise<QueryResult[]>;
     upsert({ indexName, vectors, metadata, ids }: UpsertVectorParams): Promise<string[]>;
@@ -252,6 +271,8 @@ declare const PGVECTOR_PROMPT = "When querying PG Vector, you can ONLY use the o
 export { PGVECTOR_PROMPT }
 export { PGVECTOR_PROMPT as PGVECTOR_PROMPT_alias_1 }
 
+export declare type PGVectorFilter = VectorFilter<keyof PGOperatorValueMap, PGOperatorValueMap, LogicalOperatorValueMap, PGBlacklisted, PGFilterValue>;
+
 declare type PostgresConfig = {
     schemaName?: string;
 } & ({
@@ -276,6 +297,7 @@ declare class PostgresStore extends MastraStorage {
     constructor(config: PostgresConfig);
     get supports(): {
         selectByIncludeResourceScope: boolean;
+        resourceWorkingMemory: boolean;
     };
     private getTableName;
     private getSchemaName;
@@ -422,6 +444,17 @@ declare class PostgresStore extends MastraStorage {
             };
         })[];
     }): Promise<MastraMessageV2[]>;
+    getResourceById({ resourceId }: {
+        resourceId: string;
+    }): Promise<StorageResourceType | null>;
+    saveResource({ resource }: {
+        resource: StorageResourceType;
+    }): Promise<StorageResourceType>;
+    updateResource({ resourceId, workingMemory, metadata, }: {
+        resourceId: string;
+        workingMemory?: string;
+        metadata?: Record<string, unknown>;
+    }): Promise<StorageResourceType>;
 }
 export { PostgresStore }
 export { PostgresStore as PostgresStore_alias_1 }

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

@@ -1,4 +1,5 @@
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
+import type { BlacklistedRootOperators } from '@mastra/core/vector/filter';
 import type { CreateIndexParams } from '@mastra/core/vector';
 import type { DeleteIndexParams } from '@mastra/core/vector';
 import type { DeleteVectorParams } from '@mastra/core/vector';
@@ -6,12 +7,14 @@ import type { DescribeIndexParams } from '@mastra/core/vector';
 import type { EvalRow } from '@mastra/core/storage';
 import type { IndexStats } from '@mastra/core/vector';
 import type { ISSLConfig } from 'pg-promise/typescript/pg-subset';
+import type { LogicalOperatorValueMap } from '@mastra/core/vector/filter';
 import type { MastraMessageContentV2 } from '@mastra/core/agent';
 import type { MastraMessageV1 } from '@mastra/core/memory';
 import type { MastraMessageV2 } from '@mastra/core/agent';
 import { MastraStorage } from '@mastra/core/storage';
 import { MastraVector } from '@mastra/core/vector';
 import type { OperatorSupport } from '@mastra/core/vector/filter';
+import type { OperatorValueMap } from '@mastra/core/vector/filter';
 import type { PaginationArgs } from '@mastra/core/storage';
 import type { PaginationInfo } from '@mastra/core/storage';
 import pg from 'pg';
@@ -19,10 +22,12 @@ import type { QueryResult } from '@mastra/core/vector';
 import type { QueryVectorParams } from '@mastra/core/vector';
 import type { StorageColumn } from '@mastra/core/storage';
 import type { StorageGetMessagesArg } from '@mastra/core/storage';
+import type { StorageResourceType } from '@mastra/core/storage';
 import type { StorageThreadType } from '@mastra/core/memory';
 import type { TABLE_NAMES } from '@mastra/core/storage';
 import type { UpdateVectorParams } from '@mastra/core/vector';
 import type { UpsertVectorParams } from '@mastra/core/vector';
+import type { VectorFieldValue } from '@mastra/core/vector/filter';
 import type { VectorFilter } from '@mastra/core/vector/filter';
 import type { WorkflowRun } from '@mastra/core/storage';
 import type { WorkflowRuns } from '@mastra/core/storage';
@@ -61,7 +66,7 @@ export declare const baseTestConfigs: {
     }[];
 };
 
-export declare function buildFilterQuery(filter: VectorFilter, minScore: number, topK: number): FilterResult;
+export declare function buildFilterQuery(filter: PGVectorFilter, minScore: number, topK: number): FilterResult;
 
 export declare const calculateRecall: (actual: number[], expected: number[], k: number) => number;
 
@@ -126,6 +131,8 @@ declare interface IVFConfig {
 
 export declare function measureLatency<T>(fn: () => Promise<T>): Promise<[number, T]>;
 
+declare type PGBlacklisted = BlacklistedRootOperators | '$contains' | '$size';
+
 declare interface PgCreateIndexParams extends CreateIndexParams {
     indexConfig?: IndexConfig;
     buildIndex?: boolean;
@@ -147,13 +154,15 @@ declare interface PgDefineIndexParams {
  * - Can take either a single condition or an array of conditions
  *
  */
-export declare class PGFilterTranslator extends BaseFilterTranslator {
+export declare class PGFilterTranslator extends BaseFilterTranslator<PGVectorFilter> {
     protected getSupportedOperators(): OperatorSupport;
-    translate(filter?: VectorFilter): VectorFilter;
+    translate(filter?: PGVectorFilter): PGVectorFilter;
     private translateNode;
     private translateRegexPattern;
 }
 
+declare type PGFilterValue = VectorFieldValue | RegExp;
+
 declare interface PGIndexStats extends IndexStats {
     type: IndexType;
     config: {
@@ -166,7 +175,17 @@ declare interface PGIndexStats extends IndexStats {
 export { PGIndexStats }
 export { PGIndexStats as PGIndexStats_alias_1 }
 
-declare interface PgQueryVectorParams extends QueryVectorParams {
+declare type PGOperatorValueMap = Omit<OperatorValueMap, '$in' | '$all' | '$nin' | '$eq' | '$ne'> & {
+    $size: number;
+    $contains: VectorFieldValue | Record<string, unknown>;
+    $all: VectorFieldValue;
+    $in: VectorFieldValue;
+    $nin: VectorFieldValue;
+    $eq: VectorFieldValue;
+    $ne: VectorFieldValue;
+};
+
+declare interface PgQueryVectorParams extends QueryVectorParams<PGVectorFilter> {
     minScore?: number;
     /**
      * HNSW search parameter. Controls the size of the dynamic candidate
@@ -180,7 +199,7 @@ declare interface PgQueryVectorParams extends QueryVectorParams {
     probes?: number;
 }
 
-declare class PgVector extends MastraVector {
+declare class PgVector extends MastraVector<PGVectorFilter> {
     private pool;
     private describeIndexCache;
     private createdIndexes;
@@ -198,7 +217,7 @@ declare class PgVector extends MastraVector {
     private getMutexByName;
     private getTableName;
     private getSchemaName;
-    transformFilter(filter?: VectorFilter): VectorFilter;
+    transformFilter(filter?: PGVectorFilter): PGVectorFilter;
     getIndexInfo({ indexName }: DescribeIndexParams): Promise<PGIndexStats>;
     query({ indexName, queryVector, topK, filter, includeVector, minScore, ef, probes, }: PgQueryVectorParams): Promise<QueryResult[]>;
     upsert({ indexName, vectors, metadata, ids }: UpsertVectorParams): Promise<string[]>;
@@ -252,6 +271,8 @@ declare const PGVECTOR_PROMPT = "When querying PG Vector, you can ONLY use the o
 export { PGVECTOR_PROMPT }
 export { PGVECTOR_PROMPT as PGVECTOR_PROMPT_alias_1 }
 
+export declare type PGVectorFilter = VectorFilter<keyof PGOperatorValueMap, PGOperatorValueMap, LogicalOperatorValueMap, PGBlacklisted, PGFilterValue>;
+
 declare type PostgresConfig = {
     schemaName?: string;
 } & ({
@@ -276,6 +297,7 @@ declare class PostgresStore extends MastraStorage {
     constructor(config: PostgresConfig);
     get supports(): {
         selectByIncludeResourceScope: boolean;
+        resourceWorkingMemory: boolean;
     };
     private getTableName;
     private getSchemaName;
@@ -422,6 +444,17 @@ declare class PostgresStore extends MastraStorage {
             };
         })[];
     }): Promise<MastraMessageV2[]>;
+    getResourceById({ resourceId }: {
+        resourceId: string;
+    }): Promise<StorageResourceType | null>;
+    saveResource({ resource }: {
+        resource: StorageResourceType;
+    }): Promise<StorageResourceType>;
+    updateResource({ resourceId, workingMemory, metadata, }: {
+        resourceId: string;
+        workingMemory?: string;
+        metadata?: Record<string, unknown>;
+    }): Promise<StorageResourceType>;
 }
 export { PostgresStore }
 export { PostgresStore as PostgresStore_alias_1 }

package/dist/index.cjs

@@ -45,10 +45,10 @@ var PGFilterTranslator = class extends filter.BaseFilterTranslator {
     }
     const entries = Object.entries(node);
     const result = {};
-    if ("$options" in node && !("$regex" in node)) {
+    if (node && "$options" in node && !("$regex" in node)) {
       throw new Error("$options is not valid without $regex");
     }
-    if ("$regex" in node) {
+    if (node && "$regex" in node) {
       const options = node.$options || "";
       return withPath(this.translateRegexPattern(node.$regex, options));
     }
@@ -1154,7 +1154,8 @@ var PostgresStore = class extends storage.MastraStorage {
   }
   get supports() {
     return {
-      selectByIncludeResourceScope: true
+      selectByIncludeResourceScope: true,
+      resourceWorkingMemory: true
     };
   }
   getTableName(indexName) {
@@ -1919,7 +1920,7 @@ var PostgresStore = class extends storage.MastraStorage {
       }
     }
     try {
-      const perPage = perPageInput !== void 0 ? perPageInput : 40;
+      const perPage = perPageInput !== void 0 ? perPageInput : this.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
       const currentOffset = page * perPage;
       const conditions = [`thread_id = $1`];
       const queryParams = [threadId];
@@ -1936,7 +1937,7 @@ var PostgresStore = class extends storage.MastraStorage {
       const countQuery = `SELECT COUNT(*) FROM ${this.getTableName(storage.TABLE_MESSAGES)} ${whereClause}`;
       const countResult = await this.db.one(countQuery, queryParams);
       const total = parseInt(countResult.count, 10);
-      if (total === 0) {
+      if (total === 0 && messages.length === 0) {
         return {
           messages: [],
           total: 0,
@@ -1945,10 +1946,13 @@ var PostgresStore = class extends storage.MastraStorage {
           hasMore: false
         };
       }
+      const excludeIds = messages.map((m) => m.id);
+      const excludeIdsParam = excludeIds.map((_, idx) => `$${idx + paramIndex}`).join(", ");
+      paramIndex += excludeIds.length;
       const dataQuery = `${selectStatement} FROM ${this.getTableName(
         storage.TABLE_MESSAGES
-      )} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
-      const rows = await this.db.manyOrNone(dataQuery, [...queryParams, perPage, currentOffset]);
+      )} ${whereClause} ${excludeIds.length ? `AND id NOT IN (${excludeIdsParam})` : ""}${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
+      const rows = await this.db.manyOrNone(dataQuery, [...queryParams, ...excludeIds, perPage, currentOffset]);
       messages.push(...rows || []);
       const list = new agent.MessageList().add(messages, "memory");
       const messagesToReturn = format === `v2` ? list.get.all.v2() : list.get.all.v1();
@@ -2018,7 +2022,13 @@ var PostgresStore = class extends storage.MastraStorage {
           }
           return t.none(
             `INSERT INTO ${this.getTableName(storage.TABLE_MESSAGES)} (id, thread_id, content, "createdAt", role, type, "resourceId") 
-             VALUES ($1, $2, $3, $4, $5, $6, $7)`,
+             VALUES ($1, $2, $3, $4, $5, $6, $7)
+             ON CONFLICT (id) DO UPDATE SET
+              thread_id = EXCLUDED.thread_id,
+              content = EXCLUDED.content,
+              role = EXCLUDED.role,
+              type = EXCLUDED.type,
+              "resourceId" = EXCLUDED."resourceId"`,
             [
               message.id,
               message.threadId,
@@ -2431,6 +2441,82 @@ var PostgresStore = class extends storage.MastraStorage {
       return message;
     });
   }
+  async getResourceById({ resourceId }) {
+    const tableName = this.getTableName(storage.TABLE_RESOURCES);
+    const result = await this.db.oneOrNone(`SELECT * FROM ${tableName} WHERE id = $1`, [
+      resourceId
+    ]);
+    if (!result) {
+      return null;
+    }
+    return {
+      ...result,
+      // Ensure workingMemory is always returned as a string, regardless of automatic parsing
+      workingMemory: typeof result.workingMemory === "object" ? JSON.stringify(result.workingMemory) : result.workingMemory,
+      metadata: typeof result.metadata === "string" ? JSON.parse(result.metadata) : result.metadata
+    };
+  }
+  async saveResource({ resource }) {
+    const tableName = this.getTableName(storage.TABLE_RESOURCES);
+    await this.db.none(
+      `INSERT INTO ${tableName} (id, "workingMemory", metadata, "createdAt", "updatedAt") 
+       VALUES ($1, $2, $3, $4, $5)`,
+      [
+        resource.id,
+        resource.workingMemory,
+        JSON.stringify(resource.metadata),
+        resource.createdAt.toISOString(),
+        resource.updatedAt.toISOString()
+      ]
+    );
+    return resource;
+  }
+  async updateResource({
+    resourceId,
+    workingMemory,
+    metadata
+  }) {
+    const existingResource = await this.getResourceById({ resourceId });
+    if (!existingResource) {
+      const newResource = {
+        id: resourceId,
+        workingMemory,
+        metadata: metadata || {},
+        createdAt: /* @__PURE__ */ new Date(),
+        updatedAt: /* @__PURE__ */ new Date()
+      };
+      return this.saveResource({ resource: newResource });
+    }
+    const updatedResource = {
+      ...existingResource,
+      workingMemory: workingMemory !== void 0 ? workingMemory : existingResource.workingMemory,
+      metadata: {
+        ...existingResource.metadata,
+        ...metadata
+      },
+      updatedAt: /* @__PURE__ */ new Date()
+    };
+    const tableName = this.getTableName(storage.TABLE_RESOURCES);
+    const updates = [];
+    const values = [];
+    let paramIndex = 1;
+    if (workingMemory !== void 0) {
+      updates.push(`"workingMemory" = $${paramIndex}`);
+      values.push(workingMemory);
+      paramIndex++;
+    }
+    if (metadata) {
+      updates.push(`metadata = $${paramIndex}`);
+      values.push(JSON.stringify(updatedResource.metadata));
+      paramIndex++;
+    }
+    updates.push(`"updatedAt" = $${paramIndex}`);
+    values.push(updatedResource.updatedAt.toISOString());
+    paramIndex++;
+    values.push(resourceId);
+    await this.db.none(`UPDATE ${tableName} SET ${updates.join(", ")} WHERE id = $${paramIndex}`, values);
+    return updatedResource;
+  }
 };
 
 // src/vector/prompt.ts

package/dist/index.js

@@ -6,7 +6,7 @@ import pg from 'pg';
 import xxhash from 'xxhash-wasm';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
 import { MessageList } from '@mastra/core/agent';
-import { MastraStorage, TABLE_EVALS, TABLE_TRACES, TABLE_WORKFLOW_SNAPSHOT, TABLE_THREADS, TABLE_MESSAGES } from '@mastra/core/storage';
+import { MastraStorage, TABLE_EVALS, TABLE_TRACES, TABLE_WORKFLOW_SNAPSHOT, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES } from '@mastra/core/storage';
 import pgPromise from 'pg-promise';
 
 // src/vector/index.ts
@@ -37,10 +37,10 @@ var PGFilterTranslator = class extends BaseFilterTranslator {
     }
     const entries = Object.entries(node);
     const result = {};
-    if ("$options" in node && !("$regex" in node)) {
+    if (node && "$options" in node && !("$regex" in node)) {
       throw new Error("$options is not valid without $regex");
     }
-    if ("$regex" in node) {
+    if (node && "$regex" in node) {
       const options = node.$options || "";
       return withPath(this.translateRegexPattern(node.$regex, options));
     }
@@ -1146,7 +1146,8 @@ var PostgresStore = class extends MastraStorage {
   }
   get supports() {
     return {
-      selectByIncludeResourceScope: true
+      selectByIncludeResourceScope: true,
+      resourceWorkingMemory: true
     };
   }
   getTableName(indexName) {
@@ -1911,7 +1912,7 @@ var PostgresStore = class extends MastraStorage {
       }
     }
     try {
-      const perPage = perPageInput !== void 0 ? perPageInput : 40;
+      const perPage = perPageInput !== void 0 ? perPageInput : this.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
       const currentOffset = page * perPage;
       const conditions = [`thread_id = $1`];
       const queryParams = [threadId];
@@ -1928,7 +1929,7 @@ var PostgresStore = class extends MastraStorage {
       const countQuery = `SELECT COUNT(*) FROM ${this.getTableName(TABLE_MESSAGES)} ${whereClause}`;
       const countResult = await this.db.one(countQuery, queryParams);
       const total = parseInt(countResult.count, 10);
-      if (total === 0) {
+      if (total === 0 && messages.length === 0) {
         return {
           messages: [],
           total: 0,
@@ -1937,10 +1938,13 @@ var PostgresStore = class extends MastraStorage {
           hasMore: false
         };
       }
+      const excludeIds = messages.map((m) => m.id);
+      const excludeIdsParam = excludeIds.map((_, idx) => `$${idx + paramIndex}`).join(", ");
+      paramIndex += excludeIds.length;
       const dataQuery = `${selectStatement} FROM ${this.getTableName(
         TABLE_MESSAGES
-      )} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
-      const rows = await this.db.manyOrNone(dataQuery, [...queryParams, perPage, currentOffset]);
+      )} ${whereClause} ${excludeIds.length ? `AND id NOT IN (${excludeIdsParam})` : ""}${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
+      const rows = await this.db.manyOrNone(dataQuery, [...queryParams, ...excludeIds, perPage, currentOffset]);
       messages.push(...rows || []);
       const list = new MessageList().add(messages, "memory");
       const messagesToReturn = format === `v2` ? list.get.all.v2() : list.get.all.v1();
@@ -2010,7 +2014,13 @@ var PostgresStore = class extends MastraStorage {
           }
           return t.none(
             `INSERT INTO ${this.getTableName(TABLE_MESSAGES)} (id, thread_id, content, "createdAt", role, type, "resourceId") 
-             VALUES ($1, $2, $3, $4, $5, $6, $7)`,
+             VALUES ($1, $2, $3, $4, $5, $6, $7)
+             ON CONFLICT (id) DO UPDATE SET
+              thread_id = EXCLUDED.thread_id,
+              content = EXCLUDED.content,
+              role = EXCLUDED.role,
+              type = EXCLUDED.type,
+              "resourceId" = EXCLUDED."resourceId"`,
             [
               message.id,
               message.threadId,
@@ -2423,6 +2433,82 @@ var PostgresStore = class extends MastraStorage {
       return message;
     });
   }
+  async getResourceById({ resourceId }) {
+    const tableName = this.getTableName(TABLE_RESOURCES);
+    const result = await this.db.oneOrNone(`SELECT * FROM ${tableName} WHERE id = $1`, [
+      resourceId
+    ]);
+    if (!result) {
+      return null;
+    }
+    return {
+      ...result,
+      // Ensure workingMemory is always returned as a string, regardless of automatic parsing
+      workingMemory: typeof result.workingMemory === "object" ? JSON.stringify(result.workingMemory) : result.workingMemory,
+      metadata: typeof result.metadata === "string" ? JSON.parse(result.metadata) : result.metadata
+    };
+  }
+  async saveResource({ resource }) {
+    const tableName = this.getTableName(TABLE_RESOURCES);
+    await this.db.none(
+      `INSERT INTO ${tableName} (id, "workingMemory", metadata, "createdAt", "updatedAt") 
+       VALUES ($1, $2, $3, $4, $5)`,
+      [
+        resource.id,
+        resource.workingMemory,
+        JSON.stringify(resource.metadata),
+        resource.createdAt.toISOString(),
+        resource.updatedAt.toISOString()
+      ]
+    );
+    return resource;
+  }
+  async updateResource({
+    resourceId,
+    workingMemory,
+    metadata
+  }) {
+    const existingResource = await this.getResourceById({ resourceId });
+    if (!existingResource) {
+      const newResource = {
+        id: resourceId,
+        workingMemory,
+        metadata: metadata || {},
+        createdAt: /* @__PURE__ */ new Date(),
+        updatedAt: /* @__PURE__ */ new Date()
+      };
+      return this.saveResource({ resource: newResource });
+    }
+    const updatedResource = {
+      ...existingResource,
+      workingMemory: workingMemory !== void 0 ? workingMemory : existingResource.workingMemory,
+      metadata: {
+        ...existingResource.metadata,
+        ...metadata
+      },
+      updatedAt: /* @__PURE__ */ new Date()
+    };
+    const tableName = this.getTableName(TABLE_RESOURCES);
+    const updates = [];
+    const values = [];
+    let paramIndex = 1;
+    if (workingMemory !== void 0) {
+      updates.push(`"workingMemory" = $${paramIndex}`);
+      values.push(workingMemory);
+      paramIndex++;
+    }
+    if (metadata) {
+      updates.push(`metadata = $${paramIndex}`);
+      values.push(JSON.stringify(updatedResource.metadata));
+      paramIndex++;
+    }
+    updates.push(`"updatedAt" = $${paramIndex}`);
+    values.push(updatedResource.updatedAt.toISOString());
+    paramIndex++;
+    values.push(resourceId);
+    await this.db.none(`UPDATE ${tableName} SET ${updates.join(", ")} WHERE id = $${paramIndex}`, values);
+    return updatedResource;
+  }
 };
 
 // src/vector/prompt.ts