@mastra/pg 1.32.0-alpha.4 → 1.32.0-alpha.6

package/dist/index.js

@@ -161,12 +161,14 @@ var PGFilterTranslator = class extends BaseFilterTranslator {
 			if (key === "$options") continue;
 			const newPath = currentPath ? `${currentPath}.${key}` : key;
 			if (this.isLogicalOperator(key)) result[key] = Array.isArray(value) ? value.map((filter) => this.translateNode(filter)) : this.translateNode(value);
-			else if (this.isOperator(key)) if (this.isArrayOperator(key) && !Array.isArray(value) && key !== "$elemMatch") result[key] = [value];
-			else if (this.isBasicOperator(key) && Array.isArray(value)) result[key] = JSON.stringify(value);
-			else result[key] = value;
-			else if (typeof value === "object" && value !== null) if (Object.keys(value).some((k) => this.isOperator(k))) result[newPath] = this.translateNode(value);
-			else Object.assign(result, this.translateNode(value, newPath));
-			else result[newPath] = this.translateNode(value);
+			else if (this.isOperator(key)) {
+				if (this.isArrayOperator(key) && !Array.isArray(value) && key !== "$elemMatch") result[key] = [value];
+				else if (this.isBasicOperator(key) && Array.isArray(value)) result[key] = JSON.stringify(value);
+				else result[key] = value;
+			} else if (typeof value === "object" && value !== null) {
+				if (Object.keys(value).some((k) => this.isOperator(k))) result[newPath] = this.translateNode(value);
+				else Object.assign(result, this.translateNode(value, newPath));
+			} else result[newPath] = this.translateNode(value);
 		}
 		return result;
 	}
