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

package/dist/index.js

@@ -4443,7 +4443,8 @@ var AgentsPG = class AgentsPG extends AgentsStorage {
 				"skillsFormat",
 				"durable",
 				"browser",
-				"toolProviders"
+				"toolProviders",
+				"modelList"
 			]
 		});
 		await this.#migrateToolsToJsonbFormat();
@@ -4501,10 +4502,10 @@ var AgentsPG = class AgentsPG extends AgentsStorage {
 				row.updatedAt ?? now
 			]);
 			await this.#db.client.none(`INSERT INTO ${fullVersionsTableName}
-         (id, "agentId", "versionNumber", name, description, instructions, model, tools,
+         (id, "agentId", "versionNumber", name, description, instructions, model, "modelList", tools,
           "defaultOptions", workflows, agents, "integrationTools", "toolProviders", "inputProcessors",
           "outputProcessors", memory, scorers, "changedFields", "changeMessage", "createdAt")
-         VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20)
+         VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21)
          ON CONFLICT (id) DO NOTHING`, [
 				versionId,
 				agentId,
@@ -4513,6 +4514,7 @@ var AgentsPG = class AgentsPG extends AgentsStorage {
 				row.description ?? null,
 				this.serializeInstructions(row.instructions ?? ""),
 				row.model ? toPgJson(row.model) : "{}",
+				row.modelList ? toPgJson(row.modelList) : null,
 				row.tools ? toPgJson(row.tools) : null,
 				row.defaultOptions ? toPgJson(row.defaultOptions) : null,
 				row.workflows ? toPgJson(row.workflows) : null,
@@ -4926,21 +4928,22 @@ var AgentsPG = class AgentsPG extends AgentsStorage {
 			const nowIso = (/* @__PURE__ */ new Date()).toISOString();
 			const row = await this.#db.client.one(`INSERT INTO ${tableName} (
           id, "agentId", "versionNumber",
-          name, description, instructions, model, tools,
+          name, description, instructions, model, "modelList", tools,
           "defaultOptions", workflows, agents, "integrationTools", "toolProviders",
           "inputProcessors", "outputProcessors", memory, scorers,
           "mcpClients", "requestContextSchema", workspace, skills, "skillsFormat",
           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) RETURNING *`, [
+        ) 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, $29) RETURNING *`, [
 				input.id,
 				input.agentId,
 				input.versionNumber,
 				input.name,
 				input.description ?? null,
-				this.serializeInstructions(input.instructions),
-				toPgJson(input.model),
+				this.serializeInstructions(input.instructions) ?? "",
+				toPgJson(input.model ?? {}),
+				input.modelList ? toPgJson(input.modelList) : null,
 				input.tools ? toPgJson(input.tools) : null,
 				input.defaultOptions ? toPgJson(input.defaultOptions) : null,
 				input.workflows ? toPgJson(input.workflows) : null,
@@ -5186,6 +5189,7 @@ var AgentsPG = class AgentsPG extends AgentsStorage {
 			description: row.description,
 			instructions: this.deserializeInstructions(row.instructions),
 			model: parseJsonResilient(row.model, "model"),
+			modelList: parseJsonResilient(row.modelList, "modelList"),
 			tools: parseJsonResilient(row.tools, "tools"),
 			defaultOptions: parseJsonResilient(row.defaultOptions, "defaultOptions"),
 			workflows: parseJsonResilient(row.workflows, "workflows"),
@@ -8643,13 +8647,23 @@ function createKnowledgePagesCoreLoader(features, loadStorageModule) {
 	};
 }
 /**
-* Keyword-search words: the query split on whitespace, lowercased, deduplicated. Every word must
-* appear (as a case-insensitive substring) in a hit; an empty list means the search returns nothing.
+* Keyword-search words: the query split on whitespace, lowercased, deduplicated. A hit needs at
+* least one of them (as a case-insensitive substring); an empty list means the search returns nothing.
 */
 function knowledgeSearchWords(query) {
 	return [...new Set(query.toLowerCase().split(/\s+/).filter(Boolean))];
 }
 /**
+* Points one matched search word earns on a page, by the best field it appears in: name, then
+* description, then body. Pages rank by how many query words they match first; these points only
+* break ties between pages that match the same number of words.
+*/
+const KNOWLEDGE_SEARCH_WEIGHTS = {
+	name: 3,
+	description: 2,
+	body: 1
+};
+/**
 * Why `key` can't be a Knowledge page key, or undefined when it can. Keys are one path segment:
 * non-empty, with no `/` (path separator), `#` (scope/path separator) or `%` (escape character).
 */
@@ -9527,6 +9541,18 @@ var PgKnowledgePages = class {
 		const rows = await this.#rows(this.#client, `SELECT ${this.#noteColumns()} FROM ${this.#visibleNotes(filter)} AND ${extra.join(" AND ")} ORDER BY n."createdAt", n."id" LIMIT ${limit + 1}`, params.values);
 		return this.#noteOutput(rows, limit);
 	}
+	async countChildPages(input) {
+		const ids = [...new Set(input.parentIds)];
+		const counts = Object.fromEntries(ids.map((id) => [id, 0]));
+		if (!ids.length) return counts;
+		const params = new Params();
+		const filter = new ReadFilter(input.read, params, this.#pages);
+		const rows = await this.#rows(this.#client, `SELECT p."parentId" AS "parentId", count(*)::int AS "count" FROM ${this.#pages} p JOIN ${this.#pages} s ON s."id" = p."scopeId"
+       WHERE p."parentId" = ANY(${params.add(ids)}::text[]) AND NOT p."isScope" AND p."deletedAt" IS NULL AND ${filter.readable("s")}
+       GROUP BY p."parentId"`, params.values);
+		for (const row of rows) counts[row.parentId] = Number(row.count);
+		return counts;
+	}
 	async countNotes(input) {
 		const ids = [...new Set(input.pageIds)];
 		const counts = Object.fromEntries(ids.map((id) => [id, 0]));
@@ -9694,9 +9720,12 @@ var PgKnowledgePages = class {
 				filter.readable("s")
 			];
 			if (input.scopeIds?.length) where.push(`p."scopeId" = ANY(${params.add(input.scopeIds)}::text[])`);
-			for (const pattern of patterns) where.push(`(p."name" ILIKE ${pattern} OR p."description" ILIKE ${pattern} OR p."body" ILIKE ${pattern})`);
-			const tier = `CASE WHEN p."canonicalName" LIKE ${phrasePattern} THEN 0 WHEN ${patterns.map((pattern) => `p."name" ILIKE ${pattern}`).join(" AND ")} THEN 1 ELSE 2 END`;
-			const rows = await this.#rows(this.#client, `SELECT p.* FROM ${this.#pages} p JOIN ${this.#pages} s ON s."id" = p."scopeId" WHERE ${where.join(" AND ")} ORDER BY ${tier}, p."updatedAt" DESC, p."id" ASC LIMIT ${limit}`, params.values);
+			const anyField = patterns.map((pattern) => `(p."name" ILIKE ${pattern} OR p."description" ILIKE ${pattern} OR p."body" ILIKE ${pattern})`).join(" OR ");
+			where.push(`(${anyField})`);
+			const score = patterns.map((pattern) => `(CASE WHEN p."name" ILIKE ${pattern} THEN ${KNOWLEDGE_SEARCH_WEIGHTS.name} WHEN p."description" ILIKE ${pattern} THEN ${KNOWLEDGE_SEARCH_WEIGHTS.description} WHEN p."body" ILIKE ${pattern} THEN ${KNOWLEDGE_SEARCH_WEIGHTS.body} ELSE 0 END)`).join(" + ");
+			const count = patterns.map((pattern) => `(CASE WHEN p."name" ILIKE ${pattern} OR p."description" ILIKE ${pattern} OR p."body" ILIKE ${pattern} THEN 1 ELSE 0 END)`).join(" + ");
+			const tier = `CASE WHEN p."canonicalName" LIKE ${phrasePattern} THEN 0 ELSE 1 END`;
+			const rows = await this.#rows(this.#client, `SELECT p.* FROM ${this.#pages} p JOIN ${this.#pages} s ON s."id" = p."scopeId" WHERE ${where.join(" AND ")} ORDER BY ${tier}, (${count}) DESC, (${score}) DESC, p."updatedAt" DESC, p."id" ASC LIMIT ${limit}`, params.values);
 			for (const row of rows) hits.push({
 				type: "page",
 				page: toPage(row)
@@ -9708,8 +9737,10 @@ var PgKnowledgePages = class {
 			const filter = new ReadFilter(input.read, params, this.#pages);
 			const extra = [`n."deletedAt" IS NULL`, `np."deletedAt" IS NULL`];
 			if (input.scopeIds?.length) extra.push(`np."scopeId" = ANY(${params.add(input.scopeIds)}::text[])`);
-			for (const word of words) extra.push(`n."text" ILIKE ${params.add(`%${escapeLike(word)}%`)}`);
-			const rows = await this.#rows(this.#client, `SELECT ${this.#noteColumns()}, row_to_json(np) AS "pageJson" FROM ${this.#visibleNotes(filter)} AND ${extra.join(" AND ")} ORDER BY n."updatedAt" DESC, n."id" DESC LIMIT ${limit - hits.length}`, params.values);
+			const noteHas = words.map((word) => `n."text" ILIKE ${params.add(`%${escapeLike(word)}%`)}`);
+			extra.push(`(${noteHas.join(" OR ")})`);
+			const noteScore = noteHas.map((has) => `(CASE WHEN ${has} THEN 1 ELSE 0 END)`).join(" + ");
+			const rows = await this.#rows(this.#client, `SELECT ${this.#noteColumns()}, row_to_json(np) AS "pageJson" FROM ${this.#visibleNotes(filter)} AND ${extra.join(" AND ")} ORDER BY (${noteScore}) DESC, n."updatedAt" DESC, n."id" DESC LIMIT ${limit - hits.length}`, params.values);
 			for (const row of rows) hits.push({
 				type: "note",
 				note: toNote(row),
@@ -10053,6 +10084,9 @@ var KnowledgePG = class extends KnowledgeStorage {
 	listNotes(input) {
 		return this.#pages.listNotes(input);
 	}
+	countChildPages(input) {
+		return this.#pages.countChildPages(input);
+	}
 	countNotes(input) {
 		return this.#pages.countNotes(input);
 	}
@@ -19002,6 +19036,8 @@ const timeToFirstTokenSortSupported = coreStorage.TRACE_QUERY_ORDER_FIELDS?.incl
 const spanQueryOutcomeFieldsSupported = "outcome" in (coreStorage.SPAN_QUERY_FIELD_REGISTRY ?? {});
 const traceQueryOutcomeFieldsSupported = "outcome" in (coreStorage.TRACE_QUERY_FIELD_REGISTRY?.trace ?? {});
 const outcomeFeatures = [...spanQueryOutcomeFieldsSupported ? ["span-query-outcome-fields"] : [], ...traceQueryOutcomeFieldsSupported ? ["trace-query-outcome-fields"] : []];
+/** Core before the fields rejects their trace and span predicates, so the feature is only declared when core plans them. */
+const contextFieldFeatures = "requestId" in (coreStorage.TRACE_QUERY_FIELD_REGISTRY?.trace ?? {}) ? ["trace-query-context-fields"] : [];
 const timingFeatures = [
 	...timeToFirstChunkSupported ? ["trace-query-time-to-first-chunk"] : [],
 	...timeToFirstChunkSortSupported ? ["trace-query-time-to-first-chunk-sort"] : [],
@@ -19036,6 +19072,9 @@ const TRACE_FIELDS = {
 	sessionId: "r.\"sessionId\"",
 	userId: "r.\"userId\"",
 	organizationId: "r.\"organizationId\"",
+	requestId: "r.\"requestId\"",
+	serviceName: "r.\"serviceName\"",
+	experimentId: "r.\"experimentId\"",
 	startedAt: "r.\"startedAt\"",
 	endedAt: "r.\"endedAt\"",
 	durationMs: durationMsSql("r.\"startedAt\"", "r.\"endedAt\""),
@@ -19075,7 +19114,10 @@ const SPAN_FIELDS = {
 	runId: "s.\"runId\"",
 	sessionId: "s.\"sessionId\"",
 	userId: "s.\"userId\"",
-	organizationId: "s.\"organizationId\""
+	organizationId: "s.\"organizationId\"",
+	requestId: "s.\"requestId\"",
+	serviceName: "s.\"serviceName\"",
+	experimentId: "s.\"experimentId\""
 };
 const SPAN_QUERY_FIELDS = {
 	...SPAN_FIELDS,
@@ -19084,9 +19126,6 @@ const SPAN_QUERY_FIELDS = {
 	parentSpanId: "s.\"parentSpanId\"",
 	threadId: "s.\"threadId\"",
 	resourceId: "s.\"resourceId\"",
-	requestId: "s.\"requestId\"",
-	serviceName: "s.\"serviceName\"",
-	experimentId: "s.\"experimentId\"",
 	environment: "s.\"environment\"",
 	executionSource: "s.\"executionSource\"",
 	parentEntityType: "s.\"parentEntityType\"",
@@ -19350,6 +19389,9 @@ const ROOT_PUSHDOWN_FIELDS = /* @__PURE__ */ new Set([
 	"sessionId",
 	"userId",
 	"organizationId",
+	"requestId",
+	"serviceName",
+	"experimentId",
 	"startedAt",
 	"endedAt",
 	"entityId",
@@ -19521,7 +19563,10 @@ function compilePostgresTraceScope(schema, selection, relationCollections, scope
       s."runId",
       s."sessionId",
       s."userId",
-      s."organizationId"
+      s."organizationId",
+      s."requestId",
+      s."serviceName",
+      s."experimentId"
     FROM ${spanTable} s
     WHERE s."traceId" IS NOT NULL
       AND s."traceId" IN (SELECT "traceId" FROM root_scope)
@@ -21788,6 +21833,7 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"trace-query-tenant-scope",
 			"feedback",
 			"trace-query-context-ids",
+			...contextFieldFeatures,
 			...timingFeatures,
 			...outcomeFeatures,
 			"trace-query-root-span-fields",
@@ -21815,6 +21861,7 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"trace-query-tenant-scope",
 			"feedback",
 			"trace-query-context-ids",
+			...contextFieldFeatures,
 			...timingFeatures,
 			...outcomeFeatures,
 			"trace-query-root-span-fields",