@mastra/pg 1.10.1-alpha.2 → 1.11.0-alpha.0

package/dist/index.cjs

@@ -2038,6 +2038,7 @@ var PoolAdapter = class {
   constructor($pool) {
     this.$pool = $pool;
   }
+  $pool;
   connect() {
     return this.$pool.connect();
   }
@@ -2106,6 +2107,7 @@ var TransactionClient = class {
   constructor(client) {
     this.client = client;
   }
+  client;
   async none(query, values) {
     await this.client.query(query, values);
     return null;
@@ -3543,12 +3545,12 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
     await this.#db.alterTable({
       tableName: storage.TABLE_AGENTS,
       schema: storage.TABLE_SCHEMAS[storage.TABLE_AGENTS],
-      ifNotExists: ["status", "authorId"]
+      ifNotExists: ["status", "authorId", "visibility", "favoriteCount"]
     });
     await this.#db.alterTable({
       tableName: storage.TABLE_AGENT_VERSIONS,
       schema: storage.TABLE_SCHEMAS[storage.TABLE_AGENT_VERSIONS],
-      ifNotExists: ["mcpClients", "requestContextSchema", "workspace", "skills", "skillsFormat"]
+      ifNotExists: ["mcpClients", "requestContextSchema", "workspace", "skills", "skillsFormat", "browser"]
     });
     await this.#migrateToolsToJsonbFormat();
     await this.createDefaultIndexes();