@@ -1427,19 +1429,21 @@ var PgVector = class extends MastraVector {
 			try {
 				existingIndexInfo = await this.describeIndexMetadata({ indexName }, client);
 				dimension = existingIndexInfo.dimension;
-				if (isConfigEmpty && existingIndexInfo.metric === metric) if (existingIndexInfo.type === "flat") this.logger?.debug(`No index exists for ${vectorIndexName}, will create default ivfflat index`);
-				else {
-					this.logger?.debug(`Index ${vectorIndexName} already exists (type: ${existingIndexInfo.type}, metric: ${existingIndexInfo.metric}), preserving existing configuration`);
-					const cacheKey = await this.getIndexCacheKey({
-						indexName,
-						dimension,
-						type: existingIndexInfo.type,
-						metric: existingIndexInfo.metric,
-						vectorType: existingIndexInfo.vectorType
-					});
-					this.createdIndexes.set(indexName, cacheKey);
-					this.indexVectorTypes.set(indexName, existingIndexInfo.vectorType);
-					return;
+				if (isConfigEmpty && existingIndexInfo.metric === metric) {
+					if (existingIndexInfo.type === "flat") this.logger?.debug(`No index exists for ${vectorIndexName}, will create default ivfflat index`);
+					else {
+						this.logger?.debug(`Index ${vectorIndexName} already exists (type: ${existingIndexInfo.type}, metric: ${existingIndexInfo.metric}), preserving existing configuration`);
+						const cacheKey = await this.getIndexCacheKey({
+							indexName,
+							dimension,
+							type: existingIndexInfo.type,
+							metric: existingIndexInfo.metric,
+							vectorType: existingIndexInfo.vectorType
+						});
+						this.createdIndexes.set(indexName, cacheKey);
+						this.indexVectorTypes.set(indexName, existingIndexInfo.vectorType);
+						return;
+					}
 				}
 				let configMatches = existingIndexInfo.metric === metric && existingIndexInfo.type === indexType;
 				if (indexType === "hnsw") configMatches = configMatches && existingIndexInfo.config.m === (indexConfig.hnsw?.m ?? 8) && existingIndexInfo.config.efConstruction === (indexConfig.hnsw?.efConstruction ?? 32);
@@ -2945,19 +2949,13 @@ var PgDB = class extends MastraBase {
 		return filtered;
 	}
 	async hasColumn(table, column) {
-		const schema = this.schemaName || "public";
 		const snapshot = this.schemaSnapshot;
 		if (snapshot) {
 			const columns = snapshot.columns.get(table);
 			if (!columns) return false;
 			return columns.has(column) || columns.has(column.toLowerCase());
 		}
-		return !!await this.client.oneOrNone(`SELECT 1 FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND (column_name = $3 OR column_name = $4)`, [
-			schema,
-			table,
-			column,
-			column.toLowerCase()
-		]);
+		return await this.getColumnType(table, column) !== null;
 	}
 	/**
 	* Returns the Postgres data type of a column (e.g. `jsonb`, `json`, `text`),
@@ -2979,7 +2977,7 @@ var PgDB = class extends MastraBase {
 		const cached = this.columnTypeCache.get(table)?.get(column);
 		if (cached !== void 0) return cached;
 		const schema = this.schemaName || "public";
-		const dataType = (await this.client.oneOrNone(`SELECT data_type FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND (column_name = $3 OR column_name = $4)`, [
+		const dataType = (await this.client.oneOrNone(`SELECT data_type FROM information_schema.columns WHERE table_schema = $1 AND table_name = $2 AND (column_name = $3 OR column_name = $4) ORDER BY (column_name = $3) DESC LIMIT 1`, [
 			schema,
 			table,
 			column,
@@ -5368,15 +5366,19 @@ var BackgroundTasksPG = class BackgroundTasksPG extends BackgroundTasksStorage {
 			where += ` AND "status" = $${paramIdx++}`;
 			params.push(options.expectedStatus);
 		}
-		if (options?.expectedOwnerId !== void 0) if (options.expectedOwnerId === null) where += ` AND "ownerId" IS NULL`;
-		else {
-			where += ` AND "ownerId" = $${paramIdx++}`;
-			params.push(options.expectedOwnerId);
+		if (options?.expectedOwnerId !== void 0) {
+			if (options.expectedOwnerId === null) where += ` AND "ownerId" IS NULL`;
+			else {
+				where += ` AND "ownerId" = $${paramIdx++}`;
+				params.push(options.expectedOwnerId);
+			}
 		}
-		if (options?.expectedLeaseExpiresAt !== void 0) if (options.expectedLeaseExpiresAt === null) where += ` AND "leaseExpiresAtZ" IS NULL`;
-		else {
-			where += ` AND "leaseExpiresAtZ" = $${paramIdx++}`;
-			params.push(options.expectedLeaseExpiresAt.toISOString());
+		if (options?.expectedLeaseExpiresAt !== void 0) {
+			if (options.expectedLeaseExpiresAt === null) where += ` AND "leaseExpiresAtZ" IS NULL`;
+			else {
+				where += ` AND "leaseExpiresAtZ" = $${paramIdx++}`;
+				params.push(options.expectedLeaseExpiresAt.toISOString());
+			}
 		}
 		return ((await this.#db.client.query(`UPDATE ${table} SET ${setClauses.join(", ")} WHERE ${where}`, params)).rowCount ?? 0) > 0;
 	}
@@ -5674,9 +5676,10 @@ var ChannelsPG = class ChannelsPG extends ChannelsStorage {
 		await this.#db.clearTable({ tableName: TABLE_CHANNEL_CONFIG });
 	}
 	async saveInstallation(installation) {
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_CHANNEL_INSTALLATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		const now = (/* @__PURE__ */ new Date()).toISOString();
 		const createdAt = installation.createdAt?.toISOString() ?? now;
@@ -5707,47 +5710,53 @@ var ChannelsPG = class ChannelsPG extends ChannelsStorage {
 		]);
 	}
 	async getInstallation(id) {
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_CHANNEL_INSTALLATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		const row = await this.#db.readClient.oneOrNone(`SELECT * FROM ${tableName} WHERE "id" = $1`, [id]);
 		return row ? this.#parseInstallationRow(row) : null;
 	}
 	async getInstallationByAgent(platform, agentId) {
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_CHANNEL_INSTALLATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		const row = await this.#db.readClient.oneOrNone(`SELECT * FROM ${tableName} WHERE "platform" = $1 AND "agentId" = $2 ORDER BY CASE "status" WHEN 'active' THEN 0 WHEN 'pending' THEN 1 ELSE 2 END, "updatedAt" DESC LIMIT 1`, [platform, agentId]);
 		return row ? this.#parseInstallationRow(row) : null;
 	}
 	async getInstallationByWebhookId(webhookId) {
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_CHANNEL_INSTALLATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		const row = await this.#db.readClient.oneOrNone(`SELECT * FROM ${tableName} WHERE "webhookId" = $1`, [webhookId]);
 		return row ? this.#parseInstallationRow(row) : null;
 	}
 	async listInstallations(platform) {
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_CHANNEL_INSTALLATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		return (await this.#db.readClient.manyOrNone(`SELECT * FROM ${tableName} WHERE "platform" = $1 ORDER BY "createdAt" DESC`, [platform])).map((row) => this.#parseInstallationRow(row));
 	}
 	async deleteInstallation(id) {
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_CHANNEL_INSTALLATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		await this.#db.client.none(`DELETE FROM ${tableName} WHERE "id" = $1`, [id]);
 	}
 	async saveConfig(config) {
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_CHANNEL_CONFIG,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		const now = config.updatedAt.toISOString();
 		await this.#db.client.none(`INSERT INTO ${tableName} ("platform", "data", "updatedAt", "updatedAtZ")
@@ -5763,9 +5772,10 @@ var ChannelsPG = class ChannelsPG extends ChannelsStorage {
 		]);
 	}
 	async getConfig(platform) {
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_CHANNEL_CONFIG,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		const row = await this.#db.readClient.oneOrNone(`SELECT * FROM ${tableName} WHERE "platform" = $1`, [platform]);
 		if (!row) return null;
@@ -5776,9 +5786,10 @@ var ChannelsPG = class ChannelsPG extends ChannelsStorage {
 		};
 	}
 	async deleteConfig(platform) {
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_CHANNEL_CONFIG,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		await this.#db.client.none(`DELETE FROM ${tableName} WHERE "platform" = $1`, [platform]);
 	}
