@mastra/pg 1.20.0-alpha.1 → 1.20.0-alpha.2

package/dist/index.js

@@ -1,5 +1,5 @@
 import { ErrorCategory, ErrorDomain, MastraError } from "@mastra/core/error";
-import { AgentsStorage, BRANCH_SPAN_TYPES, BackgroundTasksStorage, BlobStore, ChannelsStorage, DATASETS_SCHEMA, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, DatasetsStorage, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, EntityType, ExperimentsStorage, FactoryStorage, FavoritesStorage, MCPClientsStorage, MCPServersStorage, METRIC_DISTINCT_COLUMNS, MastraCompositeStore, MemoryStorage, NotificationsStorage, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, ObservabilityStorage, PromptBlocksStorage, SchedulesStorage, ScorerDefinitionsStorage, ScoresStorage, SkillsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, TABLE_BACKGROUND_TASKS, TABLE_CHANNEL_CONFIG, TABLE_CHANNEL_INSTALLATIONS, TABLE_CONFIGS, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, TABLE_FAVORITES, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, TABLE_MESSAGES, TABLE_NOTIFICATIONS, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, TABLE_RESOURCES, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, TABLE_SCHEMAS, TABLE_SCORERS, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, TABLE_SKILLS, TABLE_SKILL_BLOBS, TABLE_SKILL_VERSIONS, TABLE_SPANS, TABLE_THREADS, TABLE_TOOL_PROVIDER_CONNECTIONS, TABLE_WORKFLOW_DEFINITIONS, TABLE_WORKFLOW_SNAPSHOT, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, ToolProviderConnectionsStorage, TraceStatus, UniqueViolationError, WorkflowDefinitionsStorage, WorkflowsStorage, WorkspacesStorage, calculatePagination, createStorageErrorId, createVectorErrorId, ensureDate, getDefaultValue, getSqlType, hasErrorCode, listBranchesArgsSchema, listFeedbackArgsSchema, listLogsArgsSchema, listMetricsArgsSchema, listScoresArgsSchema, listTracesArgsSchema, mergeWorkflowStepResult, normalizePerPage, normalizeScheduleTarget, parseDuration, safelyParseJSON, storageMessageMatchesMetadataFilter, toTraceSpans, transformScoreRow, validateStorageMetadataFilter } from "@mastra/core/storage";
+import { AgentsStorage, BRANCH_SPAN_TYPES, BackgroundTasksStorage, BlobStore, ChannelsStorage, DATASETS_SCHEMA, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, DatasetsStorage, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, EntityType, ExperimentsStorage, FactoryStorage, FavoritesStorage, MCPClientsStorage, MCPServersStorage, METRIC_DISTINCT_COLUMNS, MastraCompositeStore, MemoryStorage, NotificationsStorage, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, ObservabilityStorage, PromptBlocksStorage, SchedulesStorage, ScorerDefinitionsStorage, ScoresStorage, SkillsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, TABLE_BACKGROUND_TASKS, TABLE_CHANNEL_CONFIG, TABLE_CHANNEL_INSTALLATIONS, TABLE_CONFIGS, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, TABLE_FAVORITES, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, TABLE_MESSAGES, TABLE_NOTIFICATIONS, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, TABLE_RESOURCES, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, TABLE_SCHEMAS, TABLE_SCORERS, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, TABLE_SKILLS, TABLE_SKILL_BLOBS, TABLE_SKILL_VERSIONS, TABLE_SPANS, TABLE_THREADS, TABLE_THREAD_STATE, TABLE_TOOL_PROVIDER_CONNECTIONS, TABLE_WORKFLOW_DEFINITIONS, TABLE_WORKFLOW_SNAPSHOT, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, ThreadStateStorage, ToolProviderConnectionsStorage, TraceStatus, UniqueViolationError, WorkflowDefinitionsStorage, WorkflowsStorage, WorkspacesStorage, calculatePagination, createStorageErrorId, createVectorErrorId, ensureDate, getDefaultValue, getSqlType, hasErrorCode, listBranchesArgsSchema, listFeedbackArgsSchema, listLogsArgsSchema, listMetricsArgsSchema, listScoresArgsSchema, listTracesArgsSchema, mergeWorkflowStepResult, normalizePerPage, normalizeScheduleTarget, parseDuration, safelyParseJSON, storageMessageMatchesMetadataFilter, toTraceSpans, transformScoreRow, validateStorageMetadataFilter } from "@mastra/core/storage";
 import { parseFieldKey, parseSqlIdentifier } from "@mastra/core/utils";
 import { MastraVector, validateTopK, validateUpsertInput } from "@mastra/core/vector";
 import { Mutex } from "async-mutex";
