@mastra/pg 1.27.0-alpha.0 → 1.27.0-alpha.2

package/dist/index.cjs

@@ -39,6 +39,7 @@ let _mastra_core_agent = require("@mastra/core/agent");
 let _mastra_core_features = require("@mastra/core/features");
 let _mastra_core_evals = require("@mastra/core/evals");
 let _mastra_core_storage_domains_skills = require("@mastra/core/storage/domains/skills");
+let util = require("util");
 //#region src/shared/config.ts
 /**
 * Type guard for pre-configured pg.Pool config
@@ -2432,6 +2433,29 @@ function isDuplicateSchemaError(error) {
 	return /schema .* already exists/i.test(message);
 }
 //#endregion
+//#region src/storage/db/sanitize-json.ts
+const repair = (value) => value.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "�").replaceAll("\0", "");
+function repairJson(value) {
+	if (typeof value === "string") return repair(value);
+	if (Array.isArray(value)) return value.map(repairJson);
+	if (value && typeof value === "object") {
+		const repaired = Object.create(null);
+		for (const [key, entry] of Object.entries(value)) {
+			const repairedKey = repair(key);
+			if (Object.hasOwn(repaired, repairedKey)) throw new Error(`JSON keys collide after PostgreSQL normalization: ${repairedKey}`);
+			repaired[repairedKey] = repairJson(entry);
+		}
+		return repaired;
+	}
+	return value;
+}
+/** Serialize JSON values without emitting Unicode sequences PostgreSQL rejects. */
+function toPgJson(value) {
+	const json = JSON.stringify(value);
+	if (json === void 0 || !/\\u(?:0000|[dD][89a-fA-F][0-9a-fA-F]{2})/.test(json)) return json;
+	return JSON.stringify(repairJson(JSON.parse(json)));
+}
+//#endregion
 //#region src/storage/db/schema-snapshot.ts
 /**
 * Returns the snapshot currently installed on `client`, but only when it was
@@ -2956,7 +2980,7 @@ var PgDB = class extends _mastra_core_base.MastraBase {
 	*/
 	prepareValuesForInsert(record, tableName) {
 		return Object.entries(record).map(([key, value]) => {
-			if ((_mastra_core_storage.TABLE_SCHEMAS[tableName]?.[key])?.type === "jsonb" && value !== null && value !== void 0) return JSON.stringify(value);
+			if ((_mastra_core_storage.TABLE_SCHEMAS[tableName]?.[key])?.type === "jsonb" && value !== null && value !== void 0) return toPgJson(value);
 			return value;
 		});
 	}
@@ -2974,8 +2998,8 @@ var PgDB = class extends _mastra_core_base.MastraBase {
 	prepareValue(value, columnName, tableName) {
 		if (value === null || value === void 0) return value;
 		if (value instanceof Date) return value.toISOString();
-		if ((_mastra_core_storage.TABLE_SCHEMAS[tableName]?.[columnName])?.type === "jsonb") return JSON.stringify(value);
-		if (typeof value === "object") return JSON.stringify(value);
+		if ((_mastra_core_storage.TABLE_SCHEMAS[tableName]?.[columnName])?.type === "jsonb") return toPgJson(value);
+		if (typeof value === "object") return toPgJson(value);
 		return value;
 	}
 	async setupSchema() {
@@ -4229,7 +4253,7 @@ var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
 				"published",
 				versionId,
 				row.ownerId ?? row.authorId ?? null,
-				row.metadata ? JSON.stringify(row.metadata) : null,
+				row.metadata ? toPgJson(row.metadata) : null,
 				row.createdAt ?? now,
 				row.updatedAt ?? now
 			]);
@@ -4245,17 +4269,17 @@ var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
 				row.name ?? agentId,
 				row.description ?? null,
 				this.serializeInstructions(row.instructions ?? ""),
-				row.model ? JSON.stringify(row.model) : "{}",
-				row.tools ? JSON.stringify(row.tools) : null,
-				row.defaultOptions ? JSON.stringify(row.defaultOptions) : null,
-				row.workflows ? JSON.stringify(row.workflows) : null,
-				row.agents ? JSON.stringify(row.agents) : null,
-				row.integrationTools ? JSON.stringify(row.integrationTools) : null,
-				row.toolProviders ? JSON.stringify(row.toolProviders) : null,
-				row.inputProcessors ? JSON.stringify(row.inputProcessors) : null,
-				row.outputProcessors ? JSON.stringify(row.outputProcessors) : null,
-				row.memory ? JSON.stringify(row.memory) : null,
-				row.scorers ? JSON.stringify(row.scorers) : null,
+				row.model ? toPgJson(row.model) : "{}",
+				row.tools ? toPgJson(row.tools) : null,
+				row.defaultOptions ? toPgJson(row.defaultOptions) : null,
+				row.workflows ? toPgJson(row.workflows) : null,
+				row.agents ? toPgJson(row.agents) : null,
+				row.integrationTools ? toPgJson(row.integrationTools) : null,
+				row.toolProviders ? toPgJson(row.toolProviders) : null,
+				row.inputProcessors ? toPgJson(row.inputProcessors) : null,
+				row.outputProcessors ? toPgJson(row.outputProcessors) : null,
+				row.memory ? toPgJson(row.memory) : null,
+				row.scorers ? toPgJson(row.scorers) : null,
 				null,
 				"Migrated from legacy schema",
 				row.createdAt ?? now
@@ -4305,7 +4329,7 @@ var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
 				for (const toolKey of toolsArray) toolsObject[toolKey] = {};
 				await this.#db.client.none(`UPDATE ${fullVersionsTableName} 
            SET tools = $1::jsonb 
-           WHERE id = $2`, [JSON.stringify(toolsObject), record.id]);
+           WHERE id = $2`, [toPgJson(toolsObject), record.id]);
 			}
 			this.logger?.info?.(`Migrated ${recordsWithArrayTools.length} agent version(s) tools from array to object format`);
 		} catch (error) {
@@ -4402,6 +4426,7 @@ var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
 			const now = /* @__PURE__ */ new Date();
 			const nowIso = now.toISOString();
 			const visibility = agent.visibility ?? (agent.authorId ? "private" : null);
+			const metadataJson = agent.metadata ? toPgJson(agent.metadata) : null;
 			await this.#db.client.none(`INSERT INTO ${agentsTable} (
           id, status, "authorId", visibility, metadata, "favoriteCount",
           "activeVersionId",
@@ -4411,7 +4436,7 @@ var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
 				"draft",
 				agent.authorId ?? null,
 				visibility,
-				agent.metadata ? JSON.stringify(agent.metadata) : null,
+				metadataJson,
 				0,
 				null,
 				nowIso,
@@ -4435,7 +4460,7 @@ var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
 				activeVersionId: void 0,
 				authorId: agent.authorId,
 				visibility: visibility ?? void 0,
-				metadata: agent.metadata,
+				metadata: metadataJson ? JSON.parse(metadataJson) : agent.metadata,
 				favoriteCount: 0,
 				createdAt: now,
 				updatedAt: now
@@ -4493,7 +4518,7 @@ var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
 			}
 			if (metadata !== void 0) {
 				setClauses.push(`metadata = $${paramIndex++}`);
-				values.push(JSON.stringify(metadata));
+				values.push(toPgJson(metadata));
 			}
 			const now = (/* @__PURE__ */ new Date()).toISOString();
 			setClauses.push(`"updatedAt" = $${paramIndex++}`);
@@ -4587,7 +4612,7 @@ var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
 			}
 			if (metadata && Object.keys(metadata).length > 0) {
 				conditions.push(`a.metadata @> $${paramIdx++}::jsonb`);
-				queryParams.push(JSON.stringify(metadata));
+				queryParams.push(toPgJson(metadata));
 			}
 			if (entityIds && entityIds.length > 0) {
 				const placeholders = entityIds.map(() => `$${paramIdx++}`).join(", ");
@@ -4653,9 +4678,8 @@ var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
 				indexName: _mastra_core_storage.TABLE_AGENT_VERSIONS,
 				schemaName: getSchemaName$5(this.#schema)
 			});
-			const now = /* @__PURE__ */ new Date();
-			const nowIso = now.toISOString();
-			await this.#db.client.none(`INSERT INTO ${tableName} (
+			const nowIso = (/* @__PURE__ */ new Date()).toISOString();
+			const row = await this.#db.client.one(`INSERT INTO ${tableName} (
           id, "agentId", "versionNumber",
           name, description, instructions, model, tools,
           "defaultOptions", workflows, agents, "integrationTools", "toolProviders",
