@mastra/spanner 1.2.1-alpha.0 → 1.2.1

package/dist/index.js

@@ -2967,6 +2967,10 @@ function rowToDataset(row) {
     targetIds: t.targetIds ?? null,
     scorerIds: t.scorerIds ?? null,
     version: Number(t.version ?? 0),
+    organizationId: t.organizationId ?? null,
+    projectId: t.projectId ?? null,
+    candidateKey: t.candidateKey ?? null,
+    candidateId: t.candidateId ?? null,
     createdAt: toDate(t.createdAt),
     updatedAt: toDate(t.updatedAt)
   };
@@ -2977,6 +2981,8 @@ function rowToItem(row) {
     id: String(t.id),
     datasetId: String(t.datasetId),
     datasetVersion: Number(t.datasetVersion),
+    organizationId: t.organizationId ?? null,
+    projectId: t.projectId ?? null,
     input: t.input,
     groundTruth: t.groundTruth ?? void 0,
     expectedTrajectory: t.expectedTrajectory ?? void 0,
@@ -3023,6 +3029,16 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
     await this.db.createTable({ tableName: TABLE_DATASETS, schema: TABLE_SCHEMAS[TABLE_DATASETS] });
     await this.db.createTable({ tableName: TABLE_DATASET_ITEMS, schema: TABLE_SCHEMAS[TABLE_DATASET_ITEMS] });
     await this.db.createTable({ tableName: TABLE_DATASET_VERSIONS, schema: TABLE_SCHEMAS[TABLE_DATASET_VERSIONS] });
+    await this.db.alterTable({
+      tableName: TABLE_DATASETS,
+      schema: TABLE_SCHEMAS[TABLE_DATASETS],
+      ifNotExists: ["organizationId", "projectId", "candidateKey", "candidateId"]
+    });
+    await this.db.alterTable({
+      tableName: TABLE_DATASET_ITEMS,
+      schema: TABLE_SCHEMAS[TABLE_DATASET_ITEMS],
+      ifNotExists: ["organizationId", "projectId"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -3083,6 +3099,10 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
         targetIds: input.targetIds ?? null,
         scorerIds: input.scorerIds ?? null,
         version: 0,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
+        candidateKey: input.candidateKey ?? null,
+        candidateId: input.candidateId ?? null,
         createdAt: now,
         updatedAt: now
       };
@@ -3101,6 +3121,10 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
           targetIds: record.targetIds,
           scorerIds: record.scorerIds,
           version: 0,
+          organizationId: record.organizationId,
+          projectId: record.projectId,
+          candidateKey: record.candidateKey,
+          candidateId: record.candidateId,
           createdAt: now,
           updatedAt: now
         }
@@ -3230,8 +3254,28 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     try {
       const tableName = quoteIdent(TABLE_DATASETS, "table name");
+      const filterConditions = [];
+      const filterParams = {};
+      if (args.filters?.organizationId !== void 0) {
+        filterConditions.push(`${quoteIdent("organizationId", "column name")} = @organizationId`);
+        filterParams.organizationId = args.filters.organizationId;
+      }
+      if (args.filters?.projectId !== void 0) {
+        filterConditions.push(`${quoteIdent("projectId", "column name")} = @projectId`);
+        filterParams.projectId = args.filters.projectId;
+      }
+      if (args.filters?.candidateKey !== void 0) {
+        filterConditions.push(`${quoteIdent("candidateKey", "column name")} = @candidateKey`);
+        filterParams.candidateKey = args.filters.candidateKey;
+      }
+      if (args.filters?.candidateId !== void 0) {
+        filterConditions.push(`${quoteIdent("candidateId", "column name")} = @candidateId`);
+        filterParams.candidateId = args.filters.candidateId;
+      }
+      const whereClause = filterConditions.length > 0 ? `WHERE ${filterConditions.join(" AND ")}` : "";
       const [countRows] = await this.database.run({
-        sql: `SELECT COUNT(*) AS count FROM ${tableName}`,
+        sql: `SELECT COUNT(*) AS count FROM ${tableName} ${whereClause}`,
+        params: filterParams,
         json: true
       });
       const total = Number(countRows[0]?.count ?? 0);
@@ -3240,10 +3284,10 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
       }
       const limit = perPageInput === false ? total : perPage;
       const [rows] = await this.database.run({
-        sql: `SELECT * FROM ${tableName}
+        sql: `SELECT * FROM ${tableName} ${whereClause}
               ORDER BY ${quoteIdent("createdAt", "column name")} DESC, ${quoteIdent("id", "column name")} ASC
               LIMIT @limit OFFSET @offset`,
-        params: { limit, offset },
+        params: { ...filterParams, limit, offset },
         json: true
       });
       const datasets = rows.map(rowToDataset);
@@ -3270,10 +3314,13 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
   // ==========================================================================
   // SCD-2 helpers
   // ==========================================================================
-  /** Reads and increments the dataset version inside `tx`; throws if missing. */
+  /** Reads and increments the dataset version inside `tx`; throws if missing. Also returns parent tenancy. */
   async bumpVersion(tx, datasetId, now) {
     const [rows] = await tx.run({
-      sql: `SELECT ${quoteIdent("version", "column name")} AS version FROM ${quoteIdent(TABLE_DATASETS, "table name")}
+      sql: `SELECT ${quoteIdent("version", "column name")} AS version,
+                   ${quoteIdent("organizationId", "column name")} AS organizationId,
+                   ${quoteIdent("projectId", "column name")} AS projectId
+            FROM ${quoteIdent(TABLE_DATASETS, "table name")}
             WHERE ${quoteIdent("id", "column name")} = @id LIMIT 1`,
       params: { id: datasetId },
       json: true
@@ -3297,7 +3344,7 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
       params: { newVersion, now: now.toISOString(), id: datasetId },
       types: { now: "timestamp" }
     });
-    return newVersion;
+    return { version: newVersion, organizationId: row.organizationId ?? null, projectId: row.projectId ?? null };
   }
   /** Inserts a dataset version snapshot row inside `tx`. */
   async insertVersionRow(tx, datasetId, version, now) {
@@ -3342,13 +3389,15 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
       await this.db.runWithAbortRetry(
         () => this.database.runTransactionAsync(async (tx) => {
           try {
-            const newVersion = await this.bumpVersion(tx, args.datasetId, now);
+            const { version: newVersion, organizationId, projectId } = await this.bumpVersion(tx, args.datasetId, now);
             await this.db.insert({
               tableName: TABLE_DATASET_ITEMS,
               record: {
                 id: itemId,
                 datasetId: args.datasetId,
                 datasetVersion: newVersion,
+                organizationId,
+                projectId,
                 validTo: null,
                 isDeleted: false,
                 input: args.input,
@@ -3369,6 +3418,8 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
               id: itemId,
               datasetId: args.datasetId,
               datasetVersion: newVersion,
+              organizationId,
+              projectId,
               input: args.input,
               groundTruth: args.groundTruth,
               expectedTrajectory: args.expectedTrajectory,
@@ -3435,7 +3486,7 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
       await this.db.runWithAbortRetry(
         () => this.database.runTransactionAsync(async (tx) => {
           try {
-            const newVersion = await this.bumpVersion(tx, args.datasetId, now);
+            const { version: newVersion, organizationId, projectId } = await this.bumpVersion(tx, args.datasetId, now);
             await this.closeCurrentRow(tx, args.id, newVersion);
             await this.db.insert({
               tableName: TABLE_DATASET_ITEMS,
@@ -3443,6 +3494,8 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
                 id: args.id,
                 datasetId: args.datasetId,
                 datasetVersion: newVersion,
+                organizationId,
+                projectId,
                 validTo: null,
                 isDeleted: false,
                 input: merged.input,
@@ -3463,6 +3516,8 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
               id: args.id,
               datasetId: args.datasetId,
               datasetVersion: newVersion,
+              organizationId,
+              projectId,
               input: merged.input,
               groundTruth: merged.groundTruth,
               expectedTrajectory: merged.expectedTrajectory,
@@ -3511,7 +3566,7 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
       await this.db.runWithAbortRetry(
         () => this.database.runTransactionAsync(async (tx) => {
           try {
-            const newVersion = await this.bumpVersion(tx, args.datasetId, now);
+            const { version: newVersion, organizationId, projectId } = await this.bumpVersion(tx, args.datasetId, now);
             await this.closeCurrentRow(tx, args.id, newVersion);
             await this.db.insert({
               tableName: TABLE_DATASET_ITEMS,
@@ -3519,6 +3574,8 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
                 id: args.id,
                 datasetId: args.datasetId,
                 datasetVersion: newVersion,
+                organizationId,
+                projectId,
                 validTo: null,
                 isDeleted: true,
                 input: existing.input,
@@ -3562,6 +3619,14 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
     try {
       const conditions = [`${quoteIdent("datasetId", "column name")} = @datasetId`];
       const params = { datasetId: args.datasetId };
+      if (args.filters?.organizationId !== void 0) {
+        conditions.push(`${quoteIdent("organizationId", "column name")} = @organizationId`);
+        params.organizationId = args.filters.organizationId;
+      }
+      if (args.filters?.projectId !== void 0) {
+        conditions.push(`${quoteIdent("projectId", "column name")} = @projectId`);
+        params.projectId = args.filters.projectId;
+      }
       if (args.version !== void 0) {
         conditions.push(`${quoteIdent("datasetVersion", "column name")} <= @version`);
         conditions.push(
@@ -3783,7 +3848,7 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
       await this.db.runWithAbortRetry(
         () => this.database.runTransactionAsync(async (tx) => {
           try {
-            const newVersion = await this.bumpVersion(tx, input.datasetId, now);
+            const { version: newVersion, organizationId, projectId } = await this.bumpVersion(tx, input.datasetId, now);
             for (const { id, item } of prepared) {
               await this.db.insert({
                 tableName: TABLE_DATASET_ITEMS,
@@ -3791,6 +3856,8 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
                   id,
                   datasetId: input.datasetId,
                   datasetVersion: newVersion,
+                  organizationId,
+                  projectId,
                   validTo: null,
                   isDeleted: false,
                   input: item.input,
@@ -3812,6 +3879,8 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
               id,
               datasetId: input.datasetId,
               datasetVersion: newVersion,
+              organizationId,
+              projectId,
               input: item.input,
               groundTruth: item.groundTruth,
               expectedTrajectory: item.expectedTrajectory,
@@ -3855,7 +3924,7 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
       await this.db.runWithAbortRetry(
         () => this.database.runTransactionAsync(async (tx) => {
           try {
-            const newVersion = await this.bumpVersion(tx, input.datasetId, now);
+            const { version: newVersion, organizationId, projectId } = await this.bumpVersion(tx, input.datasetId, now);
             for (const existing of current) {
               await this.closeCurrentRow(tx, existing.id, newVersion);
               await this.db.insert({
@@ -3864,6 +3933,8 @@ var DatasetsSpanner = class _DatasetsSpanner extends DatasetsStorage {
                   id: existing.id,
                   datasetId: input.datasetId,
                   datasetVersion: newVersion,
+                  organizationId,
+                  projectId,
                   validTo: null,
                   isDeleted: true,
                   input: existing.input,
@@ -3914,6 +3985,8 @@ function rowToExperiment(row) {
     metadata: t.metadata ?? void 0,
     datasetId: t.datasetId ?? null,
     datasetVersion: t.datasetVersion == null ? null : Number(t.datasetVersion),
+    organizationId: t.organizationId ?? null,
+    projectId: t.projectId ?? null,
     targetType: t.targetType,
     targetId: String(t.targetId),
     status: t.status,
@@ -3935,6 +4008,8 @@ function rowToExperimentResult(row) {
     experimentId: String(t.experimentId),
     itemId: String(t.itemId),
     itemDatasetVersion: t.itemDatasetVersion == null ? null : Number(t.itemDatasetVersion),
+    organizationId: t.organizationId ?? null,
+    projectId: t.projectId ?? null,
     input: t.input ?? null,
     output: t.output ?? null,
     groundTruth: t.groundTruth ?? null,
@@ -3966,6 +4041,16 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends ExperimentsStorage {
   async init() {
     await this.db.createTable({ tableName: TABLE_EXPERIMENTS, schema: TABLE_SCHEMAS[TABLE_EXPERIMENTS] });
     await this.db.createTable({ tableName: TABLE_EXPERIMENT_RESULTS, schema: TABLE_SCHEMAS[TABLE_EXPERIMENT_RESULTS] });
+    await this.db.alterTable({
+      tableName: TABLE_EXPERIMENTS,
+      schema: TABLE_SCHEMAS[TABLE_EXPERIMENTS],
+      ifNotExists: ["organizationId", "projectId"]
+    });
+    await this.db.alterTable({
+      tableName: TABLE_EXPERIMENT_RESULTS,
+      schema: TABLE_SCHEMAS[TABLE_EXPERIMENT_RESULTS],
+      ifNotExists: ["organizationId", "projectId"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -3987,6 +4072,17 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends ExperimentsStorage {
         table: TABLE_EXPERIMENT_RESULTS,
         columns: ["experimentId", "itemId"],
         unique: true
+      },
+      // Tenancy: leading-tenant indexes for multi-tenant scans (parity with datasets domain).
+      {
+        name: "mastra_experiments_org_project_idx",
+        table: TABLE_EXPERIMENTS,
+        columns: ["organizationId", "projectId"]
+      },
+      {
+        name: "mastra_experiment_results_org_project_idx",
+        table: TABLE_EXPERIMENT_RESULTS,
+        columns: ["organizationId", "projectId"]
       }
     ];
   }
@@ -4013,6 +4109,8 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends ExperimentsStorage {
         metadata: input.metadata ?? void 0,
         datasetId: input.datasetId ?? null,
         datasetVersion: input.datasetVersion ?? null,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         targetType: input.targetType,
         targetId: input.targetId,
         status: "pending",
@@ -4035,6 +4133,8 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends ExperimentsStorage {
           metadata: experiment.metadata ?? null,
           datasetId: experiment.datasetId,
           datasetVersion: experiment.datasetVersion,
+          organizationId: experiment.organizationId,
+          projectId: experiment.projectId,
           targetType: experiment.targetType,
           targetId: experiment.targetId,
           status: experiment.status,
@@ -4153,6 +4253,17 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends ExperimentsStorage {
         conditions.push(`${quoteIdent("status", "column name")} = @status`);
         params.status = args.status;
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push(`${quoteIdent("organizationId", "column name")} = @organizationId`);
+          params.organizationId = organizationId;
+        }
+        if (projectId !== void 0) {
+          conditions.push(`${quoteIdent("projectId", "column name")} = @projectId`);
+          params.projectId = projectId;
+        }
+      }
       const whereSql = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
       const tableName = quoteIdent(TABLE_EXPERIMENTS, "table name");
       const [countRows] = await this.database.run({
@@ -4237,6 +4348,8 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends ExperimentsStorage {
         experimentId: input.experimentId,
         itemId: input.itemId,
         itemDatasetVersion: input.itemDatasetVersion ?? null,
+        organizationId: input.organizationId ?? null,
+        projectId: input.projectId ?? null,
         input: input.input ?? null,
         output: input.output ?? null,
         groundTruth: input.groundTruth ?? null,
@@ -4257,6 +4370,8 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends ExperimentsStorage {
           experimentId: result.experimentId,
           itemId: result.itemId,
           itemDatasetVersion: result.itemDatasetVersion,
+          organizationId: result.organizationId,
+          projectId: result.projectId,
           input: result.input,
           output: result.output,
           groundTruth: result.groundTruth,
@@ -4390,6 +4505,17 @@ var ExperimentsSpanner = class _ExperimentsSpanner extends ExperimentsStorage {
         conditions.push(`${quoteIdent("status", "column name")} = @status`);
         params.status = args.status;
       }
+      if (args.filters) {
+        const { organizationId, projectId } = args.filters;
+        if (organizationId !== void 0) {
+          conditions.push(`${quoteIdent("organizationId", "column name")} = @organizationId`);
+          params.organizationId = organizationId;
+        }
+        if (projectId !== void 0) {
+          conditions.push(`${quoteIdent("projectId", "column name")} = @projectId`);
+          params.projectId = projectId;
+        }
+      }
       const whereSql = `WHERE ${conditions.join(" AND ")}`;
       const tableName = quoteIdent(TABLE_EXPERIMENT_RESULTS, "table name");
       const [countRows] = await this.database.run({