@mastra/mysql 0.3.2 → 0.3.3-alpha.1

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { StoreOperations, TABLE_CONFIGS, TABLE_WORKFLOW_SNAPSHOT, TABLE_SPANS, AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, AGENTS_SCHEMA, AGENT_VERSIONS_SCHEMA, createStorageErrorId, normalizePerPage, calculatePagination, BlobStore, SKILL_BLOBS_SCHEMA, TABLE_SKILL_BLOBS, DatasetsStorage, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, DATASETS_SCHEMA, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, ExperimentsStorage, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, MCPClientsStorage, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, MCP_CLIENTS_SCHEMA, MCP_CLIENT_VERSIONS_SCHEMA, MCPServersStorage, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, MCP_SERVERS_SCHEMA, MCP_SERVER_VERSIONS_SCHEMA, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, TABLE_SCHEMAS, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, ObservabilityStorage, SPAN_SCHEMA, listTracesArgsSchema, TraceStatus, toTraceSpans, PromptBlocksStorage, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, PROMPT_BLOCKS_SCHEMA, PROMPT_BLOCK_VERSIONS_SCHEMA, ScorerDefinitionsStorage, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, SCORER_DEFINITIONS_SCHEMA, SCORER_DEFINITION_VERSIONS_SCHEMA, ScoresStorage, TABLE_SCORERS, SCORERS_SCHEMA, SkillsStorage, TABLE_SKILLS, TABLE_SKILL_VERSIONS, SKILLS_SCHEMA, SKILL_VERSIONS_SCHEMA, WorkflowsStorage, WorkspacesStorage, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, WORKSPACES_SCHEMA, WORKSPACE_VERSIONS_SCHEMA, MastraCompositeStore, TABLE_FAVORITES, BackgroundTasksStorage, TABLE_BACKGROUND_TASKS, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, FavoritesStorage, FAVORITES_SCHEMA, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ToolProviderConnectionsStorage, TABLE_TOOL_PROVIDER_CONNECTIONS, TOOL_PROVIDER_CONNECTIONS_SCHEMA } from '@mastra/core/storage';
+import { StoreOperations, TABLE_CONFIGS, TABLE_WORKFLOW_SNAPSHOT, TABLE_SPANS, AgentsStorage, TABLE_AGENTS, TABLE_AGENT_VERSIONS, AGENTS_SCHEMA, AGENT_VERSIONS_SCHEMA, createStorageErrorId, normalizePerPage, calculatePagination, BlobStore, SKILL_BLOBS_SCHEMA, TABLE_SKILL_BLOBS, DatasetsStorage, TABLE_DATASETS, TABLE_DATASET_ITEMS, TABLE_DATASET_VERSIONS, DATASETS_SCHEMA, DATASET_ITEMS_SCHEMA, DATASET_VERSIONS_SCHEMA, TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS, ExperimentsStorage, EXPERIMENTS_SCHEMA, EXPERIMENT_RESULTS_SCHEMA, MCPClientsStorage, TABLE_MCP_CLIENTS, TABLE_MCP_CLIENT_VERSIONS, MCP_CLIENTS_SCHEMA, MCP_CLIENT_VERSIONS_SCHEMA, MCPServersStorage, TABLE_MCP_SERVERS, TABLE_MCP_SERVER_VERSIONS, MCP_SERVERS_SCHEMA, MCP_SERVER_VERSIONS_SCHEMA, MemoryStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_RESOURCES, TABLE_SCHEMAS, OBSERVATIONAL_MEMORY_TABLE_SCHEMA, ObservabilityStorage, SPAN_SCHEMA, listTracesArgsSchema, TraceStatus, toTraceSpans, PromptBlocksStorage, TABLE_PROMPT_BLOCKS, TABLE_PROMPT_BLOCK_VERSIONS, PROMPT_BLOCKS_SCHEMA, PROMPT_BLOCK_VERSIONS_SCHEMA, ScorerDefinitionsStorage, TABLE_SCORER_DEFINITIONS, TABLE_SCORER_DEFINITION_VERSIONS, SCORER_DEFINITIONS_SCHEMA, SCORER_DEFINITION_VERSIONS_SCHEMA, ScoresStorage, TABLE_SCORERS, SCORERS_SCHEMA, SkillsStorage, TABLE_SKILLS, TABLE_SKILL_VERSIONS, SKILLS_SCHEMA, SKILL_VERSIONS_SCHEMA, WorkflowsStorage, WorkspacesStorage, TABLE_WORKSPACES, TABLE_WORKSPACE_VERSIONS, WORKSPACES_SCHEMA, WORKSPACE_VERSIONS_SCHEMA, MastraCompositeStore, TABLE_FAVORITES, BackgroundTasksStorage, TABLE_BACKGROUND_TASKS, ChannelsStorage, TABLE_CHANNEL_INSTALLATIONS, TABLE_CHANNEL_CONFIG, FavoritesStorage, FAVORITES_SCHEMA, SchedulesStorage, TABLE_SCHEDULES, TABLE_SCHEDULE_TRIGGERS, ToolProviderConnectionsStorage, TABLE_TOOL_PROVIDER_CONNECTIONS, TOOL_PROVIDER_CONNECTIONS_SCHEMA } from '@mastra/core/storage';
 import { createPool } from 'mysql2/promise';
 import { parseSqlIdentifier } from '@mastra/core/utils';
 import { randomUUID } from 'crypto';