@@ -3689,14 +3691,28 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
     }
   }
   /**
-   * Removes stale draft agent records that have no activeVersionId.
+   * Removes stale draft agent records that have no versions at all.
    * These are left behind when createAgent partially fails (inserts thin record
    * but fails to create the version due to schema mismatch).
+   *
+   * A legitimate draft (never published) will have rows in the versions table,
+   * so we must only delete records with zero associated versions.
    */
   async #cleanupStaleDrafts() {
     try {
-      const fullTableName = getTableName2({ indexName: storage.TABLE_AGENTS, schemaName: getSchemaName2(this.#schema) });
-      await this.#db.client.none(`DELETE FROM ${fullTableName} WHERE status = 'draft' AND "activeVersionId" IS NULL`);
+      const agentsTable = getTableName2({ indexName: storage.TABLE_AGENTS, schemaName: getSchemaName2(this.#schema) });
+      const versionsTable = getTableName2({
+        indexName: storage.TABLE_AGENT_VERSIONS,
+        schemaName: getSchemaName2(this.#schema)
+      });
+      await this.#db.client.none(
+        `DELETE FROM ${agentsTable} a
+         WHERE a.status = 'draft'
+           AND a."activeVersionId" IS NULL
+           AND NOT EXISTS (
+             SELECT 1 FROM ${versionsTable} v WHERE v."agentId" = a.id
+           )`
+      );
     } catch {
     }
   }
@@ -3725,7 +3741,9 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
       status: row.status,
       activeVersionId: row.activeVersionId,
       authorId: row.authorId,
+      visibility: row.visibility ?? void 0,
       metadata: parseJsonResilient(row.metadata),
+      favoriteCount: row.favoriteCount === null || row.favoriteCount === void 0 ? 0 : Number(row.favoriteCount),
       createdAt: row.createdAtZ || row.createdAt,
       updatedAt: row.updatedAtZ || row.updatedAt
     };
@@ -3757,17 +3775,20 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
       const agentsTable = getTableName2({ indexName: storage.TABLE_AGENTS, schemaName: getSchemaName2(this.#schema) });
       const now = /* @__PURE__ */ new Date();
       const nowIso = now.toISOString();
+      const visibility = agent.visibility ?? (agent.authorId ? "private" : null);
       await this.#db.client.none(
         `INSERT INTO ${agentsTable} (
-          id, status, "authorId", metadata,
+          id, status, "authorId", visibility, metadata, "favoriteCount",
           "activeVersionId",
           "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
-        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)`,
         [
           agent.id,
           "draft",
           agent.authorId ?? null,
+          visibility,
           agent.metadata ? JSON.stringify(agent.metadata) : null,
+          0,
           null,
           // activeVersionId starts as null
           nowIso,
@@ -3776,7 +3797,7 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
           nowIso
         ]
       );
-      const { id: _id, authorId: _authorId, metadata: _metadata, ...snapshotConfig } = agent;
+      const { id: _id, authorId: _authorId, visibility: _visibility, metadata: _metadata, ...snapshotConfig } = agent;
       const versionId = crypto.randomUUID();
       await this.createVersion({
         id: versionId,
@@ -3791,7 +3812,9 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
         status: "draft",
         activeVersionId: void 0,
         authorId: agent.authorId,
+        visibility: visibility ?? void 0,
         metadata: agent.metadata,
+        favoriteCount: 0,
         createdAt: now,
         updatedAt: now
       };
@@ -3830,7 +3853,7 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
           details: { agentId: id }
         });
       }
-      const { authorId, activeVersionId, metadata, status } = updates;
+      const { authorId, activeVersionId, metadata, status, visibility } = updates;
       const setClauses = [];
       const values = [];
       let paramIndex = 1;
@@ -3846,6 +3869,10 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
         setClauses.push(`status = $${paramIndex++}`);
         values.push(status);
       }
+      if (visibility !== void 0) {
+        setClauses.push(`visibility = $${paramIndex++}`);
+        values.push(visibility);
+      }
       if (metadata !== void 0) {
         setClauses.push(`metadata = $${paramIndex++}`);
         values.push(JSON.stringify(metadata));
@@ -3902,7 +3929,18 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
     }
   }
   async list(args) {
-    const { page = 0, perPage: perPageInput, orderBy, authorId, metadata, status } = args || {};
+    const {
+      page = 0,
+      perPage: perPageInput,
+      orderBy,
+      authorId,
+      metadata,
+      status,
+      visibility,
+      entityIds,
+      pinFavoritedFor,
+      favoritedOnly
+    } = args || {};
     const { field, direction } = this.parseOrderBy(orderBy);
     if (page < 0) {
       throw new error.MastraError(
@@ -3918,26 +3956,58 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
     const perPage = storage.normalizePerPage(perPageInput, 100);
     const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
     try {
+      if (entityIds && entityIds.length === 0) {
+        return {
+          agents: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
       const tableName = getTableName2({ indexName: storage.TABLE_AGENTS, schemaName: getSchemaName2(this.#schema) });
+      const favoritesTable = getTableName2({ indexName: storage.TABLE_FAVORITES, schemaName: getSchemaName2(this.#schema) });
       const conditions = [];
       const queryParams = [];
       let paramIdx = 1;
+      const joinUserId = pinFavoritedFor;
+      const useJoin = Boolean(joinUserId);
+      let joinSqlIdx = null;
+      if (useJoin) {
+        joinSqlIdx = paramIdx++;
+      }
       if (status) {
-        conditions.push(`status = $${paramIdx++}`);
+        conditions.push(`a.status = $${paramIdx++}`);
         queryParams.push(status);
       }
       if (authorId !== void 0) {
-        conditions.push(`"authorId" = $${paramIdx++}`);
+        conditions.push(`a."authorId" = $${paramIdx++}`);
         queryParams.push(authorId);
       }
+      if (visibility !== void 0) {
+        conditions.push(`a.visibility = $${paramIdx++}`);
+        queryParams.push(visibility);
+      }
       if (metadata && Object.keys(metadata).length > 0) {
-        conditions.push(`metadata @> $${paramIdx++}::jsonb`);
+        conditions.push(`a.metadata @> $${paramIdx++}::jsonb`);
         queryParams.push(JSON.stringify(metadata));
       }
+      if (entityIds && entityIds.length > 0) {
+        const placeholders = entityIds.map(() => `$${paramIdx++}`).join(", ");
+        conditions.push(`a.id IN (${placeholders})`);
+        queryParams.push(...entityIds);
+      }
+      if (useJoin && favoritedOnly) {
+        conditions.push('s."userId" IS NOT NULL');
+      } else if (favoritedOnly) {
+        conditions.push("1=0");
+      }
+      const joinClause = useJoin && joinSqlIdx !== null ? `LEFT JOIN ${favoritesTable} s ON s."entityType" = 'agent' AND s."entityId" = a.id AND s."userId" = $${joinSqlIdx}` : "";
+      const joinParams = useJoin && joinUserId ? [joinUserId] : [];
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
       const countResult = await this.#db.client.one(
-        `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`,
-        queryParams
+        `SELECT COUNT(*) as count FROM ${tableName} a ${joinClause} ${whereClause}`,
+        [...joinParams, ...queryParams]
       );
       const total = parseInt(countResult.count, 10);
       if (total === 0) {
@@ -3949,10 +4019,19 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
           hasMore: false
         };
       }
+      const orderByParts = [];
+      if (useJoin) {
+        orderByParts.push(`(s."userId" IS NOT NULL) DESC`);
+      }
+      orderByParts.push(`a."${field}" ${direction}`);
+      orderByParts.push(`a."id" ASC`);
+      const orderByClause = `ORDER BY ${orderByParts.join(", ")}`;
       const limitValue = perPageInput === false ? total : perPage;
+      const limitIdx = paramIdx++;
+      const offsetIdx = paramIdx++;
       const dataResult = await this.#db.client.manyOrNone(
-        `SELECT * FROM ${tableName} ${whereClause} ORDER BY "${field}" ${direction} LIMIT $${paramIdx++} OFFSET $${paramIdx++}`,
-        [...queryParams, limitValue, offset]
+        `SELECT a.* FROM ${tableName} a ${joinClause} ${whereClause} ${orderByClause} LIMIT $${limitIdx} OFFSET $${offsetIdx}`,
+        [...joinParams, ...queryParams, limitValue, offset]
       );
       const agents = (dataResult || []).flatMap((row) => {
         try {
@@ -3996,9 +4075,10 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
           "defaultOptions", workflows, agents, "integrationTools",
           "inputProcessors", "outputProcessors", memory, scorers,
           "mcpClients", "requestContextSchema", workspace, skills, "skillsFormat",
+          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)`,
+        ) 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)`,
         [
           input.id,
           input.agentId,
@@ -4021,6 +4101,7 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
           input.workspace ? JSON.stringify(input.workspace) : null,
           input.skills ? JSON.stringify(input.skills) : null,
           input.skillsFormat ?? null,
+          input.browser ? JSON.stringify(input.browser) : null,
           input.changedFields ? JSON.stringify(input.changedFields) : null,
           input.changeMessage ?? null,
           nowIso,
@@ -4270,6 +4351,7 @@ var AgentsPG = class _AgentsPG extends storage.AgentsStorage {
       workspace: parseJsonResilient(row.workspace),
       skills: parseJsonResilient(row.skills),
       skillsFormat: row.skillsFormat,
+      browser: parseJsonResilient(row.browser),
       changedFields: parseJsonResilient(row.changedFields),
       changeMessage: row.changeMessage,
       createdAt: row.createdAtZ || row.createdAt
@@ -6421,6 +6503,250 @@ var ExperimentsPG = class _ExperimentsPG extends storage.ExperimentsStorage {
     await this.#db.clearTable({ tableName: storage.TABLE_EXPERIMENTS });
   }
 };
+var ENTITY_TABLE = {
+  agent: storage.TABLE_AGENTS,
+  skill: storage.TABLE_SKILLS
+};
+var FavoritesPG = class _FavoritesPG extends storage.FavoritesStorage {
+  #db;
+  #schema;
+  static MANAGED_TABLES = [storage.TABLE_FAVORITES];
+  constructor(config) {
+    super();
+    const { client, schemaName, skipDefaultIndexes } = resolvePgConfig(config);
+    this.#db = new PgDB({ client, schemaName, skipDefaultIndexes });
+    this.#schema = schemaName || "public";
+  }
+  static getExportDDL(schemaName) {
+    const statements = [];
+    for (const tableName of _FavoritesPG.MANAGED_TABLES) {
+      statements.push(
+        generateTableSQL({
+          tableName,
+          schema: storage.TABLE_SCHEMAS[tableName],
+          schemaName,
+          compositePrimaryKey: ["userId", "entityType", "entityId"],
+          includeAllConstraints: true
+        })
+      );
+    }
+    const fullFavoritesTable = getTableName2({ indexName: storage.TABLE_FAVORITES, schemaName: getSchemaName2(schemaName) });
+    statements.push(
+      `CREATE INDEX IF NOT EXISTS idx_favorites_entity ON ${fullFavoritesTable} ("entityType", "entityId")`
+    );
+    return statements;
+  }
+  async init() {
+    await this.#db.createTable({
+      tableName: storage.TABLE_FAVORITES,
+      schema: storage.TABLE_SCHEMAS[storage.TABLE_FAVORITES],
+      compositePrimaryKey: ["userId", "entityType", "entityId"]
+    });
+    const fullTableName = getTableName2({ indexName: storage.TABLE_FAVORITES, schemaName: getSchemaName2(this.#schema) });
+    await this.#db.client.none(
+      `CREATE INDEX IF NOT EXISTS idx_favorites_entity ON ${fullTableName} ("entityType", "entityId")`
+    );
+  }
+  async dangerouslyClearAll() {
+    const fullTableName = getTableName2({ indexName: storage.TABLE_FAVORITES, schemaName: getSchemaName2(this.#schema) });
+    const fullAgentsTable = getTableName2({ indexName: storage.TABLE_AGENTS, schemaName: getSchemaName2(this.#schema) });
+    const fullSkillsTable = getTableName2({ indexName: storage.TABLE_SKILLS, schemaName: getSchemaName2(this.#schema) });
+    await this.#db.client.tx(async (t) => {
+      await t.none(`DELETE FROM ${fullTableName}`);
+      await t.none(`UPDATE ${fullAgentsTable} SET "favoriteCount" = 0 WHERE "favoriteCount" > 0`);
+      await t.none(`UPDATE ${fullSkillsTable} SET "favoriteCount" = 0 WHERE "favoriteCount" > 0`);
+    });
+  }
+  async favorite(input) {
+    const { userId, entityType, entityId } = input;
+    const entityTable = ENTITY_TABLE[entityType];
+    const fullFavoritesTable = getTableName2({ indexName: storage.TABLE_FAVORITES, schemaName: getSchemaName2(this.#schema) });
+    const fullEntityTable = getTableName2({ indexName: entityTable, schemaName: getSchemaName2(this.#schema) });
+    try {
+      return await this.#db.client.tx(async (t) => {
+        const entityRow = await t.oneOrNone(`SELECT "favoriteCount" FROM ${fullEntityTable} WHERE id = $1`, [entityId]);
+        if (!entityRow) {
+          throw new error.MastraError({
+            id: storage.createStorageErrorId("PG", "FAVORITE", "ENTITY_NOT_FOUND"),
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            text: `${entityType} ${entityId} not found`,
+            details: { entityType, entityId }
+          });
+        }
+        const inserted = await t.oneOrNone(
+          `INSERT INTO ${fullFavoritesTable} ("userId", "entityType", "entityId", "createdAt", "createdAtZ")
+           VALUES ($1, $2, $3, $4, $5)
+           ON CONFLICT ("userId", "entityType", "entityId") DO NOTHING
+           RETURNING "userId"`,
+          [userId, entityType, entityId, (/* @__PURE__ */ new Date()).toISOString(), (/* @__PURE__ */ new Date()).toISOString()]
+        );
+        if (inserted) {
+          await t.none(
+            `UPDATE ${fullEntityTable} SET "favoriteCount" = COALESCE("favoriteCount", 0) + 1 WHERE id = $1`,
+            [entityId]
+          );
+        }
+        const after = await t.one(`SELECT "favoriteCount" FROM ${fullEntityTable} WHERE id = $1`, [entityId]);
+        const favoriteCount = Number(after.favoriteCount ?? 0);
+        return { favorited: true, favoriteCount };
+      });
+    } catch (error$1) {
+      if (error$1 instanceof error.MastraError) throw error$1;
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("PG", "FAVORITE", "FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { entityType, entityId }
+        },
+        error$1
+      );
+    }
+  }
+  async unfavorite(input) {
+    const { userId, entityType, entityId } = input;
+    const entityTable = ENTITY_TABLE[entityType];
+    const fullFavoritesTable = getTableName2({ indexName: storage.TABLE_FAVORITES, schemaName: getSchemaName2(this.#schema) });
+    const fullEntityTable = getTableName2({ indexName: entityTable, schemaName: getSchemaName2(this.#schema) });
+    try {
+      return await this.#db.client.tx(async (t) => {
+        const entityRow = await t.oneOrNone(`SELECT "favoriteCount" FROM ${fullEntityTable} WHERE id = $1`, [entityId]);
+        if (!entityRow) {
+          throw new error.MastraError({
+            id: storage.createStorageErrorId("PG", "UNFAVORITE", "ENTITY_NOT_FOUND"),
+            domain: error.ErrorDomain.STORAGE,
+            category: error.ErrorCategory.USER,
+            text: `${entityType} ${entityId} not found`,
+            details: { entityType, entityId }
+          });
+        }
+        const deleted = await t.oneOrNone(
+          `DELETE FROM ${fullFavoritesTable} WHERE "userId" = $1 AND "entityType" = $2 AND "entityId" = $3 RETURNING "userId"`,
+          [userId, entityType, entityId]
+        );
+        if (deleted) {
+          await t.none(
+            `UPDATE ${fullEntityTable} SET "favoriteCount" = GREATEST(COALESCE("favoriteCount", 0) - 1, 0) WHERE id = $1`,
+            [entityId]
+          );
+        }
+        const after = await t.one(`SELECT "favoriteCount" FROM ${fullEntityTable} WHERE id = $1`, [entityId]);
+        const favoriteCount = Number(after.favoriteCount ?? 0);
+        return { favorited: false, favoriteCount };
+      });
+    } catch (error$1) {
+      if (error$1 instanceof error.MastraError) throw error$1;
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("PG", "UNFAVORITE", "FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { entityType, entityId }
+        },
+        error$1
+      );
+    }
+  }
+  async isFavorited(input) {
+    const fullFavoritesTable = getTableName2({ indexName: storage.TABLE_FAVORITES, schemaName: getSchemaName2(this.#schema) });
+    try {
+      const result = await this.#db.client.oneOrNone(
+        `SELECT 1 FROM ${fullFavoritesTable} WHERE "userId" = $1 AND "entityType" = $2 AND "entityId" = $3 LIMIT 1`,
+        [input.userId, input.entityType, input.entityId]
+      );
+      return result !== null;
+    } catch (error$1) {
+      if (error$1 instanceof error.MastraError) throw error$1;
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("PG", "IS_FAVORITED", "FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY
+        },
+        error$1
+      );
+    }
+  }
+  async isFavoritedBatch(input) {
+    const { userId, entityType, entityIds } = input;
+    if (entityIds.length === 0) {
+      return /* @__PURE__ */ new Set();
+    }
+    const fullFavoritesTable = getTableName2({ indexName: storage.TABLE_FAVORITES, schemaName: getSchemaName2(this.#schema) });
+    try {
+      const placeholders = entityIds.map((_, i) => `$${i + 3}`).join(", ");
+      const rows = await this.#db.client.manyOrNone(
+        `SELECT "entityId" FROM ${fullFavoritesTable} WHERE "userId" = $1 AND "entityType" = $2 AND "entityId" IN (${placeholders})`,
+        [userId, entityType, ...entityIds]
+      );
+      const set = /* @__PURE__ */ new Set();
+      for (const row of rows ?? []) {
+        set.add(row.entityId);
+      }
+      return set;
+    } catch (error$1) {
+      if (error$1 instanceof error.MastraError) throw error$1;
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("PG", "IS_FAVORITED_BATCH", "FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY
+        },
+        error$1
+      );
+    }
+  }
+  async listFavoritedIds(input) {
+    const fullFavoritesTable = getTableName2({ indexName: storage.TABLE_FAVORITES, schemaName: getSchemaName2(this.#schema) });
+    try {
+      const rows = await this.#db.client.manyOrNone(
+        `SELECT "entityId" FROM ${fullFavoritesTable} WHERE "userId" = $1 AND "entityType" = $2 ORDER BY "createdAt" DESC, "entityId" ASC`,
+        [input.userId, input.entityType]
+      );
+      return (rows ?? []).map((row) => row.entityId);
+    } catch (error$1) {
+      if (error$1 instanceof error.MastraError) throw error$1;
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("PG", "LIST_FAVORITED_IDS", "FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY
+        },
+        error$1
+      );
+    }
+  }
+  async deleteFavoritesForEntity(input) {
+    const fullFavoritesTable = getTableName2({ indexName: storage.TABLE_FAVORITES, schemaName: getSchemaName2(this.#schema) });
+    const entityTable = ENTITY_TABLE[input.entityType];
+    const fullEntityTable = getTableName2({ indexName: entityTable, schemaName: getSchemaName2(this.#schema) });
+    try {
+      return await this.#db.client.tx(async (t) => {
+        const result = await t.one(
+          `WITH deleted AS (
+             DELETE FROM ${fullFavoritesTable} WHERE "entityType" = $1 AND "entityId" = $2 RETURNING 1
+           )
+           SELECT COUNT(*)::text AS count FROM deleted`,
+          [input.entityType, input.entityId]
+        );
+        await t.none(`UPDATE ${fullEntityTable} SET "favoriteCount" = 0 WHERE id = $1`, [input.entityId]);
+        return Number(result.count);
+      });
+    } catch (error$1) {
+      if (error$1 instanceof error.MastraError) throw error$1;
+      throw new error.MastraError(
+        {
+          id: storage.createStorageErrorId("PG", "DELETE_FAVORITES_FOR_ENTITY", "FAILED"),
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { entityType: input.entityType, entityId: input.entityId }
+        },
+        error$1
+      );
+    }
+  }
+};
 var SNAPSHOT_FIELDS = ["name", "description", "servers"];
 var MCPClientsPG = class _MCPClientsPG extends storage.MCPClientsStorage {
   #db;
@@ -12727,6 +13053,7 @@ var SNAPSHOT_FIELDS5 = [
   "references",
   "scripts",
   "assets",
+  "files",
   "metadata",
   "tree"
 ];
@@ -12774,6 +13101,16 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
       tableName: storage.TABLE_SKILL_VERSIONS,
       schema: storage.TABLE_SCHEMAS[storage.TABLE_SKILL_VERSIONS]
     });
+    await this.#db.alterTable({
+      tableName: storage.TABLE_SKILLS,
+      schema: storage.TABLE_SCHEMAS[storage.TABLE_SKILLS],
+      ifNotExists: ["visibility", "favoriteCount"]
+    });
+    await this.#db.alterTable({
+      tableName: storage.TABLE_SKILL_VERSIONS,
+      schema: storage.TABLE_SCHEMAS[storage.TABLE_SKILL_VERSIONS],
+      ifNotExists: ["files"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -12823,14 +13160,15 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
       const tableName = getTableName2({ indexName: storage.TABLE_SKILLS, schemaName: getSchemaName2(this.#schema) });
       const now = /* @__PURE__ */ new Date();
       const nowIso = now.toISOString();
+      const visibility = skill.visibility ?? (skill.authorId ? "private" : void 0);
       await this.#db.client.none(
         `INSERT INTO ${tableName} (
-          id, status, "activeVersionId", "authorId",
+          id, status, "activeVersionId", "authorId", visibility, "favoriteCount",
           "createdAt", "createdAtZ", "updatedAt", "updatedAtZ"
-        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,
-        [skill.id, "draft", null, skill.authorId ?? null, nowIso, nowIso, nowIso, nowIso]
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)`,
+        [skill.id, "draft", null, skill.authorId ?? null, visibility ?? null, 0, nowIso, nowIso, nowIso, nowIso]
       );
-      const { id: _id, authorId: _authorId, ...snapshotConfig } = skill;
+      const { id: _id, authorId: _authorId, visibility: _visibility, ...snapshotConfig } = skill;
       const versionId = crypto.randomUUID();
       await this.createVersion({
         id: versionId,
@@ -12845,6 +13183,8 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
         status: "draft",
         activeVersionId: void 0,
         authorId: skill.authorId,
+        visibility,
+        favoriteCount: 0,
         createdAt: now,
         updatedAt: now
       };
@@ -12886,8 +13226,12 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
           details: { skillId: id }
         });
       }
-      const { authorId, activeVersionId, status, ...configFields } = updates;
+      const { authorId, visibility, activeVersionId, status, ...rawConfigFields } = updates;
       let versionCreated = false;
+      const configFields = {};
+      for (const [key, value] of Object.entries(rawConfigFields)) {
+        if (value !== void 0) configFields[key] = value;
+      }
       const hasConfigUpdate = SNAPSHOT_FIELDS5.some((field) => field in configFields);
       if (hasConfigUpdate) {
         const latestVersion = await this.getLatestVersion(id);
@@ -12933,6 +13277,10 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
         setClauses.push(`"authorId" = $${paramIndex++}`);
         values.push(authorId);
       }
+      if (visibility !== void 0) {
+        setClauses.push(`visibility = $${paramIndex++}`);
+        values.push(visibility);
+      }
       if (activeVersionId !== void 0) {
         setClauses.push(`"activeVersionId" = $${paramIndex++}`);
         values.push(activeVersionId);
@@ -13000,7 +13348,17 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
     }
   }
   async list(args) {
-    const { page = 0, perPage: perPageInput, orderBy, authorId } = args || {};
+    const {
+      page = 0,
+      perPage: perPageInput,
+      orderBy,
+      authorId,
+      visibility,
+      status,
+      entityIds,
+      pinFavoritedFor,
+      favoritedOnly
+    } = args || {};
     const { field, direction } = this.parseOrderBy(orderBy);
     if (page < 0) {
       throw new error.MastraError(
@@ -13016,18 +13374,54 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
     const perPage = storage.normalizePerPage(perPageInput, 100);
     const { offset, perPage: perPageForResponse } = storage.calculatePagination(page, perPageInput, perPage);
     try {
+      if (entityIds && entityIds.length === 0) {
+        return {
+          skills: [],
+          total: 0,
+          page,
+          perPage: perPageForResponse,
+          hasMore: false
+        };
+      }
       const tableName = getTableName2({ indexName: storage.TABLE_SKILLS, schemaName: getSchemaName2(this.#schema) });
+      const favoritesTable = getTableName2({ indexName: storage.TABLE_FAVORITES, schemaName: getSchemaName2(this.#schema) });
       const conditions = [];
       const queryParams = [];
       let paramIdx = 1;
+      const joinUserId = pinFavoritedFor;
+      const useJoin = Boolean(joinUserId);
+      let joinSqlIdx = null;
+      if (useJoin) {
+        joinSqlIdx = paramIdx++;
+      }
+      if (status) {
+        conditions.push(`s.status = $${paramIdx++}`);
+        queryParams.push(status);
+      }
       if (authorId !== void 0) {
-        conditions.push(`"authorId" = $${paramIdx++}`);
+        conditions.push(`s."authorId" = $${paramIdx++}`);
         queryParams.push(authorId);
       }
+      if (visibility !== void 0) {
+        conditions.push(`s.visibility = $${paramIdx++}`);
+        queryParams.push(visibility);
+      }
+      if (entityIds && entityIds.length > 0) {
+        const placeholders = entityIds.map(() => `$${paramIdx++}`).join(", ");
+        conditions.push(`s.id IN (${placeholders})`);
+        queryParams.push(...entityIds);
+      }
+      if (useJoin && favoritedOnly) {
+        conditions.push('sr."userId" IS NOT NULL');
+      } else if (favoritedOnly) {
+        conditions.push("1=0");
+      }
+      const joinClause = useJoin && joinSqlIdx !== null ? `LEFT JOIN ${favoritesTable} sr ON sr."entityType" = 'skill' AND sr."entityId" = s.id AND sr."userId" = $${joinSqlIdx}` : "";
+      const joinParams = useJoin && joinUserId ? [joinUserId] : [];
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
       const countResult = await this.#db.client.one(
-        `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`,
-        queryParams
+        `SELECT COUNT(*) as count FROM ${tableName} s ${joinClause} ${whereClause}`,
+        [...joinParams, ...queryParams]
       );
       const total = parseInt(countResult.count, 10);
       if (total === 0) {
@@ -13039,10 +13433,19 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
           hasMore: false
         };
       }
+      const orderByParts = [];
+      if (useJoin) {
+        orderByParts.push(`(sr."userId" IS NOT NULL) DESC`);
+      }
+      orderByParts.push(`s."${field}" ${direction}`);
+      orderByParts.push(`s."id" ASC`);
+      const orderByClause = `ORDER BY ${orderByParts.join(", ")}`;
       const limitValue = perPageInput === false ? total : perPage;
+      const limitIdx = paramIdx++;
+      const offsetIdx = paramIdx++;
       const dataResult = await this.#db.client.manyOrNone(
-        `SELECT * FROM ${tableName} ${whereClause} ORDER BY "${field}" ${direction} LIMIT $${paramIdx++} OFFSET $${paramIdx++}`,
-        [...queryParams, limitValue, offset]
+        `SELECT s.* FROM ${tableName} s ${joinClause} ${whereClause} ${orderByClause} LIMIT $${limitIdx} OFFSET $${offsetIdx}`,
+        [...joinParams, ...queryParams, limitValue, offset]
       );
       const skills = (dataResult || []).flatMap((row) => {
         try {
@@ -13086,10 +13489,10 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
         `INSERT INTO ${tableName} (
           id, "skillId", "versionNumber",
           name, description, instructions, license, compatibility,
-          source, "references", scripts, assets, metadata, tree,
+          source, "references", scripts, assets, files, metadata, tree,
           "changedFields", "changeMessage",
           "createdAt", "createdAtZ"
-        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18)`,
+        ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19)`,
         [
           input.id,
           input.skillId,
@@ -13103,6 +13506,7 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
           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,
@@ -13345,6 +13749,8 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
       status: row.status,
       activeVersionId: row.activeVersionId,
       authorId: row.authorId,
+      visibility: row.visibility,
+      favoriteCount: row.favoriteCount === null || row.favoriteCount === void 0 ? 0 : Number(row.favoriteCount),
       createdAt: new Date(row.createdAtZ || row.createdAt),
       updatedAt: new Date(row.updatedAtZ || row.updatedAt)
     };
@@ -13363,6 +13769,7 @@ var SkillsPG = class _SkillsPG extends storage.SkillsStorage {
       references: parseJsonResilient(row.references),
       scripts: parseJsonResilient(row.scripts),
       assets: parseJsonResilient(row.assets),
+      files: parseJsonResilient(row.files),
       metadata: parseJsonResilient(row.metadata),
       tree: parseJsonResilient(row.tree),
       changedFields: parseJsonResilient(row.changedFields),
@@ -13964,8 +14371,12 @@ var WorkspacesPG = class _WorkspacesPG extends storage.WorkspacesStorage {
           details: { workspaceId: id }
         });
       }
-      const { authorId, activeVersionId, metadata, status, ...configFields } = updates;
+      const { authorId, activeVersionId, metadata, status, ...rawConfigFields } = updates;
       let versionCreated = false;
+      const configFields = {};
+      for (const [key, value] of Object.entries(rawConfigFields)) {
+        if (value !== void 0) configFields[key] = value;
+      }
       const hasConfigUpdate = SNAPSHOT_FIELDS6.some((field) => field in configFields);
       if (hasConfigUpdate) {
         const latestVersion = await this.getLatestVersion(id);
@@ -14473,6 +14884,7 @@ var ALL_DOMAINS = [
   DatasetsPG,
   ExperimentsPG,
   BackgroundTasksPG,
+  FavoritesPG,
   ChannelsPG,
   SchedulesPG
 ];
@@ -14526,6 +14938,7 @@ var PostgresStore = class extends storage.MastraCompositeStore {
         mcpServers: new MCPServersPG(domainConfig),
         workspaces: new WorkspacesPG(domainConfig),
         skills: new SkillsPG(domainConfig),
+        favorites: new FavoritesPG(domainConfig),
         blobs: new BlobsPG(domainConfig),
         datasets: new DatasetsPG(domainConfig),
         experiments: new ExperimentsPG(domainConfig),
@@ -14726,6 +15139,7 @@ exports.BlobsPG = BlobsPG;
 exports.ChannelsPG = ChannelsPG;
 exports.DatasetsPG = DatasetsPG;
 exports.ExperimentsPG = ExperimentsPG;
+exports.FavoritesPG = FavoritesPG;
 exports.MCPClientsPG = MCPClientsPG;
 exports.MCPServersPG = MCPServersPG;
 exports.MemoryPG = MemoryPG;