@@ -11696,10 +11707,11 @@ const DB_NOW_MS = `(EXTRACT(EPOCH FROM clock_timestamp()) * 1000)::bigint`;
 */
 async function assertRunFence(t, claimsTable, fence, operation) {
 	const row = await t.oneOrNone(`SELECT generation, "ownerId" FROM ${claimsTable} WHERE "runId" = $1 FOR SHARE`, [fence.runId]);
-	if (!matchesRunFence(row && {
+	const current = row && {
 		generation: Number(row.generation),
 		ownerId: row.ownerId
-	}, fence)) throw new RunFenceConflictError(fence, operation);
+	};
+	if (!matchesRunFence(current, fence)) throw new RunFenceConflictError(fence, operation);
 }
 /**
 * Runs `write` directly when it carries no fence, or in a transaction behind
@@ -14826,9 +14838,10 @@ var NotificationsPG = class NotificationsPG extends NotificationsStorage {
 	async updateNotificationRow(threadId, id, data) {
 		const entries = Object.entries(data).filter(([, value]) => value !== void 0);
 		if (entries.length === 0) return;
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_NOTIFICATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		const setColumns = entries.map(([key], index) => `"${parseSqlIdentifier(key, "column name")}" = $${index + 1}`);
 		const values = entries.map(([key, value]) => {
@@ -14927,9 +14940,10 @@ var NotificationsPG = class NotificationsPG extends NotificationsStorage {
 		}
 		const limit = input.limit ? ` LIMIT $${args.length + 1}` : "";
 		if (input.limit) args.push(input.limit);
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_NOTIFICATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		return (await this.#db.readClient.manyOrNone(`SELECT * FROM ${tableName} WHERE ${conditions.join(" AND ")} ORDER BY "updatedAt" DESC${limit}`, args)).map((row) => rowToNotification(row));
 	}
@@ -14950,9 +14964,10 @@ var NotificationsPG = class NotificationsPG extends NotificationsStorage {
 		}
 		const limit = input.limit ? ` LIMIT $${args.length + 1}` : "";
 		if (input.limit) args.push(input.limit);
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_NOTIFICATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		return (await this.#db.readClient.manyOrNone(`SELECT * FROM ${tableName} WHERE ${conditions.join(" AND ")} ORDER BY CASE WHEN "deliverAt" IS NULL THEN "summaryAt" WHEN "summaryAt" IS NULL THEN "deliverAt" WHEN "deliverAt" <= "summaryAt" THEN "deliverAt" ELSE "summaryAt" END ASC, "updatedAt" ASC${limit}`, args)).map((row) => rowToNotification(row));
 	}
@@ -14964,9 +14979,10 @@ var NotificationsPG = class NotificationsPG extends NotificationsStorage {
 	* lagging read replica cannot yield stale or missing rows mid-update.
 	*/
 	async #getNotification(client, input) {
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_NOTIFICATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		const row = await client.oneOrNone(`SELECT * FROM ${tableName} WHERE "threadId" = $1 AND "id" = $2 LIMIT 1`, [input.threadId, input.id]);
 		return row ? rowToNotification(row) : null;