@@ -4664,40 +4688,37 @@ var AgentsPG = class AgentsPG extends _mastra_core_storage.AgentsStorage {
           durable, browser,
           "changedFields", "changeMessage",
           "createdAt", "createdAtZ"
-        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28)`, [
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27, $28) RETURNING *`, [
 				input.id,
 				input.agentId,
 				input.versionNumber,
 				input.name,
 				input.description ?? null,
 				this.serializeInstructions(input.instructions),
-				JSON.stringify(input.model),
-				input.tools ? JSON.stringify(input.tools) : null,
-				input.defaultOptions ? JSON.stringify(input.defaultOptions) : null,
-				input.workflows ? JSON.stringify(input.workflows) : null,
-				input.agents ? JSON.stringify(input.agents) : null,
-				input.integrationTools ? JSON.stringify(input.integrationTools) : null,
-				input.toolProviders ? JSON.stringify(input.toolProviders) : null,
-				input.inputProcessors ? JSON.stringify(input.inputProcessors) : null,
-				input.outputProcessors ? JSON.stringify(input.outputProcessors) : null,
-				input.memory ? JSON.stringify(input.memory) : null,
-				input.scorers ? JSON.stringify(input.scorers) : null,
-				input.mcpClients ? JSON.stringify(input.mcpClients) : null,
-				input.requestContextSchema ? JSON.stringify(input.requestContextSchema) : null,
-				input.workspace ? JSON.stringify(input.workspace) : null,
-				input.skills ? JSON.stringify(input.skills) : null,
+				toPgJson(input.model),
+				input.tools ? toPgJson(input.tools) : null,
+				input.defaultOptions ? toPgJson(input.defaultOptions) : null,
+				input.workflows ? toPgJson(input.workflows) : null,
+				input.agents ? toPgJson(input.agents) : null,
+				input.integrationTools ? toPgJson(input.integrationTools) : null,
+				input.toolProviders ? toPgJson(input.toolProviders) : null,
+				input.inputProcessors ? toPgJson(input.inputProcessors) : null,
+				input.outputProcessors ? toPgJson(input.outputProcessors) : null,
+				input.memory ? toPgJson(input.memory) : null,
+				input.scorers ? toPgJson(input.scorers) : null,
+				input.mcpClients ? toPgJson(input.mcpClients) : null,
+				input.requestContextSchema ? toPgJson(input.requestContextSchema) : null,
+				input.workspace ? toPgJson(input.workspace) : null,
+				input.skills ? toPgJson(input.skills) : null,
 				input.skillsFormat ?? null,
-				input.durable !== void 0 ? JSON.stringify(input.durable) : null,
-				input.browser ? JSON.stringify(input.browser) : null,
-				input.changedFields ? JSON.stringify(input.changedFields) : null,
+				input.durable !== void 0 ? toPgJson(input.durable) : null,
+				input.browser ? toPgJson(input.browser) : null,
+				input.changedFields ? toPgJson(input.changedFields) : null,
 				input.changeMessage ?? null,
 				nowIso,
 				nowIso
 			]);