@@ -9283,7 +9283,13 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
 		});
 	}
-	async _getIncludedMessages({ include }) {
+	/**
+	* Fetches included messages by ID, discovering their thread automatically.
+	* This handles cross-thread includes where the include item doesn't specify a threadId.
+	* When a resourceId is given, both the target lookup and the surrounding window stay
+	* inside that resource, so an include never leaks another resource's messages.
+	*/
+	async _getIncludedMessages({ include, resourceId }) {
 		if (!include || include.length === 0) return null;
 		const tableName = getTableName$3({
 			indexName: TABLE_MESSAGES,
@@ -9293,7 +9299,8 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 		const targetIds = include.map((inc) => inc.id).filter(Boolean);
 		if (targetIds.length === 0) return null;
 		const idPlaceholders = targetIds.map((_, i) => "$" + (i + 1)).join(", ");
-		const targetRows = await this.#db.client.manyOrNone(`SELECT id, thread_id, "createdAt" FROM ${tableName} WHERE id IN (${idPlaceholders})`, targetIds);
+		const targetResourceCondition = resourceId ? ` AND "resourceId" = $${targetIds.length + 1}` : "";
+		const targetRows = await this.#db.client.manyOrNone(`SELECT id, thread_id, "createdAt" FROM ${tableName} WHERE id IN (${idPlaceholders})${targetResourceCondition}`, resourceId ? [...targetIds, resourceId] : targetIds);
 		if (targetRows.length === 0) return null;
 		const targetMap = new Map(targetRows.map((r) => [r.id, {
 			threadId: r.thread_id,
@@ -9301,7 +9308,12 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 		}]));
 		const unionQueries = [];
 		const params = [];
-		let paramIdx = 1;
+		let resourceCondition = "";
+		if (resourceId) {
+			params.push(resourceId);
+			resourceCondition = ` AND m."resourceId" = $1`;
+		}
+		let paramIdx = params.length + 1;
 		for (const inc of include) {
 			const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
 			const target = targetMap.get(id);
@@ -9313,7 +9325,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
         SELECT ${selectColumns}
         FROM ${tableName} m
         WHERE m.thread_id = ${p1}
-          AND m."createdAt" <= ${p2}
+          AND m."createdAt" <= ${p2}${resourceCondition}
         ORDER BY m."createdAt" DESC, m.id DESC
         LIMIT ${p3}
       )`);
@@ -9327,7 +9339,7 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
           SELECT ${selectColumns}
           FROM ${tableName} m
           WHERE m.thread_id = ${p4}
-            AND m."createdAt" > ${p5}
+            AND m."createdAt" > ${p5}${resourceCondition}
           ORDER BY m."createdAt" ASC, m.id ASC
           LIMIT ${p6}
         )`);
@@ -9477,7 +9489,10 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				if (!includeMessages || includeMessages.length === 0) return {
 					messages: [],
 					total: 0,
@@ -9496,7 +9511,10 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				};
 			}
 			let includeFailure;
-			const includePromise = include && include.length > 0 ? this._getIncludedMessages({ include }).catch((error) => {
+			const includePromise = include && include.length > 0 ? this._getIncludedMessages({
+				include,
+				resourceId
+			}).catch((error) => {
 				includeFailure = error;
 				return null;
 			}) : null;
@@ -9617,7 +9635,10 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				hasMore: false
 			};
 			if (perPage === 0 && include && include.length > 0) {
-				const includeMessages = await this._getIncludedMessages({ include });
+				const includeMessages = await this._getIncludedMessages({
+					include,
+					resourceId
+				});
 				if (!includeMessages || includeMessages.length === 0) return {
 					messages: [],
 					total: 0,
@@ -9636,7 +9657,10 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				};
 			}
 			let includeFailure;
-			const includePromise = include && include.length > 0 ? this._getIncludedMessages({ include }).catch((error) => {
+			const includePromise = include && include.length > 0 ? this._getIncludedMessages({
+				include,
+				resourceId
+			}).catch((error) => {
 				includeFailure = error;
 				return null;
 			}) : null;
@@ -18664,6 +18688,171 @@ var SkillsPG = class SkillsPG extends SkillsStorage {
 	}
 };
 //#endregion
+//#region src/storage/domains/thread-state/index.ts
+const COMPOSITE_PRIMARY_KEY = ["threadId", "type"];
+/**
+* PostgreSQL implementation of {@link ThreadStateStorage}.
+*
+* Stores per-thread, per-type state in `mastra_thread_state`, keyed by the
+* composite primary key `(threadId, type)`. The `value` column is `jsonb`, so
+* payloads (the task list for `type = 'task'`, the goal objective for
+* `type = 'goal'`) come back already parsed.
+*/
+var ThreadStatePG = class ThreadStatePG extends ThreadStateStorage {
+	#db;
+	#schema;
+	static MANAGED_TABLES = [TABLE_THREAD_STATE];
+	/**
+	* `thread_state` grows as a side effect of thread activity (one row per
+	* thread per state type). It anchors on `updatedAtZ` (last activity), so
+	* state for a thread that is still being written to is not pruned by
+	* creation age.
+	*/
+	static retentionTables = { threadState: {
+		table: TABLE_THREAD_STATE,
+		column: "updatedAtZ",
+		indexed: true
+	} };
+	constructor(config) {
+		super();
+		const { client, schemaName, skipDefaultIndexes } = resolvePgConfig(config);
+		this.#db = new PgDB({
+			client,
+			schemaName,
+			skipDefaultIndexes
+		});
+		this.#schema = schemaName || "public";
+	}
+	static getExportDDL(schemaName) {
+		return [generateTableSQL({
+			tableName: TABLE_THREAD_STATE,
+			schema: TABLE_SCHEMAS[TABLE_THREAD_STATE],
+			schemaName,
+			compositePrimaryKey: COMPOSITE_PRIMARY_KEY,
+			includeAllConstraints: true
+		})];
+	}
+	async init() {
+		await this.#db.createTable({
+			tableName: TABLE_THREAD_STATE,
+			schema: TABLE_SCHEMAS[TABLE_THREAD_STATE],
+			compositePrimaryKey: COMPOSITE_PRIMARY_KEY
+		});
+	}
+	get #table() {
+		return getTableName$5({
+			indexName: TABLE_THREAD_STATE,
+			schemaName: getSchemaName$5(this.#schema)
+		});
+	}
+	/**
+	* Create the retention index on demand, mirroring the other PG domains: only
+	* deployments that configure retention pay for the extra index. Best-effort —
+	* a failure here leaves pruning correct, just slower.
+	*/
+	async #ensureRetentionIndexes(policies) {
+		const prefix = this.#schema && this.#schema !== "public" ? `${this.#schema}_` : "";
+		for (const [key, entry] of Object.entries(ThreadStatePG.retentionTables)) {
+			if (!entry.indexed || !policies[key]) continue;
+			try {
+				await this.#db.ensureIndex({
+					indexName: `${prefix}mastra_${key}_retention_idx`,
+					tableName: entry.table,
+					column: entry.column
+				});
+			} catch (error) {
+				this.logger?.warn?.(`Failed to create retention index for ${entry.table}:`, error);
+			}
+		}
+	}
+	/** Delete thread state older than the `threadState` policy's `maxAge`, batched. */
+	async prune(policies, options) {
+		await this.#ensureRetentionIndexes(policies);
+		const targets = resolveTargets({
+			policies,
+			descriptor: ThreadStatePG.retentionTables,
+			order: ["threadState"]
+		});
+		return runPrune({
+			db: this.#db,
+			domain: "threadState",
+			targets,
+			options
+		});
+	}
+	async dangerouslyClearAll() {
+		try {
+			await this.#db.client.none(`DELETE FROM ${this.#table}`);
+		} catch (error) {
+			throw new MastraError({
+				id: createStorageErrorId("PG", "THREAD_STATE_CLEAR_ALL", "FAILED"),
+				domain: ErrorDomain.STORAGE,
+				category: ErrorCategory.THIRD_PARTY
+			}, error);
+		}
+	}
+	async getState({ threadId, type }) {
+		try {
+			const row = await this.#db.client.oneOrNone(`SELECT "value" FROM ${this.#table} WHERE "threadId" = $1 AND "type" = $2 LIMIT 1`, [threadId, type]);
+			if (!row || row.value === null || row.value === void 0) return void 0;
+			return typeof row.value === "string" ? JSON.parse(row.value) : row.value;
+		} catch (error) {
+			throw new MastraError({
+				id: createStorageErrorId("PG", "THREAD_STATE_GET", "FAILED"),
+				domain: ErrorDomain.STORAGE,
+				category: ErrorCategory.THIRD_PARTY,
+				details: {
+					threadId,
+					type
+				}
+			}, error);
+		}
+	}
+	async setState({ threadId, type, value }) {
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const serialized = JSON.stringify(value ?? null);
+		try {
+			await this.#db.client.none(`INSERT INTO ${this.#table} ("threadId", "type", "value", "createdAt", "createdAtZ", "updatedAt", "updatedAtZ")
+         VALUES ($1, $2, $3::jsonb, $4::timestamp, $5::timestamptz, $4::timestamp, $5::timestamptz)
+         ON CONFLICT ("threadId", "type")
+         DO UPDATE SET "value" = EXCLUDED."value",
+                       "updatedAt" = EXCLUDED."updatedAt",
+                       "updatedAtZ" = EXCLUDED."updatedAtZ"`, [
+				threadId,
+				type,
+				serialized,
+				now,
+				now
+			]);
+		} catch (error) {
+			throw new MastraError({
+				id: createStorageErrorId("PG", "THREAD_STATE_SET", "FAILED"),
+				domain: ErrorDomain.STORAGE,
+				category: ErrorCategory.THIRD_PARTY,
+				details: {
+					threadId,
+					type
+				}
+			}, error);
+		}
+	}
+	async deleteState({ threadId, type }) {
+		try {
+			await this.#db.client.none(`DELETE FROM ${this.#table} WHERE "threadId" = $1 AND "type" = $2`, [threadId, type]);
+		} catch (error) {
+			throw new MastraError({
+				id: createStorageErrorId("PG", "THREAD_STATE_DELETE", "FAILED"),
+				domain: ErrorDomain.STORAGE,
+				category: ErrorCategory.THIRD_PARTY,
+				details: {
+					threadId,
+					type
+				}
+			}, error);
+		}
+	}
+};
+//#endregion
 //#region src/storage/domains/tool-provider-connections/index.ts
 function normaliseScope(raw) {
 	const value = raw == null ? "per-author" : String(raw);
@@ -20598,7 +20787,8 @@ const ALL_DOMAINS = [
 	BackgroundTasksPG,
 	FavoritesPG,
 	ChannelsPG,
-	SchedulesPG
+	SchedulesPG,
+	ThreadStatePG
 ];
 /**
 * Exports the Mastra database schema as SQL DDL statements, including tables, indexes, and triggers.
@@ -20692,7 +20882,8 @@ var PostgresStore = class extends MastraCompositeStore {
 				experiments: new ExperimentsPG(domainConfig),
 				backgroundTasks: new BackgroundTasksPG(domainConfig),
 				channels: new ChannelsPG(domainConfig),
-				schedules: new SchedulesPG(domainConfig)
+				schedules: new SchedulesPG(domainConfig),
+				threadState: new ThreadStatePG(domainConfig)
 			};
 		} catch (e) {
 			throw new MastraError({
@@ -20999,6 +21190,6 @@ Example Complex Query:
   ]
 }`;
 //#endregion
-export { AgentsPG, BackgroundTasksPG, BlobsPG, ChannelsPG, DatasetsPG, ExperimentsPG, FavoritesPG, MCPClientsPG, MCPServersPG, MemoryPG, NotificationsPG, ObservabilityPG, ObservabilityStoragePostgresVNext, PGVECTOR_PROMPT, PgFactoryStorage, PgVector, PoolAdapter, PostgresStore, PostgresStoreVNext, PromptBlocksPG, SchedulesPG, ScorerDefinitionsPG, ScoresPG, SkillsPG, ToolProviderConnectionsPG, WorkflowDefinitionsPG, WorkflowsPG, WorkspacesPG, exportSchemas };
+export { AgentsPG, BackgroundTasksPG, BlobsPG, ChannelsPG, DatasetsPG, ExperimentsPG, FavoritesPG, MCPClientsPG, MCPServersPG, MemoryPG, NotificationsPG, ObservabilityPG, ObservabilityStoragePostgresVNext, PGVECTOR_PROMPT, PgFactoryStorage, PgVector, PoolAdapter, PostgresStore, PostgresStoreVNext, PromptBlocksPG, SchedulesPG, ScorerDefinitionsPG, ScoresPG, SkillsPG, ThreadStatePG, ToolProviderConnectionsPG, WorkflowDefinitionsPG, WorkflowsPG, WorkspacesPG, exportSchemas };
 
 //# sourceMappingURL=index.js.map