@mastra/mysql 0.16.0-alpha.0 → 0.16.0-alpha.2

package/dist/index.js

@@ -851,6 +851,7 @@ var AgentsMySQL = class AgentsMySQL extends AgentsStorage {
 			tableName: TABLE_AGENT_VERSIONS,
 			schema: AGENT_VERSIONS_SCHEMA,
 			ifNotExists: [
+				"modelList",
 				"mcpClients",
 				"requestContextSchema",
 				"workspace",
@@ -1132,8 +1133,9 @@ var AgentsMySQL = class AgentsMySQL extends AgentsStorage {
 					versionNumber: input.versionNumber,
 					name: input.name ?? null,
 					description: input.description ?? null,
-					instructions: this.serializeInstructions(input.instructions),
-					model: input.model,
+					instructions: this.serializeInstructions(input.instructions ?? ""),
+					model: input.model ?? {},
+					modelList: input.modelList ?? null,
 					tools: input.tools ?? null,
 					defaultOptions: input.defaultOptions ?? null,
 					workflows: input.workflows ?? null,
@@ -1350,6 +1352,7 @@ var AgentsMySQL = class AgentsMySQL extends AgentsStorage {
 			description: row.description ?? void 0,
 			instructions: this.deserializeInstructions(row.instructions),
 			model: this.safeParseJSON(row.model),
+			modelList: this.safeParseJSON(row.modelList),
 			tools: this.safeParseJSON(row.tools),
 			defaultOptions: this.safeParseJSON(row.defaultOptions),
 			workflows: this.safeParseJSON(row.workflows),
@@ -3154,7 +3157,7 @@ var ExperimentsMySQL = class ExperimentsMySQL extends ExperimentsStorage {
 			let purgeMetadata = null;
 			if (datasetId) {
 				await connection.execute(`SELECT ${quoteIdentifier("id", "column name")} FROM ${formatTableName(TABLE_DATASETS)} WHERE ${quoteIdentifier("id", "column name")} = ? FOR UPDATE`, [datasetId]);
-				const [itemRows] = await connection.execute(`SELECT ${quoteIdentifier("metadata", "column name")} FROM ${formatTableName(TABLE_DATASET_ITEMS)} WHERE ${quoteIdentifier("id", "column name")} = ? AND ${quoteIdentifier("datasetId", "column name")} = ?`, [itemId, datasetId]);
+				const [itemRows] = await connection.execute(`SELECT ${quoteIdentifier("metadata", "column name")} FROM ${formatTableName(TABLE_DATASET_ITEMS)} WHERE ${quoteIdentifier("id", "column name")} = ? AND ${quoteIdentifier("datasetId", "column name")} = ? FOR UPDATE`, [itemId, datasetId]);
 				if (Array.isArray(itemRows)) {
 					const purgedRow = itemRows.find((row) => parseJSON$2(row.metadata)?.__purged === true);
 					purgeMetadata = purgedRow ? parseJSON$2(purgedRow.metadata) ?? null : null;
@@ -4318,13 +4321,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).
 */
@@ -4555,6 +4568,13 @@ function isRetryableRace(error) {
 	}
 	return false;
 }
+function isLiveKeyClash(error) {
+	for (let current = error; current && typeof current === "object"; current = current.cause) {
+		const { code, errno, message } = current;
+		if ((code === "ER_DUP_ENTRY" || errno === 1062) && String(message).includes("idx_kpages_live_key")) return true;
+	}
+	return false;
+}
 function escapeLike(value) {
 	return value.replace(/[=%_]/g, (match) => `=${match}`);
 }
@@ -5008,7 +5028,12 @@ var MySQLKnowledgePages = class {
 	}
 	async createPage(input) {
 		await assertKnowledgePageDescriptionWithinBound(input.description);
-		return this.#transaction((tx) => this.#insertPage(tx, input));
+		try {
+			return await this.#transaction((tx) => this.#insertPage(tx, input));
+		} catch (error) {
+			if (input.key !== void 0 && isLiveKeyClash(error)) throw new (await (loadPagesCore())).KnowledgePageKeyConflictError(input.key, input.parentId);
+			throw error;
+		}
 	}
 	async updatePage(input) {
 		const core = await loadPagesCore();
@@ -5261,6 +5286,15 @@ var MySQLKnowledgePages = class {
 		const rows = await this.#query(this.#read, `SELECT n.* FROM ${T.notes} n WHERE n.pageId = ?${input.includeDeleted ? "" : " AND n.deletedAt IS NULL"} AND ${readable.sql}${after} ORDER BY n.createdAt, n.id LIMIT ?`, args);
 		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 === 0) return counts;
+		const readable = pageReadable("p", input.read);
+		const rows = await this.#query(this.#read, `SELECT p.parentId AS parentId, COUNT(*) AS total FROM ${T.pages} p WHERE p.parentId IN ${JV} AND p.isScope = 0 AND p.deletedAt IS NULL AND ${readable.sql} GROUP BY p.parentId`, [jsonList(ids), ...readable.args]);
+		for (const row of rows) counts[String(row.parentId)] = Number(row.total);
+		return counts;
+	}
 	async countNotes(input) {
 		const ids = [...new Set(input.pageIds)];
 		const counts = Object.fromEntries(ids.map((id) => [id, 0]));
@@ -5432,18 +5466,22 @@ var MySQLKnowledgePages = class {
 		const readable = pagesInReadableScopes("p", input.read);
 		const scopeFilter = input.scopeIds ? ` AND p.scopeId IN ${JV}` : "";
 		const scopeArgs = input.scopeIds ? [jsonList(input.scopeIds)] : [];
-		const pageMatch = words.map(() => `(LOWER(p.name) LIKE ? ESCAPE '=' OR LOWER(COALESCE(p.description, '')) LIKE ? ESCAPE '=' OR LOWER(COALESCE(p.body, '')) LIKE ? ESCAPE '=')`).join(" AND ");
-		const nameMatch = words.map(() => `LOWER(p.name) LIKE ? ESCAPE '='`).join(" AND ");
-		const hits = (await this.#query(this.#read, `SELECT p.* ${readable.sql} WHERE p.deletedAt IS NULL AND p.isScope = 0${scopeFilter} AND ${pageMatch} ORDER BY CASE WHEN LOCATE(?, p.canonicalName) > 0 THEN 0 WHEN ${nameMatch} THEN 1 ELSE 2 END, p.updatedAt DESC, p.id ASC LIMIT ?`, [
+		const field = (column) => `LOWER(COALESCE(${column}, '')) LIKE ? ESCAPE '='`;
+		const pageMatch = words.map(() => `(${field("p.name")} OR ${field("p.description")} OR ${field("p.body")})`).join(" OR ");
+		const pageScore = words.map(() => `(CASE WHEN ${field("p.name")} THEN ${KNOWLEDGE_SEARCH_WEIGHTS.name} WHEN ${field("p.description")} THEN ${KNOWLEDGE_SEARCH_WEIGHTS.description} WHEN ${field("p.body")} THEN ${KNOWLEDGE_SEARCH_WEIGHTS.body} ELSE 0 END)`).join(" + ");
+		const pageCount = words.map(() => `(CASE WHEN ${field("p.name")} OR ${field("p.description")} OR ${field("p.body")} THEN 1 ELSE 0 END)`).join(" + ");
+		const triple = likes.flatMap((like) => [
+			like,
+			like,
+			like
+		]);
+		const hits = (await this.#query(this.#read, `SELECT p.* ${readable.sql} WHERE p.deletedAt IS NULL AND p.isScope = 0${scopeFilter} AND (${pageMatch}) ORDER BY CASE WHEN LOCATE(?, p.canonicalName) > 0 THEN 0 ELSE 1 END, (${pageCount}) DESC, (${pageScore}) DESC, p.updatedAt DESC, p.id ASC LIMIT ?`, [
 			...readable.args,
 			...scopeArgs,
-			...likes.flatMap((like) => [
-				like,
-				like,
-				like
-			]),
+			...triple,
 			phrase,
-			...likes,
+			...triple,
+			...triple,
 			limit
 		])).map((row) => ({
 			type: "page",
@@ -5451,11 +5489,12 @@ var MySQLKnowledgePages = class {
 		}));
 		if (hits.length >= limit) return hits;
 		const noteVisible = noteReadable("n", input.read);
-		const noteMatch = words.map(() => `LOWER(n.text) LIKE ? ESCAPE '='`).join(" AND ");
-		const noteRows = await this.#query(this.#read, `SELECT n.* FROM ${T.notes} n JOIN ${T.pages} p ON p.id = n.pageId WHERE n.deletedAt IS NULL AND p.deletedAt IS NULL${scopeFilter} AND ${noteMatch} AND ${noteVisible.sql} ORDER BY n.updatedAt DESC, n.id DESC LIMIT ?`, [
+		const noteHas = words.map(() => `LOWER(n.text) LIKE ? ESCAPE '='`);
+		const noteRows = await this.#query(this.#read, `SELECT n.* FROM ${T.notes} n JOIN ${T.pages} p ON p.id = n.pageId WHERE n.deletedAt IS NULL AND p.deletedAt IS NULL${scopeFilter} AND (${noteHas.join(" OR ")}) AND ${noteVisible.sql} ORDER BY (${noteHas.map((has) => `(CASE WHEN ${has} THEN 1 ELSE 0 END)`).join(" + ")}) DESC, n.updatedAt DESC, n.id DESC LIMIT ?`, [
 			...scopeArgs,
 			...likes,
 			...noteVisible.args,
+			...likes,
 			limit - hits.length
 		]);
 		const notes = await this.#hydrateNotes(this.#read, noteRows);
@@ -5788,6 +5827,9 @@ var KnowledgeMySQL = class extends KnowledgeStorage {
 	listNotes(input) {
 		return this.#pages.listNotes(input);
 	}
+	countChildPages(input) {
+		return this.#pages.countChildPages(input);
+	}
 	countNotes(input) {
 		return this.#pages.countNotes(input);
 	}