-			return {
-				...input,
-				createdAt: now
-			};
+			return this.parseVersionRow(row);
 		} catch (error) {
 			if (error instanceof _mastra_core_error.MastraError) throw error;
 			throw new _mastra_core_error.MastraError({
@@ -4981,7 +5002,7 @@ function getTableName$4(schemaName) {
 	return schemaName ? `${schemaName}.${quoted}` : quoted;
 }
 function serializeJson(v) {
-	if (typeof v === "object" && v != null) return JSON.stringify(v);
+	if (typeof v === "object" && v != null) return toPgJson(v);
 	return v ?? null;
 }
 function parseJson$2(v) {
@@ -5560,7 +5581,7 @@ var ChannelsPG = class ChannelsPG extends _mastra_core_storage.ChannelsStorage {
 			installation.agentId,
 			installation.status,
 			installation.webhookId ?? null,
-			JSON.stringify(installation.data),
+			toPgJson(installation.data),
 			installation.configHash ?? null,
 			installation.error ?? null,
 			createdAt,
@@ -5620,7 +5641,7 @@ var ChannelsPG = class ChannelsPG extends _mastra_core_storage.ChannelsStorage {
          "updatedAt" = EXCLUDED."updatedAt",
          "updatedAtZ" = EXCLUDED."updatedAtZ"`, [
 			config.platform,
-			JSON.stringify(config.data),
+			toPgJson(config.data),
 			now,
 			now
 		]);
@@ -5664,8 +5685,21 @@ var ChannelsPG = class ChannelsPG extends _mastra_core_storage.ChannelsStorage {
 //#region src/storage/domains/datasets/index.ts
 /** Serialize a value for a jsonb column. Returns null for null/undefined. */
 function jsonbArg(value) {
-	return value === void 0 || value === null ? null : JSON.stringify(value);
+	return value === void 0 || value === null ? null : toPgJson(value);
+}
+/** Preserve JSON null as data, rather than converting it to an absent SQL value. */
+function jsonDataArg(value) {
+	return value === void 0 ? null : JSON.stringify(value);
 }
+const ITEM_SELECT_COLUMNS = [
+	...Object.keys(_mastra_core_storage.DATASET_ITEMS_SCHEMA),
+	"createdAtZ",
+	"updatedAtZ"
+].map((column) => [
+	"input",
+	"groundTruth",
+	"expectedTrajectory"
+].includes(column) ? `"${column}"::text AS "${column}"` : `"${column}"`).join(", ");
 function parseStoredJSON(value) {
 	if (typeof value === "string") try {
 		return JSON.parse(value);
@@ -5840,9 +5874,9 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 			groundTruthSchema: row.groundTruthSchema ? (0, _mastra_core_storage.safelyParseJSON)(row.groundTruthSchema) : void 0,
 			requestContextSchema: row.requestContextSchema ? (0, _mastra_core_storage.safelyParseJSON)(row.requestContextSchema) : void 0,
 			tags: row.tags ? (0, _mastra_core_storage.safelyParseJSON)(row.tags) : void 0,
-			targetType: row.targetType || null,
-			targetIds: row.targetIds || null,
-			scorerIds: row.scorerIds || null,
+			targetType: row.targetType || void 0,
+			targetIds: row.targetIds ?? void 0,
+			scorerIds: row.scorerIds ?? void 0,
 			organizationId: row.organizationId ?? null,
 			projectId: row.projectId ?? null,
 			candidateKey: row.candidateKey ?? null,
@@ -5944,9 +5978,9 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 				inputSchema: input.inputSchema ?? void 0,
 				groundTruthSchema: input.groundTruthSchema ?? void 0,
 				requestContextSchema: input.requestContextSchema ?? void 0,
-				targetType: input.targetType ?? null,
-				targetIds: input.targetIds ?? null,
-				scorerIds: input.scorerIds ?? null,
+				targetType: input.targetType ?? void 0,
+				targetIds: input.targetIds ?? void 0,
+				scorerIds: input.scorerIds ?? void 0,
 				organizationId: input.organizationId ?? null,
 				projectId: input.projectId ?? null,
 				candidateKey: input.candidateKey ?? null,
@@ -6032,23 +6066,23 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 			}
 			if (args.metadata !== void 0) {
 				setClauses.push(`"metadata" = $${paramIndex++}`);
-				values.push(JSON.stringify(args.metadata));
+				values.push(toPgJson(args.metadata));
 			}
 			if (args.inputSchema !== void 0) {
 				setClauses.push(`"inputSchema" = $${paramIndex++}`);
-				values.push(args.inputSchema === null ? null : JSON.stringify(args.inputSchema));
+				values.push(args.inputSchema === null ? null : toPgJson(args.inputSchema));
 			}
 			if (args.groundTruthSchema !== void 0) {
 				setClauses.push(`"groundTruthSchema" = $${paramIndex++}`);
-				values.push(args.groundTruthSchema === null ? null : JSON.stringify(args.groundTruthSchema));
+				values.push(args.groundTruthSchema === null ? null : toPgJson(args.groundTruthSchema));
 			}
 			if (args.requestContextSchema !== void 0) {
 				setClauses.push(`"requestContextSchema" = $${paramIndex++}`);
-				values.push(args.requestContextSchema === null ? null : JSON.stringify(args.requestContextSchema));
+				values.push(args.requestContextSchema === null ? null : toPgJson(args.requestContextSchema));
 			}
 			if (args.tags !== void 0) {
 				setClauses.push(`"tags" = $${paramIndex++}`);
-				values.push(args.tags === null ? null : JSON.stringify(args.tags));
+				values.push(args.tags === null ? null : toPgJson(args.tags));
 			}
 			if (args.targetType !== void 0) {
 				setClauses.push(`"targetType" = $${paramIndex++}`);
@@ -6056,11 +6090,11 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 			}
 			if (args.targetIds !== void 0) {
 				setClauses.push(`"targetIds" = $${paramIndex++}`);
-				values.push(args.targetIds === null ? null : JSON.stringify(args.targetIds));
+				values.push(args.targetIds === null ? null : toPgJson(args.targetIds));
 			}
 			if (args.scorerIds !== void 0) {
 				setClauses.push(`"scorerIds" = $${paramIndex++}`);
-				values.push(args.scorerIds === null ? null : JSON.stringify(args.scorerIds));
+				values.push(args.scorerIds === null ? null : toPgJson(args.scorerIds));
 			}
 			values.push(args.id);
 			await this.#db.client.none(`UPDATE ${tableName} SET ${setClauses.join(", ")} WHERE "id" = $${paramIndex}`, values);
@@ -6073,9 +6107,9 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 				groundTruthSchema: (args.groundTruthSchema !== void 0 ? args.groundTruthSchema : existing.groundTruthSchema) ?? void 0,
 				requestContextSchema: (args.requestContextSchema !== void 0 ? args.requestContextSchema : existing.requestContextSchema) ?? void 0,
 				tags: (args.tags !== void 0 ? args.tags : existing.tags) ?? void 0,
-				targetType: (args.targetType !== void 0 ? args.targetType : existing.targetType) ?? null,
-				targetIds: (args.targetIds !== void 0 ? args.targetIds : existing.targetIds) ?? null,
-				scorerIds: (args.scorerIds !== void 0 ? args.scorerIds : existing.scorerIds) ?? null,
+				targetType: (args.targetType !== void 0 ? args.targetType : existing.targetType) ?? void 0,
+				targetIds: (args.targetIds !== void 0 ? args.targetIds : existing.targetIds) ?? void 0,
+				scorerIds: (args.scorerIds !== void 0 ? args.scorerIds : existing.scorerIds) ?? void 0,
 				organizationId: existing.organizationId ?? null,
 				projectId: existing.projectId ?? null,
 				candidateKey: existing.candidateKey ?? null,
@@ -6253,8 +6287,8 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 					parentOrganizationId,
 					parentProjectId,
 					JSON.stringify(args.input),
-					jsonbArg(args.groundTruth),
-					jsonbArg(args.expectedTrajectory),
+					jsonDataArg(args.groundTruth),
+					jsonDataArg(args.expectedTrajectory),
 					jsonbArg(args.toolMocks),
 					args.unmockedToolPolicy ?? null,
 					jsonbArg(args.scorerIds),
@@ -6370,8 +6404,8 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 					parentOrganizationId,
 					parentProjectId,
 					JSON.stringify(mergedInput),
-					jsonbArg(mergedGroundTruth),
-					jsonbArg(mergedExpectedTrajectory),
+					jsonDataArg(mergedGroundTruth),
+					jsonDataArg(mergedExpectedTrajectory),
 					jsonbArg(mergedToolMocks),
 					mergedUnmockedToolPolicy ?? null,
 					jsonbArg(mergedScorerIds),
@@ -6460,8 +6494,8 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 					parentOrganizationId,
 					parentProjectId,
 					JSON.stringify(existing.input),
-					jsonbArg(existing.groundTruth),
-					jsonbArg(existing.expectedTrajectory),
+					jsonDataArg(existing.groundTruth),
+					jsonDataArg(existing.expectedTrajectory),
 					jsonbArg(existing.toolMocks),
 					existing.unmockedToolPolicy ?? null,
 					jsonbArg(existing.scorerIds),
@@ -6508,10 +6542,9 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 				indexName: _mastra_core_storage.TABLE_EXPERIMENT_RESULTS,
 				schemaName: getSchemaName$5(this.#schema)
 			});
-			const purgedAt = (/* @__PURE__ */ new Date()).toISOString();
-			const purgedMetadata = JSON.stringify({
+			const purgedMetadata = toPgJson({
 				__purged: true,
-				purgedAt
+				purgedAt: (/* @__PURE__ */ new Date()).toISOString()
 			});
 			await this.#db.client.tx(async (t) => {
 				if (!await t.oneOrNone(`SELECT "id" FROM ${datasetsTable} WHERE "id" = $1 FOR UPDATE`, [datasetId])) return;
@@ -6561,7 +6594,7 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 					details: { datasetId: input.datasetId }
 				});
 				const externalIds = [...new Set(input.items.flatMap((item) => item.externalId ? [item.externalId] : []))];
-				const historyRows = externalIds.length ? await t.manyOrNone(`SELECT * FROM ${itemsTable} WHERE "datasetId" = $1 AND "externalId" = ANY($2::text[]) ORDER BY "datasetVersion"`, [input.datasetId, externalIds]) : [];
+				const historyRows = externalIds.length ? await t.manyOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${itemsTable} WHERE "datasetId" = $1 AND "externalId" = ANY($2::text[]) ORDER BY "datasetVersion"`, [input.datasetId, externalIds]) : [];
 				const plan = this.planDatasetItemBatch(input.items, historyRows.map((row) => this.transformItemRowFull(row)), () => crypto.randomUUID());
 				const resolved = new Map([...plan.existingCurrentItems].map(([id, row]) => [id, this.datasetItemFromRow(row)]));
 				if (plan.inserts.length > 0) {
@@ -6578,8 +6611,8 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 							dataset.organizationId ?? null,
 							dataset.projectId ?? null,
 							JSON.stringify(item.input),
-							jsonbArg(item.groundTruth),
-							jsonbArg(item.expectedTrajectory),
+							jsonDataArg(item.groundTruth),
+							jsonDataArg(item.expectedTrajectory),
 							jsonbArg(item.toolMocks),
 							item.unmockedToolPolicy ?? null,
 							jsonbArg(item.scorerIds),
@@ -6656,7 +6689,7 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 					category: _mastra_core_error.ErrorCategory.USER,
 					details: { datasetId: input.datasetId }
 				});
-				const currentItems = (await t.manyOrNone(`SELECT * FROM ${itemsTable} WHERE "id" = ANY($1::text[]) AND "datasetId" = $2 AND "validTo" IS NULL AND "isDeleted" = false`, [input.itemIds, input.datasetId])).map((row) => this.transformItemRow(row));
+				const currentItems = (await t.manyOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${itemsTable} WHERE "id" = ANY($1::text[]) AND "datasetId" = $2 AND "validTo" IS NULL AND "isDeleted" = false`, [input.itemIds, input.datasetId])).map((row) => this.transformItemRow(row));
 				if (currentItems.length === 0) return;
 				const parentOrganizationId = dataset.organizationId ?? null;
 				const parentProjectId = dataset.projectId ?? null;
@@ -6671,8 +6704,8 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 						parentOrganizationId,
 						parentProjectId,
 						JSON.stringify(item.input),
-						jsonbArg(item.groundTruth),
-						jsonbArg(item.expectedTrajectory),
+						jsonDataArg(item.groundTruth),
+						jsonDataArg(item.expectedTrajectory),
 						jsonbArg(item.toolMocks),
 						item.unmockedToolPolicy ?? null,
 						jsonbArg(item.scorerIds),
@@ -6712,8 +6745,8 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 				schemaName: getSchemaName$5(this.#schema)
 			});
 			let result;
-			if (args.datasetVersion !== void 0) result = await client.oneOrNone(`SELECT * FROM ${tableName} WHERE "id" = $1 AND "datasetVersion" <= $2 AND ("validTo" IS NULL OR "validTo" > $2) AND "isDeleted" = false ORDER BY "datasetVersion" DESC LIMIT 1`, [args.id, args.datasetVersion]);
-			else result = await client.oneOrNone(`SELECT * FROM ${tableName} WHERE "id" = $1 AND "validTo" IS NULL AND "isDeleted" = false`, [args.id]);
+			if (args.datasetVersion !== void 0) result = await client.oneOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableName} WHERE "id" = $1 AND "datasetVersion" <= $2 AND ("validTo" IS NULL OR "validTo" > $2) AND "isDeleted" = false ORDER BY "datasetVersion" DESC LIMIT 1`, [args.id, args.datasetVersion]);
+			else result = await client.oneOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableName} WHERE "id" = $1 AND "validTo" IS NULL AND "isDeleted" = false`, [args.id]);
 			return result ? this.transformItemRow(result) : null;
 		} catch (error) {
 			throw new _mastra_core_error.MastraError({
@@ -6729,7 +6762,7 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 				indexName: _mastra_core_storage.TABLE_DATASET_ITEMS,
 				schemaName: getSchemaName$5(this.#schema)
 			});
-			return (await this.#db.readClient.manyOrNone(`SELECT * FROM ${tableName} WHERE "datasetId" = $1 AND "datasetVersion" <= $2 AND ("validTo" IS NULL OR "validTo" > $3) AND "isDeleted" = false ORDER BY "createdAt" DESC, "id" ASC`, [
+			return (await this.#db.readClient.manyOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableName} WHERE "datasetId" = $1 AND "datasetVersion" <= $2 AND ("validTo" IS NULL OR "validTo" > $3) AND "isDeleted" = false ORDER BY "createdAt" DESC, "id" ASC`, [
 				datasetId,
 				version,
 				version
@@ -6748,7 +6781,7 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 				indexName: _mastra_core_storage.TABLE_DATASET_ITEMS,
 				schemaName: getSchemaName$5(this.#schema)
 			});
-			return (await this.#db.readClient.manyOrNone(`SELECT * FROM ${tableName} WHERE "id" = $1 ORDER BY "datasetVersion" DESC`, [itemId]) || []).map((row) => this.transformItemRowFull(row));
+			return (await this.#db.readClient.manyOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableName} WHERE "id" = $1 ORDER BY "datasetVersion" DESC`, [itemId]) || []).map((row) => this.transformItemRowFull(row));
 		} catch (error) {
 			throw new _mastra_core_error.MastraError({
 				id: (0, _mastra_core_storage.createStorageErrorId)("PG", "GET_ITEM_HISTORY", "FAILED"),
@@ -6820,7 +6853,7 @@ var DatasetsPG = class DatasetsPG extends _mastra_core_storage.DatasetsStorage {
 			const { offset, perPage: perPageForResponse } = (0, _mastra_core_storage.calculatePagination)(page, perPageInput, perPage);
 			const limitValue = perPageInput === false ? total : perPage;
 			return {
-				items: (await client.manyOrNone(`SELECT * FROM ${tableName} ${whereClause} ORDER BY "${orderBy.field}" ${orderBy.direction}, "id" ASC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`, [
+				items: (await client.manyOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableName} ${whereClause} ORDER BY "${orderBy.field}" ${orderBy.direction}, "id" ASC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`, [
 					...queryParams,
 					limitValue,
 					offset
@@ -7311,7 +7344,7 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 			}
 			if (input.metadata !== void 0) {
 				setClauses.push(`"metadata" = $${paramIndex++}`);
-				values.push(JSON.stringify(input.metadata));
+				values.push(toPgJson(input.metadata));
 			}
 			if (input.status !== void 0) {
 				setClauses.push(`"status" = $${paramIndex++}`);
@@ -7542,19 +7575,19 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 					input.itemDatasetVersion ?? null,
 					input.organizationId ?? null,
 					input.projectId ?? null,
-					JSON.stringify(purgeMetadata ? null : input.input),
-					purgeMetadata || input.output == null ? null : JSON.stringify(input.output),
-					purgeMetadata || input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
-					JSON.stringify(purgeMetadata ?? input.metadata ?? null),
-					purgeMetadata || input.error == null ? null : JSON.stringify(input.error),
+					toPgJson(purgeMetadata ? null : input.input),
+					purgeMetadata || input.output == null ? null : toPgJson(input.output),
+					purgeMetadata || input.groundTruth == null ? null : toPgJson(input.groundTruth),
+					toPgJson(purgeMetadata ?? input.metadata ?? null),
+					purgeMetadata || input.error == null ? null : toPgJson(input.error),
 					input.startedAt.toISOString(),
 					input.completedAt.toISOString(),
 					input.retryCount,
 					input.attempt ?? 0,
 					input.traceId ?? null,
 					input.status ?? null,
-					purgeMetadata || input.tags == null ? null : JSON.stringify(input.tags),
-					purgeMetadata || input.toolMockReport == null ? null : JSON.stringify(input.toolMockReport),
+					purgeMetadata || input.tags == null ? null : toPgJson(input.tags),
+					purgeMetadata || input.toolMockReport == null ? null : toPgJson(input.toolMockReport),
 					nowIso
 				]);
 			});
@@ -7600,19 +7633,19 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 						input.itemDatasetVersion ?? null,
 						input.organizationId ?? null,
 						input.projectId ?? null,
-						JSON.stringify(purgeMetadata ? null : input.input),
-						purgeMetadata || input.output == null ? null : JSON.stringify(input.output),
-						purgeMetadata || input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
-						JSON.stringify(purgeMetadata ?? input.metadata ?? null),
-						purgeMetadata || input.error == null ? null : JSON.stringify(input.error),
+						toPgJson(purgeMetadata ? null : input.input),
+						purgeMetadata || input.output == null ? null : toPgJson(input.output),
+						purgeMetadata || input.groundTruth == null ? null : toPgJson(input.groundTruth),
+						toPgJson(purgeMetadata ?? input.metadata ?? null),
+						purgeMetadata || input.error == null ? null : toPgJson(input.error),
 						input.startedAt.toISOString(),
 						input.completedAt.toISOString(),
 						input.retryCount,
 						attempt,
 						input.traceId ?? null,
 						input.status ?? null,
-						purgeMetadata || input.tags == null ? null : JSON.stringify(input.tags),
-						purgeMetadata || input.toolMockReport == null ? null : JSON.stringify(input.toolMockReport),
+						purgeMetadata || input.tags == null ? null : toPgJson(input.tags),
+						purgeMetadata || input.toolMockReport == null ? null : toPgJson(input.toolMockReport),
 						(/* @__PURE__ */ new Date()).toISOString()
 					]);
 				}
@@ -7626,19 +7659,19 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 					input.itemDatasetVersion ?? null,
 					input.organizationId ?? null,
 					input.projectId ?? null,
-					JSON.stringify(purgeMetadata ? null : input.input),
-					purgeMetadata || input.output == null ? null : JSON.stringify(input.output),
-					purgeMetadata || input.groundTruth == null ? null : JSON.stringify(input.groundTruth),
-					JSON.stringify(purgeMetadata ?? input.metadata ?? null),
-					purgeMetadata || input.error == null ? null : JSON.stringify(input.error),
+					toPgJson(purgeMetadata ? null : input.input),
+					purgeMetadata || input.output == null ? null : toPgJson(input.output),
+					purgeMetadata || input.groundTruth == null ? null : toPgJson(input.groundTruth),
+					toPgJson(purgeMetadata ?? input.metadata ?? null),
+					purgeMetadata || input.error == null ? null : toPgJson(input.error),
 					input.startedAt.toISOString(),
 					input.completedAt.toISOString(),
 					input.retryCount,
 					attempt,
 					input.traceId ?? null,
 					input.status ?? null,
-					purgeMetadata || input.tags == null ? null : JSON.stringify(input.tags),
-					purgeMetadata || input.toolMockReport == null ? null : JSON.stringify(input.toolMockReport)
+					purgeMetadata || input.tags == null ? null : toPgJson(input.tags),
+					purgeMetadata || input.toolMockReport == null ? null : toPgJson(input.toolMockReport)
 				]);
 			});
 			return this.transformExperimentResultRow(row);
@@ -7678,7 +7711,7 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 					input.status ?? null,
 					Boolean(purgeMetadata),
 					input.tags !== void 0,
-					input.tags === void 0 ? null : JSON.stringify(input.tags),
+					input.tags === void 0 ? null : toPgJson(input.tags),
 					input.comment !== void 0,
 					input.comment ?? null,
 					...input.experimentId !== void 0 ? [input.experimentId] : []
@@ -7749,7 +7782,7 @@ var ExperimentsPG = class ExperimentsPG extends _mastra_core_storage.Experiments
 			}
 			for (const tag of args.tags ?? []) {
 				conditions.push(`"tags" @> $${paramIndex++}::jsonb`);
-				queryParams.push(JSON.stringify([tag]));
+				queryParams.push(toPgJson([tag]));
 			}
 			if (args.filters) {
 				const { organizationId, projectId } = args.filters;
@@ -8676,6 +8709,7 @@ var KnowledgePG = class extends _mastra_core_storage.KnowledgeStorage {
 		return this.#transaction(async (tx) => {
 			const parent = await this.#resolveTerminalNode(tx, nodeReferenceId(input.node));
 			if (!parent) throw new _mastra_core_storage.KnowledgeNotFoundError("node", nodeReferenceId(input.node));
+			const metadataJson = input.metadata ? toPgJson(input.metadata) : null;
 			const record = {
 				id: input.id ?? (0, _mastra_core_storage.createKnowledgeUlid)(),
 				node: parent.id,
@@ -8699,13 +8733,16 @@ var KnowledgePG = class extends _mastra_core_storage.KnowledgeStorage {
 					record.capturedAt.toISOString(),
 					record.when?.toISOString() ?? null,
 					record.maxScope ?? null,
-					record.metadata ? JSON.stringify(record.metadata) : null
+					metadataJson
 				]
 			});
 			await this.#replaceMentions(tx, "record", record.id, record.text, resolutionScope, defaultScope);
 			await this.#activity(tx, "record-created", "record", record.id, scope, record.sourceThreadId);
 			await this.#outbox(tx, "record", record.id, "upsert", record.id, scope);
-			return record;
+			return metadataJson ? {
+				...record,
+				metadata: JSON.parse(metadataJson)
+			} : record;
 		});
 	}
 	async getKnowledge(input) {
@@ -9274,6 +9311,7 @@ var MCPClientsPG = class MCPClientsPG extends _mastra_core_storage.MCPClientsSto
 			});
 			const now = /* @__PURE__ */ new Date();
 			const nowIso = now.toISOString();
+			const metadataJson = mcpClient.metadata ? toPgJson(mcpClient.metadata) : null;
 			await this.#db.client.none(`INSERT INTO ${tableName} (
           id, status, "activeVersionId", "authorId", metadata,
           "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
@@ -9282,7 +9320,7 @@ var MCPClientsPG = class MCPClientsPG extends _mastra_core_storage.MCPClientsSto
 				"draft",
 				null,
 				mcpClient.authorId ?? null,
-				mcpClient.metadata ? JSON.stringify(mcpClient.metadata) : null,
+				metadataJson,
 				nowIso,
 				nowIso,
 				nowIso,
@@ -9303,7 +9341,7 @@ var MCPClientsPG = class MCPClientsPG extends _mastra_core_storage.MCPClientsSto
 				status: "draft",
 				activeVersionId: void 0,
 				authorId: mcpClient.authorId,
-				metadata: mcpClient.metadata,
+				metadata: metadataJson ? JSON.parse(metadataJson) : mcpClient.metadata,
 				createdAt: now,
 				updatedAt: now
 			};
@@ -9361,7 +9399,7 @@ var MCPClientsPG = class MCPClientsPG extends _mastra_core_storage.MCPClientsSto
 					...metadata
 				};
 				setClauses.push(`metadata = $${paramIndex++}`);
-				values.push(JSON.stringify(mergedMetadata));
+				values.push(toPgJson(mergedMetadata));
 			}
 			const now = (/* @__PURE__ */ new Date()).toISOString();
 			setClauses.push(`"updatedAt" = $${paramIndex++}`);
@@ -9434,7 +9472,7 @@ var MCPClientsPG = class MCPClientsPG extends _mastra_core_storage.MCPClientsSto
 			}
 			if (metadata && Object.keys(metadata).length > 0) {
 				conditions.push(`metadata @> $${paramIdx++}::jsonb`);
-				queryParams.push(JSON.stringify(metadata));
+				queryParams.push(toPgJson(metadata));
 			}
 			const whereClause = `WHERE ${conditions.join(" AND ")}`;
 			const countResult = await this.#db.readClient.one(`SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`, queryParams);
@@ -9485,6 +9523,8 @@ var MCPClientsPG = class MCPClientsPG extends _mastra_core_storage.MCPClientsSto
 			});
 			const now = /* @__PURE__ */ new Date();
 			const nowIso = now.toISOString();
+			const serversJson = toPgJson(input.servers);
+			const changedFieldsJson = input.changedFields ? toPgJson(input.changedFields) : null;
 			await this.#db.client.none(`INSERT INTO ${tableName} (
           id, "mcpClientId", "versionNumber",
           name, description, servers,
@@ -9496,14 +9536,16 @@ var MCPClientsPG = class MCPClientsPG extends _mastra_core_storage.MCPClientsSto
 				input.versionNumber,
 				input.name,
 				input.description ?? null,
-				JSON.stringify(input.servers),
-				input.changedFields ? JSON.stringify(input.changedFields) : null,
+				serversJson,
+				changedFieldsJson,
 				input.changeMessage ?? null,
 				nowIso,
 				nowIso
 			]);
 			return {
 				...input,
+				servers: JSON.parse(serversJson),
+				changedFields: changedFieldsJson ? JSON.parse(changedFieldsJson) : input.changedFields,
 				createdAt: now
 			};
 		} catch (error) {
@@ -9845,7 +9887,7 @@ var MCPServersPG = class MCPServersPG extends _mastra_core_storage.MCPServersSto
 				"draft",
 				null,
 				mcpServer.authorId ?? null,
-				mcpServer.metadata ? JSON.stringify(mcpServer.metadata) : null,
+				mcpServer.metadata ? toPgJson(mcpServer.metadata) : null,
 				nowIso,
 				nowIso,
 				nowIso,
@@ -9924,7 +9966,7 @@ var MCPServersPG = class MCPServersPG extends _mastra_core_storage.MCPServersSto
 					...metadata
 				};
 				setClauses.push(`metadata = $${paramIndex++}`);
-				values.push(JSON.stringify(mergedMetadata));
+				values.push(toPgJson(mergedMetadata));
 			}
 			const now = (/* @__PURE__ */ new Date()).toISOString();
 			setClauses.push(`"updatedAt" = $${paramIndex++}`);
@@ -9997,7 +10039,7 @@ var MCPServersPG = class MCPServersPG extends _mastra_core_storage.MCPServersSto
 			}
 			if (metadata && Object.keys(metadata).length > 0) {
 				conditions.push(`metadata @> $${paramIdx++}::jsonb`);
-				queryParams.push(JSON.stringify(metadata));
+				queryParams.push(toPgJson(metadata));
 			}
 			const whereClause = `WHERE ${conditions.join(" AND ")}`;
 			const countResult = await this.#db.readClient.one(`SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`, queryParams);
@@ -10063,14 +10105,14 @@ var MCPServersPG = class MCPServersPG extends _mastra_core_storage.MCPServersSto
 				input.version,
 				input.description ?? null,
 				input.instructions ?? null,
-				input.repository ? JSON.stringify(input.repository) : null,
+				input.repository ? toPgJson(input.repository) : null,
 				input.releaseDate ?? null,
 				input.isLatest ?? null,
 				input.packageCanonical ?? null,
-				input.tools ? JSON.stringify(input.tools) : null,
-				input.agents ? JSON.stringify(input.agents) : null,
-				input.workflows ? JSON.stringify(input.workflows) : null,
-				input.changedFields ? JSON.stringify(input.changedFields) : null,
+				input.tools ? toPgJson(input.tools) : null,
+				input.agents ? toPgJson(input.agents) : null,
+				input.workflows ? toPgJson(input.workflows) : null,
+				input.changedFields ? toPgJson(input.changedFields) : null,
 				input.changeMessage ?? null,
 				nowIso,
 				nowIso
@@ -10805,7 +10847,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 			}
 			if (filter?.metadata && Object.keys(filter.metadata).length > 0) for (const [key, value] of Object.entries(filter.metadata)) {
 				whereClauses.push(`metadata::jsonb @> $${paramIndex}::jsonb`);
-				queryParams.push(JSON.stringify({ [key]: value }));
+				queryParams.push(toPgJson({ [key]: value }));
 				paramIndex++;
 			}
 			const baseQuery = `FROM ${tableName} ${whereClauses.length > 0 ? `WHERE ${whereClauses.join(" AND ")}` : ""}`;
@@ -10864,6 +10906,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 			});
 			const createdAt = toUtcISOString(thread.createdAt);
 			const updatedAt = toUtcISOString(thread.updatedAt);