@@ -15014,9 +15030,10 @@ var NotificationsPG = class NotificationsPG extends NotificationsStorage {
 		};
 		const columns = Object.keys(assignments);
 		const setClause = columns.map((column, index) => `"${parseSqlIdentifier(column, "column name")}" = $${index + 1}`).join(", ");
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_NOTIFICATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		return (await this.#db.client.manyOrNone(`UPDATE ${tableName} SET ${setClause} WHERE "threadId" = $${columns.length + 1} AND "id" = ANY($${columns.length + 2}::text[]) RETURNING *`, [
 			...Object.values(assignments),
@@ -15026,9 +15043,10 @@ var NotificationsPG = class NotificationsPG extends NotificationsStorage {
 	}
 	async findCoalescable(input) {
 		if (!input.dedupeKey && !input.coalesceKey) return void 0;
+		const schemaName = getSchemaName$5(this.#schema);
 		const tableName = getTableName$5({
 			indexName: TABLE_NOTIFICATIONS,
-			schemaName: getSchemaName$5(this.#schema)
+			schemaName
 		});
 		const row = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE "threadId" = $1 AND "source" = $2 AND "kind" = $3 AND "status" = $4 AND (("agentId" = $5::text) OR ("agentId" IS NULL AND $5::text IS NULL)) AND (("resourceId" = $6::text) OR ("resourceId" IS NULL AND $6::text IS NULL)) AND (($7::text IS NOT NULL AND "dedupeKey" = $7::text) OR ($8::text IS NOT NULL AND "coalesceKey" = $8::text)) ORDER BY "updatedAt" DESC LIMIT 1`, [
 			input.threadId,
@@ -15570,18 +15588,18 @@ var ObservabilityPG = class ObservabilityPG extends ObservabilityStorage {
 					case TraceStatus.RUNNING:
 						conditions.push(`r."endedAtZ" IS NULL AND r."error" IS NULL`);
 						break;
-					case TraceStatus.SUCCESS:
-						conditions.push(`r."endedAtZ" IS NOT NULL AND r."error" IS NULL`);
-						break;
+					case TraceStatus.SUCCESS: conditions.push(`r."endedAtZ" IS NOT NULL AND r."error" IS NULL`);
 				}
-				if (filters.hasChildError !== void 0) if (filters.hasChildError) conditions.push(`EXISTS (
+				if (filters.hasChildError !== void 0) {
+					if (filters.hasChildError) conditions.push(`EXISTS (
               SELECT 1 FROM ${tableName} c
               WHERE c."traceId" = r."traceId" AND c."error" IS NOT NULL
             )`);
-				else conditions.push(`NOT EXISTS (
+					else conditions.push(`NOT EXISTS (
               SELECT 1 FROM ${tableName} c
               WHERE c."traceId" = r."traceId" AND c."error" IS NOT NULL
             )`);
+				}
 			}
 			const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
 			const orderField = orderBy?.field ?? "startedAt";
@@ -16761,9 +16779,6 @@ function additiveColumns(schema) {
 		}
 	];
 }
-/** Existence probe for an additive column. Params: schema, table, column. */
-const columnExistsSQL = `SELECT 1 FROM information_schema.columns
-   WHERE table_schema = $1 AND table_name = $2 AND column_name = $3`;
 /** Index CREATEs. Safe to run repeatedly. */
 function allIndexDDL(schema) {
 	return tableIndexes().map((spec) => indexDDL(schema, spec));
@@ -16771,7 +16786,7 @@ function allIndexDDL(schema) {
 //#endregion
 //#region src/storage/domains/observability/v-next/discovery.ts
 const DEFAULT_TTL_SECONDS = 300;
-const DEFAULT_LOOKBACK_SECONDS = 720 * 60 * 60;
+const DEFAULT_LOOKBACK_SECONDS = 2592e3;
 /** All signal tables that contain a column. Used by cross-signal discovery. */
 const SIGNAL_TABLES_WITH_CONTEXT = [
 	TABLE_SPAN_EVENTS,
@@ -18016,7 +18031,7 @@ function shiftRange(range, period) {
 			offset = 864e5;
 			break;
 		case "previous_week":
-			offset = 7 * 864e5;
+			offset = 6048e5;
 			break;
 		default: offset = duration;
 	}
@@ -18136,12 +18151,14 @@ function pushFeedbackIdentity(acc, feedbackType, feedbackSource) {
 	acc.conditions.push(`"valueNumber" IS NOT NULL`);
 }
 async function createFeedback(client, schema, args) {
-	const insert = buildInsert(schema, TABLE_FEEDBACK_EVENTS, [feedbackRecordToRow(args.feedback)], FEEDBACK_UPSERT_CLAUSE);
+	const row = feedbackRecordToRow(args.feedback);
+	const insert = buildInsert(schema, TABLE_FEEDBACK_EVENTS, [row], FEEDBACK_UPSERT_CLAUSE);
 	if (insert) await client.query(insert.text, insert.values);
 }
 async function batchCreateFeedback(client, schema, args) {
 	if (args.feedbacks.length === 0) return;
-	const insert = buildInsert(schema, TABLE_FEEDBACK_EVENTS, [...new Map(args.feedbacks.map((feedback) => [feedback.feedbackId, feedback])).values()].map(feedbackRecordToRow), FEEDBACK_UPSERT_CLAUSE);
+	const rows = [...new Map(args.feedbacks.map((feedback) => [feedback.feedbackId, feedback])).values()].map(feedbackRecordToRow);
+	const insert = buildInsert(schema, TABLE_FEEDBACK_EVENTS, rows, FEEDBACK_UPSERT_CLAUSE);
 	if (insert) await client.query(insert.text, insert.values);
 }
 async function updateFeedbackReviewStatus(client, schema, args) {
@@ -18343,7 +18360,8 @@ function applyLogFilters(acc, filters) {
 }
 async function batchCreateLogs(client, schema, args) {
 	if (args.logs.length === 0) return;
-	const insert = buildInsert(schema, TABLE_LOG_EVENTS, args.logs.map(logRecordToRow));
+	const rows = args.logs.map(logRecordToRow);
+	const insert = buildInsert(schema, TABLE_LOG_EVENTS, rows);
 	if (insert) await client.query(insert.text, insert.values);
 }
 async function listLogs(client, schema, args) {
@@ -18418,7 +18436,8 @@ function pushMetricNameFilter(acc, names) {
 }
 async function batchCreateMetrics(client, schema, args) {
 	if (args.metrics.length === 0) return;
-	const insert = buildInsert(schema, TABLE_METRIC_EVENTS, args.metrics.map(metricRecordToRow));
+	const rows = args.metrics.map(metricRecordToRow);
+	const insert = buildInsert(schema, TABLE_METRIC_EVENTS, rows);
 	if (insert) await client.query(insert.text, insert.values);
 }
 async function listMetrics(client, schema, args) {
@@ -19222,6 +19241,7 @@ const TRACE_FIELDS = {
 	endedAt: "r.\"endedAt\"",
 	durationMs: durationMsSql("r.\"startedAt\"", "r.\"endedAt\""),
 	timeToFirstChunkMs: "r.\"timeToFirstChunkMs\"",
+	entityId: "r.\"entityId\"",
 	entityName: "r.\"entityName\"",
 	entityType: "r.\"entityType\"",
 	name: "r.\"name\"",
@@ -19523,6 +19543,7 @@ const ROOT_PUSHDOWN_FIELDS = /* @__PURE__ */ new Set([
 	"organizationId",
 	"startedAt",
 	"endedAt",
+	"entityId",
 	"entityName",
 	"entityType",
 	"name",
@@ -20393,7 +20414,7 @@ function predicateFields(predicate, fields = /* @__PURE__ */ new Set()) {
 	return fields;
 }
 function canUseThreadCandidates(probe) {
-	return Number(probe.threadCount) <= 16384 && Number(probe.traceCount) <= 1e5 && Number(probe.threadBytes) + Number(probe.traceBytes) <= 4 * 1024 * 1024;
+	return Number(probe.threadCount) <= 16384 && Number(probe.traceCount) <= 1e5 && Number(probe.threadBytes) + Number(probe.traceBytes) <= 4194304;
 }
 function compilePostgresThreadRowsQuery(schema, plan, strategy = "full") {
 	const values = [plan.timeRange.from, plan.timeRange.to];
@@ -20608,6 +20629,7 @@ const DIMENSION_SQL = {
 	entityName: "r.\"entityName\"",
 	name: "r.\"name\"",
 	spanType: "r.\"spanType\"",
+	entityId: "r.\"entityId\"",
 	environment: "r.\"environment\"",
 	status: TRACE_STATUS_SQL,
 	serviceName: "r.\"serviceName\"",
@@ -21035,9 +21057,7 @@ function buildListTracesFilters(filters, spanTable, nextParamIdx) {
 		case TraceStatus.RUNNING:
 			conditions.push(`r."isPending"`);
 			break;
-		case TraceStatus.SUCCESS:
-			conditions.push(`r."error" IS NULL AND NOT r."isPending"`);
-			break;
+		case TraceStatus.SUCCESS: conditions.push(`r."error" IS NULL AND NOT r."isPending"`);
 	}
 	if (filters.hasChildError !== void 0) {
 		const sub = `EXISTS (
@@ -21373,9 +21393,7 @@ function buildListBranchesFilters(filters, spanType, spanTable, nextParamIdx) {
 		case TraceStatus.RUNNING:
 			conditions.push(`r."isPending"`);
 			break;
-		case TraceStatus.SUCCESS:
-			conditions.push(`r."error" IS NULL AND NOT r."isPending"`);
-			break;
+		case TraceStatus.SUCCESS: conditions.push(`r."error" IS NULL AND NOT r."isPending"`);
 	}
 	return {
 		conditions,
@@ -21716,7 +21734,7 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			} catch (error) {
 				if (!isDuplicateRelationError(error)) throw error;
 			}
-			for (const { table, column, ddl } of additiveColumns(this.#schema)) if (!await this.#client.oneOrNone(columnExistsSQL, [
+			for (const { table, column, ddl } of additiveColumns(this.#schema)) if (!await this.#client.oneOrNone("SELECT 1 FROM information_schema.columns\n   WHERE table_schema = $1 AND table_name = $2 AND column_name = $3", [
 				this.#schema,
 				table,
 				column
@@ -21842,7 +21860,8 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"feedback",
 			"trace-query-context-ids",
 			...timeToFirstChunkFeatures,
-			"trace-query-root-span-fields"
+			"trace-query-root-span-fields",
+			"trace-query-root-entity-id"
 		];
 		return [
 			"metrics",
@@ -21865,7 +21884,8 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"feedback",
 			"trace-query-context-ids",
 			...timeToFirstChunkFeatures,
-			"trace-query-root-span-fields"
+			"trace-query-root-span-fields",
+			"trace-query-root-entity-id"
 		];
 	}
 	async #run(op, fn, details) {
@@ -22882,15 +22902,19 @@ var SchedulesPG = class SchedulesPG extends SchedulesStorage {
 			params.push(filter.workflowId);
 			conditions.push(`target->>'workflowId' = $${params.length}`);
 		}
-		if (filter?.ownerType !== void 0) if (filter.ownerType === null) conditions.push("owner_type IS NULL");
-		else {
-			params.push(filter.ownerType);
-			conditions.push(`owner_type = $${params.length}`);
+		if (filter?.ownerType !== void 0) {
+			if (filter.ownerType === null) conditions.push("owner_type IS NULL");
+			else {
+				params.push(filter.ownerType);
+				conditions.push(`owner_type = $${params.length}`);
+			}
 		}
-		if (filter?.ownerId !== void 0) if (filter.ownerId === null) conditions.push("owner_id IS NULL");
-		else {
-			params.push(filter.ownerId);
-			conditions.push(`owner_id = $${params.length}`);
+		if (filter?.ownerId !== void 0) {
+			if (filter.ownerId === null) conditions.push("owner_id IS NULL");
+			else {
+				params.push(filter.ownerId);
+				conditions.push(`owner_id = $${params.length}`);
+			}
 		}
 		const where = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
 		return (await this.#readClient.manyOrNone(`SELECT * FROM ${this.#table(TABLE_SCHEDULES)} ${where} ORDER BY created_at ASC`, params)).map(rowToSchedule);
@@ -26000,16 +26024,20 @@ var WorkflowsPG = class WorkflowsPG extends WorkflowsStorage {
 				values.push(status);
 				paramIndex++;
 			}
-			if (resourceId) if (await this.#db.hasColumn(TABLE_WORKFLOW_SNAPSHOT, "resourceId")) {
-				conditions.push(`"resourceId" = $${paramIndex}`);
-				values.push(resourceId);
-				paramIndex++;
-			} else this.logger?.warn?.(`[${TABLE_WORKFLOW_SNAPSHOT}] resourceId column not found. Skipping resourceId filter.`);
-			if (threadId) if (await this.#db.getColumnType(TABLE_WORKFLOW_SNAPSHOT, "snapshot") === "jsonb") {
-				conditions.push(`${WORKFLOW_SNAPSHOT_THREAD_ID_EXPR} = $${paramIndex}`);
-				values.push(threadId);
-				paramIndex++;
-			} else this.logger?.warn?.(`[${TABLE_WORKFLOW_SNAPSHOT}] snapshot column is not jsonb. Skipping threadId filter.`);
+			if (resourceId) {
+				if (await this.#db.hasColumn(TABLE_WORKFLOW_SNAPSHOT, "resourceId")) {
+					conditions.push(`"resourceId" = $${paramIndex}`);
+					values.push(resourceId);
+					paramIndex++;
+				} else this.logger?.warn?.(`[${TABLE_WORKFLOW_SNAPSHOT}] resourceId column not found. Skipping resourceId filter.`);
+			}
+			if (threadId) {
+				if (await this.#db.getColumnType(TABLE_WORKFLOW_SNAPSHOT, "snapshot") === "jsonb") {
+					conditions.push(`${WORKFLOW_SNAPSHOT_THREAD_ID_EXPR} = $${paramIndex}`);
+					values.push(threadId);
+					paramIndex++;
+				} else this.logger?.warn?.(`[${TABLE_WORKFLOW_SNAPSHOT}] snapshot column is not jsonb. Skipping threadId filter.`);
+			}
 			if (fromDate) {
 				conditions.push(`"createdAt" >= $${paramIndex}`);
 				values.push(fromDate);