@@ -2050,11 +2050,11 @@ function parseJSON(value) {
     try {
       return JSON.parse(value);
     } catch {
-      return void 0;
+      return value;
     }
   }
   if (typeof value === "object") return value;
-  return void 0;
+  return value;
 }
 function jsonArg(value) {
   return value === void 0 || value === null ? null : JSON.stringify(value);
@@ -2143,7 +2143,17 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
     await this.operations.alterTable({
       tableName: TABLE_DATASETS,
       schema: DATASETS_SCHEMA,
-      ifNotExists: ["organizationId", "projectId", "candidateKey", "candidateId"]
+      ifNotExists: [
+        "organizationId",
+        "projectId",
+        "candidateKey",
+        "candidateId",
+        "requestContextSchema",
+        "tags",
+        "targetType",
+        "targetIds",
+        "scorerIds"
+      ]
     });
     await this.operations.alterTable({
       tableName: TABLE_DATASET_ITEMS,
@@ -2158,6 +2168,19 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
     await this.pool.execute(`DELETE FROM ${formatTableName(TABLE_DATASET_ITEMS)}`);
     await this.pool.execute(`DELETE FROM ${formatTableName(TABLE_DATASETS)}`);
   }
+  async experimentTablesExist() {
+    try {
+      const [rows] = await this.pool.execute(
+        `SELECT COUNT(*) AS c FROM information_schema.tables
+         WHERE table_schema = DATABASE() AND table_name IN (?, ?)`,
+        [TABLE_EXPERIMENTS, TABLE_EXPERIMENT_RESULTS]
+      );
+      const row = Array.isArray(rows) ? rows[0] : void 0;
+      return Number(row?.c ?? 0) === 2;
+    } catch {
+      return false;
+    }
+  }
   // --- Row transformers ---
   mapDataset(row) {
     return {
@@ -2167,6 +2190,11 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
       metadata: parseJSON(row.metadata),
       inputSchema: parseJSON(row.inputSchema),
       groundTruthSchema: parseJSON(row.groundTruthSchema),
+      requestContextSchema: parseJSON(row.requestContextSchema),
+      tags: parseJSON(row.tags) ?? null,
+      targetType: row.targetType ?? null,
+      targetIds: parseJSON(row.targetIds) ?? null,
+      scorerIds: parseJSON(row.scorerIds) ?? null,
       version: row.version,
       organizationId: row.organizationId ?? null,
       projectId: row.projectId ?? null,
@@ -2228,6 +2256,10 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
           metadata: jsonArg(input.metadata),
           inputSchema: jsonArg(input.inputSchema),
           groundTruthSchema: jsonArg(input.groundTruthSchema),
+          requestContextSchema: jsonArg(input.requestContextSchema),
+          targetType: input.targetType ?? null,
+          targetIds: jsonArg(input.targetIds),
+          scorerIds: jsonArg(input.scorerIds),
           version: 0,
           organizationId: input.organizationId ?? null,
           projectId: input.projectId ?? null,
@@ -2244,6 +2276,10 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
         metadata: input.metadata,
         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,
         version: 0,
         organizationId: input.organizationId ?? null,
         projectId: input.projectId ?? null,
@@ -2263,11 +2299,18 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
       );
     }
   }
-  async getDatasetById({ id }) {
+  async getDatasetById({
+    id,
+    filters
+  }) {
     try {
       const row = await this.operations.load({
         tableName: TABLE_DATASETS,
-        keys: { id }
+        keys: {
+          id,
+          organizationId: filters?.organizationId,
+          projectId: filters?.projectId
+        }
       });
       return row ? this.mapDataset(row) : null;
     } catch (error) {
@@ -2283,7 +2326,7 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
   }
   async _doUpdateDataset(args) {
     try {
-      const existing = await this.getDatasetById({ id: args.id });
+      const existing = await this.getDatasetById({ id: args.id, filters: args.filters });
       if (!existing) {
         throw new MastraError({
           id: "MYSQL_UPDATE_DATASET_NOT_FOUND",
@@ -2300,6 +2343,14 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
         data.inputSchema = args.inputSchema === null ? null : JSON.stringify(args.inputSchema);
       if (args.groundTruthSchema !== void 0)
         data.groundTruthSchema = args.groundTruthSchema === null ? null : JSON.stringify(args.groundTruthSchema);
+      if (args.requestContextSchema !== void 0)
+        data.requestContextSchema = args.requestContextSchema === null ? null : JSON.stringify(args.requestContextSchema);
+      if (args.tags !== void 0) data.tags = args.tags === null ? null : JSON.stringify(args.tags);
+      if (args.targetType !== void 0) data.targetType = args.targetType;
+      if (args.targetIds !== void 0)
+        data.targetIds = args.targetIds === null ? null : JSON.stringify(args.targetIds);
+      if (args.scorerIds !== void 0)
+        data.scorerIds = args.scorerIds === null ? null : JSON.stringify(args.scorerIds);
       await this.operations.update({
         tableName: TABLE_DATASETS,
         keys: { id: args.id },
@@ -2312,6 +2363,11 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
         metadata: args.metadata ?? existing.metadata,
         inputSchema: (args.inputSchema !== void 0 ? args.inputSchema : existing.inputSchema) ?? void 0,
         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) ?? null,
+        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,
         updatedAt: data.updatedAt
       };
     } catch (error) {
@@ -2326,23 +2382,39 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
       );
     }
   }
-  async deleteDataset({ id }) {
+  async deleteDataset({ id, filters }) {
+    const filterCols = [];
+    const filterVals = [];
+    if (filters?.organizationId !== void 0) {
+      filterCols.push(`${quoteIdentifier("organizationId", "column name")} = ?`);
+      filterVals.push(filters.organizationId);
+    }
+    if (filters?.projectId !== void 0) {
+      filterCols.push(`${quoteIdentifier("projectId", "column name")} = ?`);
+      filterVals.push(filters.projectId);
+    }
+    const scopedWhere = ["id = ?", ...filterCols].join(" AND ");
+    const experimentTablesExist = await this.experimentTablesExist();
     const connection = await this.pool.getConnection();
     try {
       await connection.beginTransaction();
-      try {
+      const [rows] = await connection.execute(
+        `SELECT id FROM ${formatTableName(TABLE_DATASETS)} WHERE ${scopedWhere} FOR UPDATE`,
+        [id, ...filterVals]
+      );
+      if (!Array.isArray(rows) || rows.length === 0) {
+        await connection.commit();
+        return;
+      }
+      if (experimentTablesExist) {
         await connection.execute(
           `DELETE FROM ${formatTableName(TABLE_EXPERIMENT_RESULTS)} WHERE ${quoteIdentifier("experimentId", "column name")} IN (SELECT id FROM ${formatTableName(TABLE_EXPERIMENTS)} WHERE ${quoteIdentifier("datasetId", "column name")} = ?)`,
           [id]
         );
-      } catch {
-      }
-      try {
         await connection.execute(
           `UPDATE ${formatTableName(TABLE_EXPERIMENTS)} SET ${quoteIdentifier("datasetId", "column name")} = NULL, ${quoteIdentifier("datasetVersion", "column name")} = NULL WHERE ${quoteIdentifier("datasetId", "column name")} = ?`,
           [id]
         );
-      } catch {
       }
       await connection.execute(
         `DELETE FROM ${formatTableName(TABLE_DATASET_VERSIONS)} WHERE ${quoteIdentifier("datasetId", "column name")} = ?`,
@@ -2352,7 +2424,10 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
         `DELETE FROM ${formatTableName(TABLE_DATASET_ITEMS)} WHERE ${quoteIdentifier("datasetId", "column name")} = ?`,
         [id]
       );
-      await connection.execute(`DELETE FROM ${formatTableName(TABLE_DATASETS)} WHERE id = ?`, [id]);
+      await connection.execute(`DELETE FROM ${formatTableName(TABLE_DATASETS)} WHERE ${scopedWhere}`, [
+        id,
+        ...filterVals
+      ]);
       await connection.commit();
     } catch (error) {
       await connection.rollback();
@@ -2389,6 +2464,19 @@ var DatasetsMySQL = class _DatasetsMySQL extends DatasetsStorage {
         filterParts.push(`${quoteIdentifier("candidateId", "column name")} = ?`);
         filterArgs.push(args.filters.candidateId);
       }
+      if (args.filters?.targetType !== void 0) {
+        filterParts.push(`${quoteIdentifier("targetType", "column name")} = ?`);
+        filterArgs.push(args.filters.targetType);
+      }
+      if (args.filters?.targetIds !== void 0 && args.filters.targetIds.length > 0) {
+        const placeholders = args.filters.targetIds.map(() => "?").join(",");
+        filterParts.push(`JSON_OVERLAPS(${quoteIdentifier("targetIds", "column name")}, JSON_ARRAY(${placeholders}))`);
+        filterArgs.push(...args.filters.targetIds);
+      }
+      if (args.filters?.name !== void 0 && args.filters.name.length > 0) {
+        filterParts.push(`LOWER(${quoteIdentifier("name", "column name")}) LIKE LOWER(?)`);
+        filterArgs.push(`%${args.filters.name}%`);
+      }
       const whereClause = {
         sql: filterParts.length > 0 ? `WHERE ${filterParts.join(" AND ")}` : "",
         args: filterArgs
@@ -3114,7 +3202,7 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
     await this.operations.alterTable({
       tableName: TABLE_EXPERIMENTS,
       schema: EXPERIMENTS_SCHEMA,
-      ifNotExists: ["organizationId", "projectId"]
+      ifNotExists: ["agentVersion", "organizationId", "projectId"]
     });
     await this.operations.alterTable({
       tableName: TABLE_EXPERIMENT_RESULTS,
@@ -3133,6 +3221,7 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
       id: row.id,
       datasetId: row.datasetId ?? null,
       datasetVersion: row.datasetVersion ?? null,
+      agentVersion: row.agentVersion ?? null,
       organizationId: row.organizationId ?? null,
       projectId: row.projectId ?? null,
       targetType: row.targetType,
@@ -3182,6 +3271,7 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
           id,
           datasetId: input.datasetId ?? null,
           datasetVersion: input.datasetVersion ?? null,
+          agentVersion: input.agentVersion ?? null,
           organizationId: input.organizationId ?? null,
           projectId: input.projectId ?? null,
           targetType: input.targetType,
@@ -3204,6 +3294,7 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
         id,
         datasetId: input.datasetId,
         datasetVersion: input.datasetVersion,
+        agentVersion: input.agentVersion ?? null,
         organizationId: input.organizationId ?? null,
         projectId: input.projectId ?? null,
         targetType: input.targetType,
@@ -3277,7 +3368,11 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
     try {
       const row = await this.operations.load({
         tableName: TABLE_EXPERIMENTS,
-        keys: { id: args.id }
+        keys: {
+          id: args.id,
+          organizationId: args.filters?.organizationId,
+          projectId: args.filters?.projectId
+        }
       });
       return row ? this.mapExperiment(row) : null;
     } catch (error) {
@@ -3300,6 +3395,22 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
         conditions.push(`${quoteIdentifier("datasetId", "column name")} = ?`);
         params.push(args.datasetId);
       }
+      if (args.targetType) {
+        conditions.push(`${quoteIdentifier("targetType", "column name")} = ?`);
+        params.push(args.targetType);
+      }
+      if (args.targetId) {
+        conditions.push(`${quoteIdentifier("targetId", "column name")} = ?`);
+        params.push(args.targetId);
+      }
+      if (args.agentVersion) {
+        conditions.push(`${quoteIdentifier("agentVersion", "column name")} = ?`);
+        params.push(args.agentVersion);
+      }
+      if (args.status) {
+        conditions.push(`${quoteIdentifier("status", "column name")} = ?`);
+        params.push(args.status);
+      }
       if (args.filters) {
         const { organizationId, projectId } = args.filters;
         if (organizationId !== void 0) {
@@ -3354,9 +3465,28 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
   }
   async deleteExperiment(args) {
     try {
+      const tenancyConditions = [];
+      const tenancyParams = [];
+      if (args.filters?.organizationId !== void 0) {
+        tenancyConditions.push(`${quoteIdentifier("organizationId", "column name")} = ?`);
+        tenancyParams.push(args.filters.organizationId);
+      }
+      if (args.filters?.projectId !== void 0) {
+        tenancyConditions.push(`${quoteIdentifier("projectId", "column name")} = ?`);
+        tenancyParams.push(args.filters.projectId);
+      }
+      const gateWhere = ["id = ?", ...tenancyConditions].join(" AND ");
       const connection = await this.pool.getConnection();
       try {
         await connection.beginTransaction();
+        const [gateRows] = await connection.execute(
+          `SELECT id FROM ${formatTableName(TABLE_EXPERIMENTS)} WHERE ${gateWhere} FOR UPDATE`,
+          [args.id, ...tenancyParams]
+        );
+        if (!Array.isArray(gateRows) || gateRows.length === 0) {
+          await connection.commit();
+          return;
+        }
         await connection.execute(
           `DELETE FROM ${formatTableName(TABLE_EXPERIMENT_RESULTS)} WHERE ${quoteIdentifier("experimentId", "column name")} = ?`,
           [args.id]
@@ -3463,7 +3593,11 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
     try {
       const row = await this.operations.load({
         tableName: TABLE_EXPERIMENT_RESULTS,
-        keys: { id: args.id }
+        keys: {
+          id: args.id,
+          organizationId: args.filters?.organizationId,
+          projectId: args.filters?.projectId
+        }
       });
       return row ? this.mapExperimentResult(row) : null;
     } catch (error) {
@@ -3617,6 +3751,24 @@ var ExperimentsMySQL = class _ExperimentsMySQL extends ExperimentsStorage {
   }
   async deleteExperimentResults(args) {
     try {
+      if (args.filters?.organizationId !== void 0 || args.filters?.projectId !== void 0) {
+        const tenancyConditions = [];
+        const tenancyParams = [];
+        if (args.filters?.organizationId !== void 0) {
+          tenancyConditions.push(`${quoteIdentifier("organizationId", "column name")} = ?`);
+          tenancyParams.push(args.filters.organizationId);
+        }
+        if (args.filters?.projectId !== void 0) {
+          tenancyConditions.push(`${quoteIdentifier("projectId", "column name")} = ?`);
+          tenancyParams.push(args.filters.projectId);
+        }
+        const parentWhere = ["id = ?", ...tenancyConditions].join(" AND ");
+        await this.pool.execute(
+          `DELETE FROM ${formatTableName(TABLE_EXPERIMENT_RESULTS)} WHERE ${quoteIdentifier("experimentId", "column name")} IN (SELECT id FROM ${formatTableName(TABLE_EXPERIMENTS)} WHERE ${parentWhere})`,
+          [args.experimentId, ...tenancyParams]
+        );
+        return;
+      }
       await this.pool.execute(
         `DELETE FROM ${formatTableName(TABLE_EXPERIMENT_RESULTS)} WHERE ${quoteIdentifier("experimentId", "column name")} = ?`,
         [args.experimentId]
@@ -8766,7 +8918,7 @@ var ScoresMySQL = class _ScoresMySQL extends ScoresStorage {
     await this.operations.alterTable({
       tableName: TABLE_SCORERS,
       schema: SCORERS_SCHEMA,
-      ifNotExists: ["spanId", "requestContext"]
+      ifNotExists: ["spanId", "requestContext", "organizationId", "projectId", "batchId", "datasetId", "datasetItemId"]
     });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
@@ -8841,6 +8993,11 @@ var ScoresMySQL = class _ScoresMySQL extends ScoresStorage {
       entityId: row.entityId ?? void 0,
       source: row.source ?? void 0,
       resourceId: row.resourceId ?? void 0,
+      organizationId: row.organizationId ?? void 0,
+      projectId: row.projectId ?? void 0,
+      batchId: row.batchId ?? void 0,
+      datasetId: row.datasetId ?? void 0,
+      datasetItemId: row.datasetItemId ?? void 0,
       threadId: row.threadId ?? void 0,
       createdAt: parseDateTime(row.createdAt) ?? /* @__PURE__ */ new Date(),
       updatedAt: parseDateTime(row.updatedAt) ?? /* @__PURE__ */ new Date()
@@ -8876,6 +9033,11 @@ var ScoresMySQL = class _ScoresMySQL extends ScoresStorage {
       entity: toJson(score.entity),
       entityId: score.entityId ?? null,
       resourceId: score.resourceId ?? null,
+      organizationId: score.organizationId ?? null,
+      projectId: score.projectId ?? null,
+      batchId: score.batchId ?? null,
+      datasetId: score.datasetId ?? null,
+      datasetItemId: score.datasetItemId ?? null,
       threadId: score.threadId ?? null,
       source: score.source ?? null,
       createdAt,
@@ -8979,33 +9141,74 @@ var ScoresMySQL = class _ScoresMySQL extends ScoresStorage {
     pagination,
     entityId,
     entityType,
-    source
+    source,
+    filters
   }) {
-    return this.fetchScores(this.buildWhereClause({ scorerId, entityId, entityType, source }), pagination);
+    return this.fetchScores(
+      this.buildWhereClause({
+        scorerId,
+        entityId,
+        entityType,
+        source,
+        organizationId: filters?.organizationId,
+        projectId: filters?.projectId
+      }),
+      pagination
+    );
   }
   async listScoresByRunId({
     runId,
     pagination,
     entityId,
     entityType,
-    source
+    source,
+    filters
   }) {
-    return this.fetchScores(this.buildWhereClause({ runId, entityId, entityType, source }), pagination);
+    return this.fetchScores(
+      this.buildWhereClause({
+        runId,
+        entityId,
+        entityType,
+        source,
+        organizationId: filters?.organizationId,
+        projectId: filters?.projectId
+      }),
+      pagination
+    );
   }
   async listScoresBySpan({
     traceId,
     spanId,
-    pagination
+    pagination,
+    filters
   }) {
-    return this.fetchScores(this.buildWhereClause({ traceId, spanId }), pagination);
+    return this.fetchScores(
+      this.buildWhereClause({
+        traceId,
+        spanId,
+        organizationId: filters?.organizationId,
+        projectId: filters?.projectId
+      }),
+      pagination
+    );
   }
   async listScoresByEntityId({
     entityId,
     pagination,
     entityType,
-    source
+    source,
+    filters
   }) {
-    return this.fetchScores(this.buildWhereClause({ entityId, entityType, source }), pagination);
+    return this.fetchScores(
+      this.buildWhereClause({
+        entityId,
+        entityType,
+        source,
+        organizationId: filters?.organizationId,
+        projectId: filters?.projectId
+      }),
+      pagination
+    );
   }
 };
 var SNAPSHOT_FIELDS = [