+			const metadataJson = thread.metadata ? toPgJson(thread.metadata) : null;
 			await this.#db.client.none(`INSERT INTO ${tableName} (
           id,
           "resourceId",
@@ -10885,13 +10928,16 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 				thread.id,
 				thread.resourceId,
 				thread.title,
-				thread.metadata ? JSON.stringify(thread.metadata) : null,
+				metadataJson,
 				createdAt,
 				createdAt,
 				updatedAt,
 				updatedAt
 			]);
-			return thread;
+			return {
+				...thread,
+				metadata: metadataJson ? JSON.parse(metadataJson) : thread.metadata
+			};
 		} catch (error) {
 			throw new _mastra_core_error.MastraError({
 				id: (0, _mastra_core_storage.createStorageErrorId)("PG", "SAVE_THREAD", "FAILED"),
@@ -11707,16 +11753,20 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 	async saveResource({ resource }) {
 		const createdAt = toUtcISOString(resource.createdAt);
 		const updatedAt = toUtcISOString(resource.updatedAt);
+		const metadataJson = toPgJson(resource.metadata);
 		await this.#db.insert({
 			tableName: _mastra_core_storage.TABLE_RESOURCES,
 			record: {
 				...resource,
-				metadata: JSON.stringify(resource.metadata),
+				metadata: metadataJson,
 				createdAt,
 				updatedAt
 			}
 		});
-		return resource;
+		return {
+			...resource,
+			metadata: metadataJson ? JSON.parse(metadataJson) : resource.metadata
+		};
 	}
 	async updateResource({ resourceId, workingMemory, metadata }) {
 		const existingResource = await this.#getResourceById(this.#db.client, resourceId);
@@ -11751,9 +11801,11 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 			values.push(workingMemory);
 			paramIndex++;
 		}
+		let metadataJson;
 		if (metadata) {
+			metadataJson = toPgJson(updatedResource.metadata);
 			updates.push(`metadata = $${paramIndex}`);
-			values.push(JSON.stringify(updatedResource.metadata));
+			values.push(metadataJson);
 			paramIndex++;
 		}
 		const updatedAtStr = updatedResource.updatedAt.toISOString();
@@ -11763,7 +11815,10 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 		values.push(updatedAtStr);
 		values.push(resourceId);
 		await this.#db.client.none(`UPDATE ${tableName} SET ${updates.join(", ")} WHERE id = $${paramIndex}`, values);
-		return updatedResource;
+		return metadataJson ? {
+			...updatedResource,
+			metadata: JSON.parse(metadataJson)
+		} : updatedResource;
 	}
 	async copyThread(args) {
 		const { sourceThreadId, newThreadId: providedThreadId, resourceId, title, metadata, options } = args;
@@ -11848,7 +11903,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 					newThread.id,
 					newThread.resourceId,
 					newThread.title,
-					newThread.metadata ? JSON.stringify(newThread.metadata) : null,
+					newThread.metadata ? toPgJson(newThread.metadata) : null,
 					nowStr,
 					nowStr,
 					nowStr,
@@ -12039,7 +12094,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 				"",
 				null,
 				"initial",
-				JSON.stringify(input.config),
+				toPgJson(input.config),
 				0,
 				null,
 				null,
@@ -12102,7 +12157,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 				record.activeObservations || "",
 				null,
 				record.originType || "initial",
-				record.config ? JSON.stringify(record.config) : null,
+				record.config ? toPgJson(record.config) : null,
 				record.generationCount || 0,
 				lastObservedAtStr,
 				lastObservedAtStr,
@@ -12111,8 +12166,8 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 				record.pendingMessageTokens || 0,
 				record.totalTokensObserved || 0,
 				record.observationTokenCount || 0,
-				record.observedMessageIds ? JSON.stringify(record.observedMessageIds) : null,
-				record.bufferedObservationChunks ? JSON.stringify(record.bufferedObservationChunks) : null,
+				record.observedMessageIds ? toPgJson(record.observedMessageIds) : null,
+				record.bufferedObservationChunks ? toPgJson(record.bufferedObservationChunks) : null,
 				record.bufferedReflection || null,
 				record.bufferedReflectionTokens ?? null,
 				record.bufferedReflectionInputTokens ?? null,
@@ -12124,7 +12179,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 				record.lastBufferedAtTokens || 0,
 				lastBufferedAtTimeStr,
 				record.observedTimezone || null,
-				record.metadata ? JSON.stringify(record.metadata) : null,
+				record.metadata ? toPgJson(record.metadata) : null,
 				record.createdAt.toISOString(),
 				record.createdAt.toISOString(),
 				record.updatedAt.toISOString(),
@@ -12152,7 +12207,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 			});
 			const lastObservedAtStr = input.lastObservedAt.toISOString();
 			const nowStr = now.toISOString();
-			const observedMessageIdsJson = input.observedMessageIds ? JSON.stringify(input.observedMessageIds) : null;
+			const observedMessageIdsJson = input.observedMessageIds ? toPgJson(input.observedMessageIds) : null;
 			if ((await this.#db.client.query(`UPDATE ${tableName} SET
           "activeObservations" = $1,
           "lastObservedAt" = $2,
@@ -12241,7 +12296,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 				input.reflection,
 				null,
 				"reflection",
-				JSON.stringify(record.config),
+				toPgJson(record.config),
 				input.currentRecord.generationCount + 1,
 				lastObservedAtStr,
 				lastObservedAtStr,
@@ -12257,7 +12312,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 				0,
 				null,
 				record.observedTimezone || null,
-				record.metadata ? JSON.stringify(record.metadata) : null,
+				record.metadata ? toPgJson(record.metadata) : null,
 				nowStr,
 				nowStr,
 				nowStr,
@@ -12508,7 +12563,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 			const merged = this.deepMergeConfig(existing, input.config);
 			const nowStr = (/* @__PURE__ */ new Date()).toISOString();
 			await this.#db.client.query(`UPDATE ${tableName} SET config = $1, "updatedAt" = $2, "updatedAtZ" = $3 WHERE id = $4`, [
-				JSON.stringify(merged),
+				toPgJson(merged),
 				nowStr,
 				nowStr,
 				input.id
@@ -12559,7 +12614,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
           "updatedAt" = $4,
           "updatedAtZ" = $5
         WHERE id = $6`, [
-				JSON.stringify([newChunk]),
+				toPgJson([newChunk]),
 				input.chunk.cycleId,
 				lastBufferedAtTime,
 				nowStr,
@@ -12674,7 +12729,7 @@ var MemoryPG = class MemoryPG extends _mastra_core_storage.MemoryStorage {
 				activatedContent,
 				activatedTokens,
 				activatedMessageTokens,
-				remainingChunks.length > 0 ? JSON.stringify(remainingChunks) : null,
+				remainingChunks.length > 0 ? toPgJson(remainingChunks) : null,
 				lastObservedAtStr,
 				lastObservedAtStr,
 				nowStr,
@@ -13054,7 +13109,7 @@ var NotificationsPG = class NotificationsPG extends _mastra_core_storage.Notific
 		});
 		const setColumns = entries.map(([key], index) => `"${(0, _mastra_core_utils.parseSqlIdentifier)(key, "column name")}" = $${index + 1}`);
 		const values = entries.map(([key, value]) => {
-			if (_mastra_core_storage.TABLE_SCHEMAS[_mastra_core_storage.TABLE_NOTIFICATIONS][key]?.type === "jsonb" && value !== null) return JSON.stringify(value);
+			if (_mastra_core_storage.TABLE_SCHEMAS[_mastra_core_storage.TABLE_NOTIFICATIONS][key]?.type === "jsonb" && value !== null) return toPgJson(value);
 			return value;
 		});
 		await this.#db.client.none(`UPDATE ${tableName} SET ${setColumns.join(", ")} WHERE "threadId" = $${values.length + 1} AND "id" = $${values.length + 2}`, [
@@ -13775,15 +13830,15 @@ var ObservabilityPG = class ObservabilityPG extends _mastra_core_storage.Observa
 				}
 				if (filters.scope != null) {
 					conditions.push(`r."scope" @> $${paramIndex++}`);
-					params.push(JSON.stringify(filters.scope));
+					params.push(toPgJson(filters.scope));
 				}
 				if (filters.metadata != null) {
 					conditions.push(`r."metadata" @> $${paramIndex++}`);
-					params.push(JSON.stringify(filters.metadata));
+					params.push(toPgJson(filters.metadata));
 				}
 				if (filters.tags != null && filters.tags.length > 0) {
 					conditions.push(`r."tags" @> $${paramIndex++}`);
-					params.push(JSON.stringify(filters.tags));
+					params.push(toPgJson(filters.tags));
 				}
 				if (filters.status !== void 0) switch (filters.status) {
 					case _mastra_core_storage.TraceStatus.ERROR:
@@ -15092,7 +15147,7 @@ async function upsertCache(client, schema, cacheKey, values) {
      VALUES ($1, NOW(), $2::jsonb)
      ON CONFLICT ("cacheKey") DO UPDATE SET
        "refreshedAt" = EXCLUDED."refreshedAt",
-       "values" = EXCLUDED."values"`, [cacheKey, JSON.stringify(values)]);
+       "values" = EXCLUDED."values"`, [cacheKey, toPgJson(values)]);
 }
 /**
 * Time predicate that bounds a discovery refresh to recent events.
@@ -16046,20 +16101,6 @@ const COMPLEX_GROUP_BY_EXCLUDED = /* @__PURE__ */ new Set([
 	"requestContext"
 ]);
 //#endregion
-//#region src/storage/db/sanitize-json.ts
-/**
-* Sanitizes JSON string for PostgreSQL jsonb:
-* - Removes problematic Unicode sequences:
-*   - \u0000 (null character) - causes error 22P05 "unsupported Unicode escape sequence"
-*   - \uD800-\uDFFF (unpaired surrogates) - causes "Unicode low surrogate must follow a high surrogate"
-*   - \\uD800 (escaped-backslash + surrogate, e.g. from JS regex literals like [^\ud800-\udfff]):
-*     removing just \uXXXX would leave a dangling backslash that creates a new invalid escape (e.g. \-)
-* - Escapes any remaining invalid JSON escape sequences (e.g. \v, \k, \-)
-*/
-function sanitizeJsonForPg(jsonString) {
-	return jsonString.replace(/\\\\?u(0000|[Dd][89A-Fa-f][0-9A-Fa-f]{2})/g, "").replace(/(^|[^\\])(\\(?!["\\/bfnrtu]))/g, "$1\\\\");
-}
-//#endregion
 //#region src/storage/domains/observability/v-next/sql.ts
 /**
 * SQL helpers for the v-next Postgres observability domain.
@@ -16081,7 +16122,7 @@ function sanitizeJsonForPg(jsonString) {
 */
 function encodeJsonb(value) {
 	if (value === null || value === void 0) return null;
-	return sanitizeJsonForPg(JSON.stringify(value));
+	return toPgJson(value);
 }
 /**
 * Build a multi-row INSERT with explicit column types and ON CONFLICT DO NOTHING.
@@ -16482,7 +16523,7 @@ function applyMetricFilters(acc, filters) {
 	applySingleOrArrayFilter(acc, "costUnit", filters?.costUnit);
 	if (filters?.labels) {
 		acc.conditions.push(`"labels" @> $${acc.next++}::jsonb`);
-		acc.params.push(JSON.stringify(filters.labels));
+		acc.params.push(toPgJson(filters.labels));
 	}
 }
 /** Additional WHERE for metric-name restriction (OLAP queries take a `name` array). */
@@ -16995,7 +17036,7 @@ function applyScoreFilters(acc, filters) {
 	}
 	if (filters?.metadata && Object.keys(filters.metadata).length > 0) for (const [key, value] of Object.entries(filters.metadata)) {
 		acc.conditions.push(`"metadata"->($${acc.next++}::text) = $${acc.next++}::jsonb`);
-		acc.params.push(key, JSON.stringify(value ?? null));
+		acc.params.push(key, toPgJson(value ?? null));
 	}
 }
 /** OLAP queries take an explicit scorerId / scoreSource pair as identity. */
@@ -17261,16 +17302,21 @@ async function getScorePercentiles(client, schema, args) {
 //#endregion
 //#region src/storage/domains/observability/v-next/trace-query.ts
 const TRACE_STATUS_SQL = `CASE WHEN r."error" IS NOT NULL THEN 'error' ELSE 'success' END`;
+function durationMsSql(startedAt, endedAt) {
+	return `EXTRACT(EPOCH FROM (${endedAt} - ${startedAt}))::numeric * 1000`;
+}
 const TRACE_FIELDS = {
 	traceId: "r.\"traceId\"",
 	threadId: "r.\"threadId\"",
 	resourceId: "r.\"resourceId\"",
 	startedAt: "r.\"startedAt\"",
 	endedAt: "r.\"endedAt\"",
+	durationMs: durationMsSql("r.\"startedAt\"", "r.\"endedAt\""),
 	entityName: "r.\"entityName\"",
 	entityType: "r.\"entityType\"",
 	environment: "r.\"environment\"",
-	status: TRACE_STATUS_SQL
+	status: TRACE_STATUS_SQL,
+	tags: "r.\"tags\""
 };
 const SPAN_FIELDS = {
 	name: "s.\"name\"",
@@ -17372,6 +17418,19 @@ function compileScalarPredicate(predicate, registry, parameterOffset, allowMetad
 		sql: `${field} IS ${predicate.operator === "exists" ? "NOT " : ""}NULL`,
 		values: fieldValues
 	};
+	if (predicate.type === "collection") {
+		if (predicate.operator === "includes" || predicate.operator === "notIncludes") {
+			const contains = `${field} @> ARRAY[$${parameterOffset}]::text[]`;
+			return {
+				sql: predicate.operator === "includes" ? contains : `cardinality(${field}) > 0 AND NOT (${contains})`,
+				values: [...fieldValues, predicate.value]
+			};
+		}
+		return {
+			sql: `cardinality(${field}) ${predicate.operator === "empty" ? "=" : ">"} 0`,
+			values: fieldValues
+		};
+	}
 	if (predicate.type === "membership") {
 		const list = placeholders(predicate.values, parameterOffset);
 		if (predicate.operator === "in") return {
@@ -17425,6 +17484,7 @@ function compileFeedbackScalarPredicate(predicate, parameterOffset) {
 		};
 	}
 	if (predicate.field !== "value") return compileScalarPredicate(predicate, FEEDBACK_FIELDS, parameterOffset);
+	if (predicate.type === "collection") throw new Error(`Unsupported trusted trace-query field: ${predicate.field}`);
 	if (predicate.type === "presence") {
 		const present = `(s."valueString" IS NOT NULL OR s."valueNumber" IS NOT NULL)`;
 		return {
@@ -17580,7 +17640,7 @@ function compilePostgresTraceScope(schema, selection, relationCollections, scope
       CASE WHEN s."isPending" THEN NULL ELSE s."endedAt" END AS "endedAt",
       CASE
         WHEN s."isPending" THEN NULL
-        ELSE EXTRACT(EPOCH FROM (s."endedAt" - s."startedAt")) * 1000
+        ELSE ${durationMsSql("s.\"startedAt\"", "s.\"endedAt\"")}
       END AS "durationMs",
       CASE WHEN s."error" IS NOT NULL THEN 'error' ELSE 'success' END AS "status",
       s."error",
@@ -17808,22 +17868,23 @@ LIMIT $${values.length}`,
 }
 function compilePostgresTraceQueryValues(schema, plan) {
 	const { ctes, values } = compilePostgresTraceScope(schema, plan, discoveryCollections(plan.predicateScope), plan.scope);
-	let field;
-	if (plan.predicateScope === "trace" && plan.path.startsWith("metadata.")) {
+	let extracted;
+	if (plan.predicateScope === "trace" && plan.path === "tags") extracted = `SELECT value FROM (SELECT DISTINCT r."traceId", UNNEST(r."tags") AS value FROM root_scope r) t`;
+	else if (plan.predicateScope === "trace" && plan.path.startsWith("metadata.")) {
 		const keyParameter = `$${values.length + 1}`;
-		field = `COALESCE(
+		extracted = `SELECT COALESCE(
       CASE WHEN jsonb_typeof(r."metadataSearch" -> ${keyParameter}) = 'string' THEN r."metadataSearch" ->> ${keyParameter} END,
       CASE WHEN jsonb_typeof(r."metadataRaw" -> ${keyParameter}) = 'string' THEN NULLIF(btrim(r."metadataRaw" ->> ${keyParameter}), '') END
-    )`;
+    )::text AS value FROM root_scope r`;
 		values.push(plan.path.slice(9));
-	} else field = fieldSql(discoveryRegistry(plan.predicateScope), plan.path);
+	} else extracted = `SELECT ${fieldSql(discoveryRegistry(plan.predicateScope), plan.path)}::text AS value FROM ${discoverySource(plan.predicateScope)}`;
 	const searchParameter = values.length + 1;
 	const search = plan.search ? `AND strpos(lower(value), lower($${searchParameter})) > 0` : "";
 	if (plan.search) values.push(plan.search);
 	values.push(plan.limit + 1);
 	return {
 		text: `WITH ${ctes.join(",\n")}, extracted AS (
-  SELECT ${field}::text AS value FROM ${discoverySource(plan.predicateScope)}
+  ${extracted}
 )
 SELECT value, count(*)::bigint AS count
 FROM extracted
@@ -18178,7 +18239,7 @@ function buildListTracesFilters(filters, spanTable, nextParamIdx) {
 	}
 	if (filters.metadata != null) {
 		conditions.push(`r."metadataSearch" @> $${i++}::jsonb`);
-		params.push(JSON.stringify(filters.metadata));
+		params.push(toPgJson(filters.metadata));
 	}
 	if (filters.tags != null && filters.tags.length > 0) {
 		conditions.push(`r."tags" @> $${i++}::text[]`);
@@ -18456,7 +18517,7 @@ function buildListBranchesFilters(filters, spanType, spanTable, nextParamIdx) {
 	}
 	if (filters.metadata != null) {
 		conditions.push(`r."metadataSearch" @> $${i++}::jsonb`);
-		params.push(JSON.stringify(filters.metadata));
+		params.push(toPgJson(filters.metadata));
 	}
 	if (filters.tags != null && filters.tags.length > 0) {
 		conditions.push(`r."tags" @> $${i++}::text[]`);
@@ -18921,6 +18982,7 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"metrics",
 			"logs",
 			"trace-query",
+			"trace-query-root-duration",
 			"trace-query-discovery",
 			"thread-query",
 			"trace-query-tenant-scope"
@@ -18930,6 +18992,7 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"logs",
 			"delta-polling",
 			"trace-query",
+			"trace-query-root-duration",
 			"trace-query-discovery",
 			"thread-query",
 			"trace-query-tenant-scope"
@@ -19247,7 +19310,7 @@ var PromptBlocksPG = class PromptBlocksPG extends _mastra_core_storage.PromptBlo
 				"draft",
 				null,
 				promptBlock.authorId ?? null,
-				promptBlock.metadata ? JSON.stringify(promptBlock.metadata) : null,
+				promptBlock.metadata ? toPgJson(promptBlock.metadata) : null,
 				nowIso,
 				nowIso,
 				nowIso,
@@ -19326,7 +19389,7 @@ var PromptBlocksPG = class PromptBlocksPG extends _mastra_core_storage.PromptBlo
 					...metadata
 				};
 				setClauses.push(`metadata = $${paramIndex++}`);
-				values.push(JSON.stringify(mergedMetadata));
+				values.push(toPgJson(mergedMetadata));
 			}
 			const now = (/* @__PURE__ */ new Date()).toISOString();
 			setClauses.push(`"updatedAt" = $${paramIndex++}`);
@@ -19401,7 +19464,7 @@ var PromptBlocksPG = class PromptBlocksPG extends _mastra_core_storage.PromptBlo
 			}
 			if (metadata && Object.keys(metadata).length > 0) {
 				conditions.push(`metadata @> $${paramIdx++}::jsonb`);
-				queryParams.push(JSON.stringify(metadata));
+				queryParams.push(toPgJson(metadata));
 			}
 			const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
 			const countResult = await this.#db.readClient.one(`SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`, queryParams);
@@ -19464,9 +19527,9 @@ var PromptBlocksPG = class PromptBlocksPG extends _mastra_core_storage.PromptBlo
 				input.name,
 				input.description ?? null,
 				input.content,
-				input.rules ? JSON.stringify(input.rules) : null,
-				input.requestContextSchema ? JSON.stringify(input.requestContextSchema) : null,
-				input.changedFields ? JSON.stringify(input.changedFields) : null,
+				input.rules ? toPgJson(input.rules) : null,
+				input.requestContextSchema ? toPgJson(input.requestContextSchema) : null,
+				input.changedFields ? toPgJson(input.changedFields) : null,
 				input.changeMessage ?? null,
 				nowIso,
 				nowIso
@@ -19973,8 +20036,8 @@ var SchedulesPG = class SchedulesPG extends _mastra_core_storage.SchedulesStorag
 		if ("timezone" in patch) push("timezone = ?", patch.timezone ?? null);
 		if ("status" in patch && patch.status !== void 0) push("status = ?", patch.status);
 		if ("nextFireAt" in patch && patch.nextFireAt !== void 0) push("next_fire_at = ?", patch.nextFireAt);
-		if ("target" in patch && patch.target !== void 0) push("target = ?::jsonb", JSON.stringify(patch.target));
-		if ("metadata" in patch) push("metadata = ?::jsonb", patch.metadata != null ? JSON.stringify(patch.metadata) : null);
+		if ("target" in patch && patch.target !== void 0) push("target = ?::jsonb", toPgJson(patch.target));
+		if ("metadata" in patch) push("metadata = ?::jsonb", patch.metadata != null ? toPgJson(patch.metadata) : null);
 		if ("ownerType" in patch) push("owner_type = ?", patch.ownerType ?? null);
 		if ("ownerId" in patch) push("owner_id = ?", patch.ownerId ?? null);
 		push("updated_at = ?", Date.now());
@@ -20192,7 +20255,7 @@ var ScorerDefinitionsPG = class ScorerDefinitionsPG extends _mastra_core_storage
 				scorerDefinition.authorId ?? null,
 				scorerDefinition.organizationId ?? null,
 				scorerDefinition.projectId ?? null,
-				scorerDefinition.metadata ? JSON.stringify(scorerDefinition.metadata) : null,
+				scorerDefinition.metadata ? toPgJson(scorerDefinition.metadata) : null,
 				nowIso,
 				nowIso,
 				nowIso,
@@ -20273,7 +20336,7 @@ var ScorerDefinitionsPG = class ScorerDefinitionsPG extends _mastra_core_storage
 					...metadata
 				};
 				setClauses.push(`metadata = $${paramIndex++}`);
-				values.push(JSON.stringify(mergedMetadata));
+				values.push(toPgJson(mergedMetadata));
 			}
 			const now = (/* @__PURE__ */ new Date()).toISOString();
 			setClauses.push(`"updatedAt" = $${paramIndex++}`);
@@ -20356,7 +20419,7 @@ var ScorerDefinitionsPG = class ScorerDefinitionsPG extends _mastra_core_storage
 			}
 			if (metadata && Object.keys(metadata).length > 0) {
 				conditions.push(`metadata @> $${paramIdx++}::jsonb`);
-				queryParams.push(JSON.stringify(metadata));
+				queryParams.push(toPgJson(metadata));
 			}
 			const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
 			const countResult = await this.#db.readClient.one(`SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`, queryParams);
@@ -20419,12 +20482,12 @@ var ScorerDefinitionsPG = class ScorerDefinitionsPG extends _mastra_core_storage
 				input.name,
 				input.description ?? null,
 				input.type,
-				input.model ? JSON.stringify(input.model) : null,
+				input.model ? toPgJson(input.model) : null,
 				input.instructions ?? null,
-				input.scoreRange ? JSON.stringify(input.scoreRange) : null,
-				input.presetConfig ? JSON.stringify(input.presetConfig) : null,
-				input.defaultSampling ? JSON.stringify(input.defaultSampling) : null,
-				input.changedFields ? JSON.stringify(input.changedFields) : null,
+				input.scoreRange ? toPgJson(input.scoreRange) : null,
+				input.presetConfig ? toPgJson(input.presetConfig) : null,
+				input.defaultSampling ? toPgJson(input.defaultSampling) : null,
+				input.changedFields ? toPgJson(input.changedFields) : null,
 				input.changeMessage ?? null,
 				nowIso,
 				nowIso
@@ -20944,15 +21007,15 @@ var ScoresPG = class ScoresPG extends _mastra_core_storage.ScoresStorage {
 				record: {
 					id,
 					...rest,
-					input: JSON.stringify(input) || "",
-					output: JSON.stringify(output) || "",
-					scorer: scorer ? JSON.stringify(scorer) : null,
-					preprocessStepResult: preprocessStepResult ? JSON.stringify(preprocessStepResult) : null,
-					analyzeStepResult: analyzeStepResult ? JSON.stringify(analyzeStepResult) : null,
-					metadata: metadata ? JSON.stringify(metadata) : null,
-					additionalContext: additionalContext ? JSON.stringify(additionalContext) : null,
-					requestContext: requestContext ? JSON.stringify(requestContext) : null,
-					entity: entity ? JSON.stringify(entity) : null,
+					input: toPgJson(input) || "",
+					output: toPgJson(output) || "",
+					scorer: scorer ? toPgJson(scorer) : null,
+					preprocessStepResult: preprocessStepResult ? toPgJson(preprocessStepResult) : null,
+					analyzeStepResult: analyzeStepResult ? toPgJson(analyzeStepResult) : null,
+					metadata: metadata ? toPgJson(metadata) : null,
+					additionalContext: additionalContext ? toPgJson(additionalContext) : null,
+					requestContext: requestContext ? toPgJson(requestContext) : null,
+					entity: entity ? toPgJson(entity) : null,
 					createdAt: now.toISOString(),
 					updatedAt: now.toISOString()
 				}
@@ -21537,15 +21600,15 @@ var SkillsPG = class SkillsPG extends _mastra_core_storage.SkillsStorage {
 				input.description ?? null,
 				input.instructions ?? null,
 				input.license ?? null,
-				input.compatibility ? JSON.stringify(input.compatibility) : null,
-				input.source ? JSON.stringify(input.source) : null,
-				input.references ? JSON.stringify(input.references) : null,
-				input.scripts ? JSON.stringify(input.scripts) : null,
-				input.assets ? JSON.stringify(input.assets) : null,
-				input.files ? JSON.stringify(input.files) : null,
-				input.metadata ? JSON.stringify(input.metadata) : null,
-				input.tree ? JSON.stringify(input.tree) : null,
-				input.changedFields ? JSON.stringify(input.changedFields) : null,
+				input.compatibility ? toPgJson(input.compatibility) : null,
+				input.source ? toPgJson(input.source) : null,
+				input.references ? toPgJson(input.references) : null,
+				input.scripts ? toPgJson(input.scripts) : null,
+				input.assets ? toPgJson(input.assets) : null,
+				input.files ? toPgJson(input.files) : null,
+				input.metadata ? toPgJson(input.metadata) : null,
+				input.tree ? toPgJson(input.tree) : null,
+				input.changedFields ? toPgJson(input.changedFields) : null,
 				input.changeMessage ?? null,
 				nowIso,
 				nowIso
@@ -21921,7 +21984,7 @@ var ThreadStatePG = class ThreadStatePG extends _mastra_core_storage.ThreadState
 	}
 	async setState({ threadId, type, value }) {
 		const now = (/* @__PURE__ */ new Date()).toISOString();
-		const serialized = JSON.stringify(value ?? null);
+		const serialized = toPgJson(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)
@@ -22698,7 +22761,7 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 					requestContext
 				});
 				const now = /* @__PURE__ */ new Date();
-				const sanitizedSnapshot = sanitizeJsonForPg(JSON.stringify(snapshot));
+				const sanitizedSnapshot = toPgJson(snapshot);
 				await t.none(`INSERT INTO ${tableName}
            (workflow_name, run_id, snapshot, "createdAt", "updatedAt", "createdAtZ", "updatedAtZ")
            VALUES ($1, $2, $3, $4, $5, $6, $7)
@@ -22745,7 +22808,7 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 					...snapshot,
 					...state
 				};
-				const sanitizedSnapshot = sanitizeJsonForPg(JSON.stringify(updatedSnapshot));
+				const sanitizedSnapshot = toPgJson(updatedSnapshot);
 				const now = /* @__PURE__ */ new Date();
 				await t.none(`UPDATE ${tableName}
            SET snapshot = $1, "updatedAt" = $2, "updatedAtZ" = $3
@@ -22775,7 +22838,7 @@ var WorkflowsPG = class WorkflowsPG extends _mastra_core_storage.WorkflowsStorag
 			const now = /* @__PURE__ */ new Date();
 			const createdAtValue = createdAt ? createdAt : now;
 			const updatedAtValue = updatedAt ? updatedAt : now;
-			const sanitizedSnapshot = sanitizeJsonForPg(JSON.stringify(snapshot));
+			const sanitizedSnapshot = toPgJson(snapshot);
 			await this.#db.client.none(`INSERT INTO ${getTableName({
 				indexName: _mastra_core_storage.TABLE_WORKFLOW_SNAPSHOT,
 				schemaName: getSchemaName(this.#schema)
@@ -23087,7 +23150,7 @@ var WorkspacesPG = class WorkspacesPG extends _mastra_core_storage.WorkspacesSto
 				"draft",
 				null,
 				workspace.authorId ?? null,
-				workspace.metadata ? JSON.stringify(workspace.metadata) : null,
+				workspace.metadata ? toPgJson(workspace.metadata) : null,
 				nowIso,
 				nowIso,
 				nowIso,
@@ -23162,7 +23225,11 @@ var WorkspacesPG = class WorkspacesPG extends _mastra_core_storage.WorkspacesSto
 					...latestConfig,
 					...configFields
 				};
-				const changedFields = SNAPSHOT_FIELDS.filter((field) => field in configFields && JSON.stringify(configFields[field]) !== JSON.stringify(latestConfig[field]));
+				const normalized = (value) => {
+					const json = toPgJson(value);
+					return json === void 0 ? void 0 : JSON.parse(json);
+				};
+				const changedFields = SNAPSHOT_FIELDS.filter((field) => field in configFields && !(0, util.isDeepStrictEqual)(normalized(configFields[field]), normalized(latestConfig[field])));
 				if (changedFields.length > 0) {
 					versionCreated = true;
 					const newVersionId = crypto.randomUUID();
@@ -23196,12 +23263,13 @@ var WorkspacesPG = class WorkspacesPG extends _mastra_core_storage.WorkspacesSto
 				values.push(status);
 			}
 			if (metadata !== void 0) {
+				const normalizedMetadata = JSON.parse(toPgJson(metadata));
 				const mergedMetadata = {
 					...existingWorkspace.metadata || {},
-					...metadata
+					...normalizedMetadata
 				};
 				setClauses.push(`metadata = $${paramIndex++}`);
-				values.push(JSON.stringify(mergedMetadata));
+				values.push(toPgJson(mergedMetadata));
 			}
 			const now = (/* @__PURE__ */ new Date()).toISOString();
 			setClauses.push(`"updatedAt" = $${paramIndex++}`);
@@ -23272,7 +23340,7 @@ var WorkspacesPG = class WorkspacesPG extends _mastra_core_storage.WorkspacesSto
 			}
 			if (metadata && Object.keys(metadata).length > 0) {
 				conditions.push(`metadata @> $${paramIdx++}::jsonb`);
-				queryParams.push(JSON.stringify(metadata));
+				queryParams.push(toPgJson(metadata));
 			}
 			const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
 			const countResult = await this.#db.readClient.one(`SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`, queryParams);
@@ -23335,15 +23403,15 @@ var WorkspacesPG = class WorkspacesPG extends _mastra_core_storage.WorkspacesSto
 				input.versionNumber,
 				input.name,
 				input.description ?? null,
-				input.filesystem ? JSON.stringify(input.filesystem) : null,
-				input.sandbox ? JSON.stringify(input.sandbox) : null,
-				input.mounts ? JSON.stringify(input.mounts) : null,
-				input.search ? JSON.stringify(input.search) : null,
-				input.skills ? JSON.stringify(input.skills) : null,
-				input.tools ? JSON.stringify(input.tools) : null,
+				input.filesystem ? toPgJson(input.filesystem) : null,
+				input.sandbox ? toPgJson(input.sandbox) : null,
+				input.mounts ? toPgJson(input.mounts) : null,
+				input.search ? toPgJson(input.search) : null,
+				input.skills ? toPgJson(input.skills) : null,
+				input.tools ? toPgJson(input.tools) : null,
 				input.autoSync ?? false,
 				input.operationTimeout ?? null,
-				input.changedFields ? JSON.stringify(input.changedFields) : null,
+				input.changedFields ? toPgJson(input.changedFields) : null,
 				input.changeMessage ?? null,
 				nowIso,
 				nowIso
@@ -23635,7 +23703,7 @@ var PgFactoryStorageOps = class {
 		switch (spec.type) {
 			case "timestamp": return value instanceof Date ? value : new Date(String(value));
 			case "boolean": return Boolean(value);
-			case "json": return JSON.stringify(value);
+			case "json": return toPgJson(value);
 			case "bigint":
 			case "integer": return Number(value);
 			default: return String(value);